Skip to content

Commit 7535125

Browse files
macdicereshke
authored andcommitted
Track LLVM 15 changes.
Per https://llvm.org/docs/OpaquePointers.html, support for non-opaque pointers still exists and we can request that on our context. We have until LLVM 16 to move to opaque pointers, a much larger change. Back-patch to 11, where LLVM support arrived. Author: Thomas Munro <thomas.munro@gmail.com> Author: Andres Freund <andres@anarazel.de> Discussion: https://postgr.es/m/CAMHz58Sf_xncdyqsekoVsNeKcruKootLtVH6cYXVhhUR1oKPCg%40mail.gmail.com
1 parent 70ba125 commit 7535125

4 files changed

Lines changed: 111 additions & 0 deletions

File tree

configure

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7739,6 +7739,95 @@ if test x"$pgac_cv_prog_CLANGXX_cxxflags__fexcess_precision_standard" = x"yes";
77397739
fi
77407740

77417741

7742+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Xclang -no-opaque-pointers, for BITCODE_CFLAGS" >&5
7743+
$as_echo_n "checking whether ${CLANG} supports -Xclang -no-opaque-pointers, for BITCODE_CFLAGS... " >&6; }
7744+
if ${pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers+:} false; then :
7745+
$as_echo_n "(cached) " >&6
7746+
else
7747+
pgac_save_CFLAGS=$CFLAGS
7748+
pgac_save_CC=$CC
7749+
CC=${CLANG}
7750+
CFLAGS="${BITCODE_CFLAGS} -Xclang -no-opaque-pointers"
7751+
ac_save_c_werror_flag=$ac_c_werror_flag
7752+
ac_c_werror_flag=yes
7753+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7754+
/* end confdefs.h. */
7755+
7756+
int
7757+
main ()
7758+
{
7759+
7760+
;
7761+
return 0;
7762+
}
7763+
_ACEOF
7764+
if ac_fn_c_try_compile "$LINENO"; then :
7765+
pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers=yes
7766+
else
7767+
pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers=no
7768+
fi
7769+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7770+
ac_c_werror_flag=$ac_save_c_werror_flag
7771+
CFLAGS="$pgac_save_CFLAGS"
7772+
CC="$pgac_save_CC"
7773+
fi
7774+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" >&5
7775+
$as_echo "$pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" >&6; }
7776+
if test x"$pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" = x"yes"; then
7777+
BITCODE_CFLAGS="${BITCODE_CFLAGS} -Xclang -no-opaque-pointers"
7778+
fi
7779+
7780+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -Xclang -no-opaque-pointers, for BITCODE_CXXFLAGS" >&5
7781+
$as_echo_n "checking whether ${CLANGXX} supports -Xclang -no-opaque-pointers, for BITCODE_CXXFLAGS... " >&6; }
7782+
if ${pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers+:} false; then :
7783+
$as_echo_n "(cached) " >&6
7784+
else
7785+
pgac_save_CXXFLAGS=$CXXFLAGS
7786+
pgac_save_CXX=$CXX
7787+
CXX=${CLANGXX}
7788+
CXXFLAGS="${BITCODE_CXXFLAGS} -Xclang -no-opaque-pointers"
7789+
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
7790+
ac_cxx_werror_flag=yes
7791+
ac_ext=cpp
7792+
ac_cpp='$CXXCPP $CPPFLAGS'
7793+
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7794+
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7795+
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7796+
7797+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7798+
/* end confdefs.h. */
7799+
7800+
int
7801+
main ()
7802+
{
7803+
7804+
;
7805+
return 0;
7806+
}
7807+
_ACEOF
7808+
if ac_fn_cxx_try_compile "$LINENO"; then :
7809+
pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers=yes
7810+
else
7811+
pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers=no
7812+
fi
7813+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7814+
ac_ext=c
7815+
ac_cpp='$CPP $CPPFLAGS'
7816+
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7817+
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7818+
ac_compiler_gnu=$ac_cv_c_compiler_gnu
7819+
7820+
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
7821+
CXXFLAGS="$pgac_save_CXXFLAGS"
7822+
CXX="$pgac_save_CXX"
7823+
fi
7824+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" >&5
7825+
$as_echo "$pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" >&6; }
7826+
if test x"$pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" = x"yes"; then
7827+
BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -Xclang -no-opaque-pointers"
7828+
fi
7829+
7830+
77427831
NOT_THE_CFLAGS=""
77437832
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS" >&5
77447833
$as_echo_n "checking whether ${CLANG} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS... " >&6; }

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,9 @@ if test "$with_llvm" = yes ; then
672672
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fexcess-precision=standard])
673673
PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fexcess-precision=standard])
674674

