Merge ~ahasenack/ubuntu/+source/postgresql-14:jammy-postgresql-llvm14 into ubuntu/+source/postgresql-14:ubuntu/devel

[Andreas Hasenack]

Fix FTBFS introduced when jammy got llvm-14. Previous jammy postgresql build was using llvm-13.

Thanks Christian for finding the upstream patch for this. I did a local test build and it worked. I created a bileto ticket[1], but it will be a while, and I don't know if bileto will even trigger tests, but at least we get the build in all arches.

So while that builds, let's have this MP up :)

1. https://bileto.ubuntu.com/#/ticket/4818

[Bryce Harrington (bryce)]

LGTM, not a super deep review but general approach looks good, and the patch checks out.

I've queued up tests in case they don't run via bileto:

$ lp-test-ppa ppa:ci-train-ppa-service/4818 --release jammy --showpass
Tests for PPA 4818
---- ---- ---- ----
Release: jammy
Sources:
  SRC: postgresql-14 @ 14.2-1ubuntu1~ppa1 - Published
Triggers on published Sources:
         postgresql-14 @ amd64 for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @amd64 ♻️ Trigger all proposed @amd64 ♻️ 💍
         postgresql-14 @ s390x for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @s390x ♻️ Trigger all proposed @s390x ♻️ 💍
         postgresql-14 @ ppc64el for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @ppc64el ♻️ Trigger all proposed @ppc64el ♻️ 💍
         postgresql-14 @ arm64 for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @arm64 ♻️ Trigger all proposed @arm64 ♻️ 💍
         postgresql-14 @ armhf for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @armhf ♻️ Trigger all proposed @armhf ♻️ 💍
         postgresql-14 @ riscv64 for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @riscv64 ♻️ Trigger all proposed @riscv64 ♻️ 💍
Results from https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-ci-train-ppa-service-4818/?format=plain:
    No results published yet
Running:
    time pkg release arch ppa trigger
    0:02:50 postgresql-14 jammy arm64 ci-train-ppa-service/4818 postgresql-14/14.2-1ubuntu1~ppa1
    0:07:10 postgresql-14 jammy armhf ci-train-ppa-service/4818 postgresql-14/14.2-1ubuntu1~ppa1
    0:09:00 postgresql-14 jammy s390x ci-train-ppa-service/4818 postgresql-14/14.2-1ubuntu1~ppa1
    0:09:50 postgresql-14 jammy amd64 ci-train-ppa-service/4818 postgresql-14/14.2-1ubuntu1~ppa1
Waiting:
    Q-num pkg release arch ppa trigger
    1 postgresql-14 jammy ppc64el ci-train-ppa-service/4818 postgresql-14/14.2-1ubuntu1~ppa1

Assuming those pass, I think this looks good.

review: Approve

[Andreas Hasenack (ahasenack)]

They all passed:
$ ./lp-test-ppa ppa:ci-train-ppa-service/4818 --release jammy --showpass
Tests for PPA 4818
---- ---- ---- ----
Release: jammy
Sources:
  SRC: postgresql-14 @ 14.2-1ubuntu1~ppa1 - Published
Triggers on published Sources:
         postgresql-14 @ amd64 for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @amd64 ♻️ Trigger all proposed @amd64 ♻️ 💍
         postgresql-14 @ s390x for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @s390x ♻️ Trigger all proposed @s390x ♻️ 💍
         postgresql-14 @ ppc64el for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @ppc64el ♻️ Trigger all proposed @ppc64el ♻️ 💍
         postgresql-14 @ arm64 for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @arm64 ♻️ Trigger all proposed @arm64 ♻️ 💍
         postgresql-14 @ armhf for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @armhf ♻️ Trigger all proposed @armhf ♻️ 💍
         postgresql-14 @ riscv64 for postgresql-14/14.2-1ubuntu1~ppa1 Trigger @riscv64 ♻️ Trigger all proposed @riscv64 ♻️ 💍
Results from https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-ci-train-ppa-service-4818/?format=plain:
  postgresql-14 @ amd64:
    25.03.22 18:27:28 Log 🗒️ ✅ Triggers: ['postgresql-14/14.2-1ubuntu1~ppa1']
      run-testsuite PASS ✅
      installcheck PASS ✅
  postgresql-14 @ arm64:
    25.03.22 18:51:29 Log 🗒️ ✅ Triggers: ['postgresql-14/14.2-1ubuntu1~ppa1']
      run-testsuite PASS ✅
      installcheck PASS ✅
  postgresql-14 @ armhf:
    25.03.22 18:42:19 Log 🗒️ ✅ Triggers: ['postgresql-14/14.2-1ubuntu1~ppa1']
      run-testsuite PASS ✅
      installcheck PASS ✅
  postgresql-14 @ ppc64el:
    25.03.22 18:42:51 Log 🗒️ ✅ Triggers: ['postgresql-14/14.2-1ubuntu1~ppa1']
      run-testsuite PASS ✅
      installcheck PASS ✅
  postgresql-14 @ s390x:
    25.03.22 18:34:17 Log 🗒️ ✅ Triggers: ['postgresql-14/14.2-1ubuntu1~ppa1']
      run-testsuite PASS ✅
      installcheck PASS ✅
