diff options
author | Thomas Munro <tmunro@postgresql.org> | 2024-01-25 10:37:35 +1300 |
---|---|---|
committer | Thomas Munro <tmunro@postgresql.org> | 2024-01-25 13:44:54 +1300 |
commit | d282e88e50521a457fa1b36e55f43bac02a3167f (patch) | |
tree | a048c4324c89273a9269b2c2d29c6ef18d41e757 | |
parent | b91f918708283c1dc3dba8ff301f7d4b63c32e66 (diff) | |
download | postgresql-d282e88e50521a457fa1b36e55f43bac02a3167f.tar.gz postgresql-d282e88e50521a457fa1b36e55f43bac02a3167f.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.cpp | 5 |
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 fa3a7ad031c..c9efc0bc994 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 */ |