675+
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-Xclang -no-opaque-pointers])
676+
PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-Xclang -no-opaque-pointers])
677+
675678
NOT_THE_CFLAGS=""
676679
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wunused-command-line-argument])
677680
if test -n "$NOT_THE_CFLAGS"; then

src/backend/jit/llvm/llvmjit.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,6 +798,16 @@ llvm_session_initialize(void)
798798
LLVMInitializeNativeAsmPrinter();
799799
LLVMInitializeNativeAsmParser();
800800

801+
/*
802+
* When targeting an LLVM version with opaque pointers enabled by
803+
* default, turn them off for the context we build our code in. We don't
804+
* need to do so for other contexts (e.g. llvm_ts_context). Once the IR is
805+
* generated, it carries the necessary information.
806+
*/
807+
#if LLVM_VERSION_MAJOR > 14
808+
LLVMContextSetOpaquePointers(LLVMGetGlobalContext(), false);
809+
#endif
810+
801811
/*
802812
* Synchronize types early, as that also includes inferring the target
803813
* triple.
@@ -1112,7 +1122,11 @@ llvm_resolve_symbols(LLVMOrcDefinitionGeneratorRef GeneratorObj, void *Ctx,
11121122
LLVMOrcJITDylibRef JD, LLVMOrcJITDylibLookupFlags JDLookupFlags,
11131123
LLVMOrcCLookupSet LookupSet, size_t LookupSetSize)
11141124
{
1125+
#if LLVM_VERSION_MAJOR > 14
1126+
LLVMOrcCSymbolMapPairs symbols = palloc0(sizeof(LLVMOrcCSymbolMapPair) * LookupSetSize);
1127+
#else
11151128
LLVMOrcCSymbolMapPairs symbols = palloc0(sizeof(LLVMJITCSymbolMapPair) * LookupSetSize);
1129+
#endif
11161130
LLVMErrorRef error;
11171131
LLVMOrcMaterializationUnitRef mu;
11181132

@@ -1230,7 +1244,11 @@ llvm_create_jit_instance(LLVMTargetMachineRef tm)
12301244
* Symbol resolution support for "special" functions, e.g. a call into an
12311245
* SQL callable function.
12321246
*/
1247+
#if LLVM_VERSION_MAJOR > 14
1248+
ref_gen = LLVMOrcCreateCustomCAPIDefinitionGenerator(llvm_resolve_symbols, NULL, NULL);
1249+
#else
12331250
ref_gen = LLVMOrcCreateCustomCAPIDefinitionGenerator(llvm_resolve_symbols, NULL);
1251+
#endif
12341252
LLVMOrcJITDylibAddGenerator(LLVMOrcLLJITGetMainJITDylib(lljit), ref_gen);
12351253

12361254
return lljit;

src/backend/jit/llvm/llvmjit_inline.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ extern "C"
6262
#include <llvm/IR/ModuleSummaryIndex.h>
6363
#include <llvm/Linker/IRMover.h>
6464
#include <llvm/Support/ManagedStatic.h>
65+
#include <llvm/Support/MemoryBuffer.h>
6566

6667

6768
/*

0 commit comments

Comments
 (0)