Running:
Waiting:

[Andreas Hasenack (ahasenack)]

Uploaded:

$ dput ubuntu ../postgresql-14_14.2-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../postgresql-14_14.2-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../postgresql-14_14.2-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading postgresql-14_14.2-1ubuntu1.dsc: done.
  Uploading postgresql-14_14.2-1ubuntu1.debian.tar.xz: done.
  Uploading postgresql-14_14.2-1ubuntu1_source.buildinfo: done.
  Uploading postgresql-14_14.2-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index d6d439b..f8ba18f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgresql-14 (14.2-1ubuntu1) jammy; urgency=medium
+
+  * d/p/llvm14-support.patch: fix FTBFS with llvm-14 (LP: #1966319)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 25 Mar 2022 11:34:41 -0300
+
 postgresql-14 (14.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0d6c863..a622aed 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: postgresql-14
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders:
  Martin Pitt <[e-mail]>,
  Peter Eisentraut <[e-mail]>,
diff --git a/debian/patches/llvm14-support.patch b/debian/patches/llvm14-support.patch
new file mode 100644
index 0000000..316dcb4
--- /dev/null
+++ b/debian/patches/llvm14-support.patch
@@ -0,0 +1,155 @@
+From d9f7ad54e552262ee0090e88d5abd3e04fcdeac8 Mon Sep 17 00:00:00 2001
+From: Thomas Munro <[e-mail]>
+Date: Wed, 16 Mar 2022 11:35:00 +1300
+Subject: [PATCH] Back-patch LLVM 14 API changes.
+
+Since LLVM 14 has stopped changing and is about to be released,
+back-patch the following changes from the master branch:
+
+  e6a7600202105919bffd62b3dfd941f4a94e082b
+  807fee1a39de6bb8184082012e643951abb9ad1d
+  a56e7b66010f330782243de9e25ac2a6596be0e1
+
+Back-patch to 11, where LLVM JIT support came in.
+---
+ src/backend/jit/llvm/Makefile           |  6 +++++
+ src/backend/jit/llvm/llvmjit_error.cpp  | 35 +++++++++++++++++++++----
+ src/backend/jit/llvm/llvmjit_inline.cpp | 12 ++++++++-
+ 3 files changed, 47 insertions(+), 6 deletions(-)
+
+Origin: upstream, https://github.com/postgres/postgres/commit/d9f7ad54e552262ee0090e88d5abd3e04fcdeac8
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/postgresql-14/+bug/1966319
+Last-Update: 2022-03-25
+
+diff --git a/src/backend/jit/llvm/Makefile b/src/backend/jit/llvm/Makefile
+index 0268bd46d5c0..2da122a391e5 100644
+--- a/src/backend/jit/llvm/Makefile
++++ b/src/backend/jit/llvm/Makefile
+@@ -22,6 +22,12 @@ endif
+ PGFILEDESC = "llvmjit - JIT using LLVM"
+ NAME = llvmjit
+ 
++# LLVM 14 produces deprecation warnings.  We'll need to make some changes
++# before the relevant functions are removed, but for now silence the warnings.
++ifeq ($(GCC), yes)
++LLVM_CFLAGS += -Wno-deprecated-declarations
++endif
++
+ # All files in this directory use LLVM.
+ CFLAGS += $(LLVM_CFLAGS)
+ CXXFLAGS += $(LLVM_CXXFLAGS)
+diff --git a/src/backend/jit/llvm/llvmjit_error.cpp b/src/backend/jit/llvm/llvmjit_error.cpp
+index f4720732a39d..5ad92f30904d 100644
+--- a/src/backend/jit/llvm/llvmjit_error.cpp
++++ b/src/backend/jit/llvm/llvmjit_error.cpp
+@@ -23,15 +23,22 @@ extern "C"
+ 
+ #include "jit/llvmjit.h"
+ 
++#include <new>
+ 
+ static int fatal_new_handler_depth = 0;
+ static std::new_handler old_new_handler = NULL;
+ 
+ static void fatal_system_new_handler(void);
+ #if LLVM_VERSION_MAJOR > 4
++static void fatal_llvm_new_handler(void *user_data, const char *reason, bool gen_crash_diag);
++#if LLVM_VERSION_MAJOR < 14
+ static void fatal_llvm_new_handler(void *user_data, const std::string& reason, bool gen_crash_diag);
+ #endif
++#endif
++static void fatal_llvm_error_handler(void *user_data, const char *reason, bool gen_crash_diag);
++#if LLVM_VERSION_MAJOR < 14
+ static void fatal_llvm_error_handler(void *user_data, const std::string& reason, bool gen_crash_diag);
++#endif
+ 
+ 
+ /*
+@@ -129,23 +136,41 @@ fatal_system_new_handler(void)
+ #if LLVM_VERSION_MAJOR > 4
+ static void
+ fatal_llvm_new_handler(void *user_data,
+-					   const std::string& reason,
++					   const char *reason,
+ 					   bool gen_crash_diag)
+ {
+ 	ereport(FATAL,
+ 			(errcode(ERRCODE_OUT_OF_MEMORY),
+ 			 errmsg("out of memory"),
+-			 errdetail("While in LLVM: %s", reason.c_str())));
++			 errdetail("While in LLVM: %s", reason)));
++}
++#if LLVM_VERSION_MAJOR < 14
++static void
++fatal_llvm_new_handler(void *user_data,
++					   const std::string& reason,
++					   bool gen_crash_diag)
++{
++	fatal_llvm_new_handler(user_data, reason.c_str(), gen_crash_diag);
+ }
+ #endif
++#endif
+ 
+ static void
+ fatal_llvm_error_handler(void *user_data,
+-						 const std::string& reason,
++						 const char *reason,
+ 						 bool gen_crash_diag)
+ {
+ 	ereport(FATAL,
+ 			(errcode(ERRCODE_OUT_OF_MEMORY),
+-			 errmsg("fatal llvm error: %s",
+-					reason.c_str())));
++			 errmsg("fatal llvm error: %s", reason)));
+ }
++
++#if LLVM_VERSION_MAJOR < 14
++static void
++fatal_llvm_error_handler(void *user_data,
++						 const std::string& reason,
++						 bool gen_crash_diag)
++{
++	fatal_llvm_error_handler(user_data, reason.c_str(), gen_crash_diag);
++}
++#endif
+diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp
+index 6f03595db5a4..9bb4b672a736 100644
+--- a/src/backend/jit/llvm/llvmjit_inline.cpp
++++ b/src/backend/jit/llvm/llvmjit_inline.cpp
+@@ -594,7 +594,11 @@ function_inlinable(llvm::Function &F,
+ 	if (F.materialize())
+ 		elog(FATAL, "failed to materialize metadata");
+ 
+-	if (F.getAttributes().hasFnAttribute(llvm::Attribute::NoInline))
++#if LLVM_VERSION_MAJOR < 14
++#define hasFnAttr hasFnAttribute
++#endif
++
++	if (F.getAttributes().hasFnAttr(llvm::Attribute::NoInline))
+ 	{
+ 		ilog(DEBUG1, "ineligibile to import %s due to noinline",
+ 			 F.getName().data());
+@@ -871,7 +875,9 @@ create_redirection_function(std::unique_ptr<llvm::Module> &importMod,
+ 	llvm::Function *AF;
+ 	llvm::BasicBlock *BB;
+ 	llvm::CallInst *fwdcall;
++#if LLVM_VERSION_MAJOR < 14
+ 	llvm::Attribute inlineAttribute;
++#endif
+ 
+ 	AF = llvm::Function::Create(F->getFunctionType(),
+ 								LinkageTypes::AvailableExternallyLinkage,
+@@ -880,9 +886,13 @@ create_redirection_function(std::unique_ptr<llvm::Module> &importMod,
+ 
+ 	Builder.SetInsertPoint(BB);
+ 	fwdcall = Builder.CreateCall(F, &*AF->arg_begin());
++#if LLVM_VERSION_MAJOR < 14
+ 	inlineAttribute = llvm::Attribute::get(Context,
+ 										   llvm::Attribute::AlwaysInline);
+ 	fwdcall->addAttribute(~0U, inlineAttribute);
++#else
++	fwdcall->addFnAttr(llvm::Attribute::AlwaysInline);
++#endif
+ 	Builder.CreateRet(fwdcall);
+ 
+ 	return AF;
diff --git a/debian/patches/series b/debian/patches/series
index 411958b..f6474db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ libpgport-pkglibdir
 extension_destdir
 autoconf2.69
 focal-arm64-outline-atomics
+llvm14-support.patch