From fa0acbf62d78c9b25ab72d09e12ab3cb8d5f37c4 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Mon, 15 Jan 2024 19:55:46 -0800 Subject: [PATCH] Fixed CI --- .github/workflows/build.yml | 2 +- src/hnswbuild.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 249400d..836dd23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,7 +62,7 @@ jobs: wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_5.tar.gz tar xf REL_14_5.tar.gz - run: make prove_installcheck PROVE_FLAGS="-I ./postgres-REL_14_5/src/test/perl" PERL5LIB="/Users/runner/perl5/lib/perl5" - - run: make clean && /usr/local/opt/llvm@15/bin/scan-build --status-bugs make + - run: make clean && /usr/local/opt/llvm@15/bin/scan-build --status-bugs make PG_CFLAGS="-DUSE_ASSERT_CHECKING" windows: runs-on: windows-latest if: ${{ !startsWith(github.ref_name, 'mac') }} diff --git a/src/hnswbuild.c b/src/hnswbuild.c index b683b24..ddb31b3 100644 --- a/src/hnswbuild.c +++ b/src/hnswbuild.c @@ -412,6 +412,9 @@ HnswUpdateNeighborPagesInMemory(char *base, FmgrInfo *procinfo, Oid collation, H HnswCandidate *hc = &neighbors->items[i]; HnswElement neighborElement = HnswPtrAccess(base, hc->element); + /* Keep scan-build happy on Mac x86-64 */ + Assert(neighborElement); + /* Use element for lock instead of hc since hc can be replaced */ SpinLockAcquire(&neighborElement->lock); HnswUpdateConnection(base, e, hc, lm, lc, NULL, NULL, procinfo, collation);