git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Thomas Munro <tmunro@postgresql.org>

2024年1月24日 21:37:35 +0000 (10:37 +1300)

committer Thomas Munro <tmunro@postgresql.org>

2024年1月25日 00:44:54 +0000 (13:44 +1300)

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

src/backend/jit/llvm/llvmjit_inline.cpp patch | blob | blame | history

diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp

index fa3a7ad031cc210fac6ec937a6fb61b415e90e68..c9efc0bc994e43876b7180ca57cce16a0c13bf8a 100644 (file)

--- 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 */

This is the main PostgreSQL git repository.

RSS Atom