Skip to content

Commit d033f8f

Browse files
macdicemacdice
committed
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 51683fe commit d033f8f

File tree

4 files changed

+111
-0
lines changed

4 files changed

+111
-0
lines changed

‎configure

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

72617261

7262+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Xclang -no-opaque-pointers, for BITCODE_CFLAGS" >&5
7263+
$as_echo_n "checking whether ${CLANG} supports -Xclang -no-opaque-pointers, for BITCODE_CFLAGS... " >&6; }
7264+
if ${pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers+:} false; then :
7265+
$as_echo_n "(cached) " >&6
7266+
else
7267+
pgac_save_CFLAGS=$CFLAGS
7268+
pgac_save_CC=$CC
7269+
CC=${CLANG}
7270+
CFLAGS="${BITCODE_CFLAGS} -Xclang -no-opaque-pointers"
7271+
ac_save_c_werror_flag=$ac_c_werror_flag
7272+
ac_c_werror_flag=yes
7273+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7274+
/* end confdefs.h. */
7275+
7276+
int
7277+
main ()
7278+
{
7279+
7280+
;
7281+
return 0;
7282+
}
7283+
_ACEOF
7284+
if ac_fn_c_try_compile "$LINENO"; then :
7285+
pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers=yes
7286+
else
7287+
pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers=no
7288+
fi
7289+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7290+
ac_c_werror_flag=$ac_save_c_werror_flag
7291+
CFLAGS="$pgac_save_CFLAGS"
7292+
CC="$pgac_save_CC"
7293+
fi
7294+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" >&5
7295+
$as_echo "$pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" >&6; }
7296+
if test x"$pgac_cv_prog_CLANG_cflags__Xclang__no_opaque_pointers" = x"yes"; then
7297+
BITCODE_CFLAGS="${BITCODE_CFLAGS} -Xclang -no-opaque-pointers"
7298+
fi
7299+
7300+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANGXX} supports -Xclang -no-opaque-pointers, for BITCODE_CXXFLAGS" >&5
7301+
$as_echo_n "checking whether ${CLANGXX} supports -Xclang -no-opaque-pointers, for BITCODE_CXXFLAGS... " >&6; }
7302+
if ${pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers+:} false; then :
7303+
$as_echo_n "(cached) " >&6
7304+
else
7305+
pgac_save_CXXFLAGS=$CXXFLAGS
7306+
pgac_save_CXX=$CXX
7307+
CXX=${CLANGXX}
7308+
CXXFLAGS="${BITCODE_CXXFLAGS} -Xclang -no-opaque-pointers"
7309+
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
7310+
ac_cxx_werror_flag=yes
7311+
ac_ext=cpp
7312+
ac_cpp='$CXXCPP $CPPFLAGS'
7313+
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7314+
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7315+
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7316+
7317+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7318+
/* end confdefs.h. */
7319+
7320+
int
7321+
main ()
7322+
{
7323+
7324+
;
7325+
return 0;
7326+
}
7327+
_ACEOF
7328+
if ac_fn_cxx_try_compile "$LINENO"; then :
7329+
pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers=yes
7330+
else
7331+
pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers=no
7332+
fi
7333+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7334+
ac_ext=c
7335+
ac_cpp='$CPP $CPPFLAGS'
7336+
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7337+
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7338+
ac_compiler_gnu=$ac_cv_c_compiler_gnu
7339+
7340+
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
7341+
CXXFLAGS="$pgac_save_CXXFLAGS"
7342+
CXX="$pgac_save_CXX"
7343+
fi
7344+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" >&5
7345+
$as_echo "$pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" >&6; }
7346+
if test x"$pgac_cv_prog_CLANGXX_cxxflags__Xclang__no_opaque_pointers" = x"yes"; then
7347+
BITCODE_CXXFLAGS="${BITCODE_CXXFLAGS} -Xclang -no-opaque-pointers"
7348+
fi
7349+
7350+
72627351
NOT_THE_CFLAGS=""
72637352
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CLANG} supports -Wunused-command-line-argument, for NOT_THE_CFLAGS" >&5
72647353
$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
@@ -600,6 +600,9 @@ if test "$with_llvm" = yes ; then
600600
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-fexcess-precision=standard])
601601
PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-fexcess-precision=standard])
602602

603+
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, BITCODE_CFLAGS, [-Xclang -no-opaque-pointers])
604+
PGAC_PROG_VARCXX_VARFLAGS_OPT(CLANGXX, BITCODE_CXXFLAGS, [-Xclang -no-opaque-pointers])
605+
603606
NOT_THE_CFLAGS=""
604607
PGAC_PROG_VARCC_VARFLAGS_OPT(CLANG, NOT_THE_CFLAGS, [-Wunused-command-line-argument])
605608
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)