From c7cc136e6bf9f12ea1b753361e37ed0e390f77dd Mon Sep 17 00:00:00 2001
From: Jelte Fennema <github-tech@jeltef.nl>
Date: Mon, 24 Oct 2022 14:09:50 +0200
Subject: [PATCH] Compile bitcode with llvm-14

---
 .circleci/config.yml                           | 2 +-
 ci/build-citus.sh                              | 2 +-
 src/backend/distributed/executor/query_stats.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 674280958..2a4761120 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 parameters:
   image_suffix:
     type: string
-    default: '-v186a1be'
+    default: '-dev-aa82c25'
   pg13_version:
     type: string
     default: '13.8'
diff --git a/ci/build-citus.sh b/ci/build-citus.sh
index 49f92e691..fa04e70da 100755
--- a/ci/build-citus.sh
+++ b/ci/build-citus.sh
@@ -33,7 +33,7 @@ build_ext() {
   # do everything in a subdirectory to avoid clutter in current directory
   mkdir -p "${builddir}" && cd "${builddir}"
 
-  CFLAGS=-Werror "${basedir}/configure" PG_CONFIG="/usr/lib/postgresql/${pg_major}/bin/pg_config" --enable-coverage --with-security-flags
+  CFLAGS=-Werror "${basedir}/configure" PG_CONFIG="/usr/lib/postgresql/${pg_major}/bin/pg_config" --enable-coverage --with-security-flags     LLVM_CONFIG=llvm-config-14 CLANG=clang-14
 
   installdir="${builddir}/install"
   make -j$(nproc) && mkdir -p "${installdir}" && { make DESTDIR="${installdir}" install-all || make DESTDIR="${installdir}" install ; }
diff --git a/src/backend/distributed/executor/query_stats.c b/src/backend/distributed/executor/query_stats.c
index 6dd5196f2..059b0812f 100644
--- a/src/backend/distributed/executor/query_stats.c
+++ b/src/backend/distributed/executor/query_stats.c
@@ -312,6 +312,8 @@ CitusQueryStatsShmemShutdown(int code, Datum arg)
 		return;
 	}
 
+	int32 num_entries = hash_get_num_entries(queryStatsHash);
+
 	FILE *file = AllocateFile(CITUS_STATS_DUMP_FILE ".tmp", PG_BINARY_W);
 	if (file == NULL)
 	{
@@ -323,8 +325,6 @@ CitusQueryStatsShmemShutdown(int code, Datum arg)
 		goto error;
 	}
 
-	int32 num_entries = hash_get_num_entries(queryStatsHash);
-
 	if (fwrite(&num_entries, sizeof(int32), 1, file) != 1)
 	{
 		goto error;