(cloudberry) 34/50: Track LLVM 18 changes.

[le...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

leborchuk pushed a commit to branch REL_2_STABLE
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit 9d4244935abbd89f97894188a5c0d9151f91679b
Author: Thomas Munro <tm...@postgresql.org>
AuthorDate: Thu Jan 25 10:37:35 2024 +1300

    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
    (cherry picked from commit 364283c92e4a4183fb4f80ce4ec9ba96007b6632)
---
 src/backend/jit/llvm/llvmjit_inline.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp
index 2121e5b83f1..5877e779130 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 */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org