aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Munro <tmunro@postgresql.org>2024-01-25 10:37:35 +1300
committerThomas Munro <tmunro@postgresql.org>2024-01-25 13:47:35 +1300
commitd060cb65880fe950774c6f3f9facf0f87504bfb3 (patch)
treedc20ad520eabc58159b08102cb2ba7d19af56a48
parent2f724283719e75261d3b649d20235e4f1542be04 (diff)
downloadpostgresql-d060cb65880fe950774c6f3f9facf0f87504bfb3.tar.gz
postgresql-d060cb65880fe950774c6f3f9facf0f87504bfb3.zip
Track LLVM 18 changes.
A function was given a newly standard name from C++20 in LLVM 16. Then LLVM 18 added a deprecation warning for the old name, and it is about to ship, so it's time to adjust that. Back-patch to all supported releases. Discussion: https://www.postgresql.org/message-id/CA+hUKGLbuVhH6mqS8z+FwAn4=5dHs0bAWmEMZ3B+iYHWKC4-ZA@mail.gmail.com
-rw-r--r--src/backend/jit/llvm/llvmjit_inline.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp
index 295375e237a..e0553157601 100644
--- a/src/backend/jit/llvm/llvmjit_inline.cpp
+++ b/src/backend/jit/llvm/llvmjit_inline.cpp
@@ -821,7 +821,10 @@ static void
add_module_to_inline_search_path(InlineSearchPath& searchpath, llvm::StringRef modpath)
{
/* only extension in libdir are candidates for inlining for now */
- if (!modpath.startswith("$libdir/"))
+#if LLVM_VERSION_MAJOR < 16
+#define starts_with startswith
+#endif
+ if (!modpath.starts_with("$libdir/"))
return;
/* if there's no match, attempt to load */