Remove support for LLVM 11 and LLVM 12

Also clean up some old stuff from before LLVM 11.

Author: aykevl

.github/workflows/test.yml

@@ -6,28 +6,6 @@ name: Test
 on: [push, pull_request]
 
 jobs:
-  test-macos-llvm-11:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install LLVM
-        run: |
-          brew install llvm@11
-      - name: Test LLVM 11
-        run:
-          go test -v -tags=llvm11
-  test-macos-llvm-12:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install LLVM
-        run: |
-          brew install llvm@12
-      - name: Test LLVM 12
-        run:
-          go test -v -tags=llvm12
   test-macos-llvm-13:
     runs-on: macos-latest
     steps:
@@ -84,31 +62,3 @@ jobs:
       - name: Test default LLVM
         run:
           go test -v
-  test-linux-llvm-12:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install LLVM
-        run: |
-          echo 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main' | sudo tee /etc/apt/sources.list.d/llvm.list
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo apt-get update
-          sudo apt-get install --no-install-recommends llvm-12-dev
-      - name: Test LLVM 12
-        run:
-          go test -v -tags=llvm12
-  test-linux-llvm-11:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install LLVM
-        run: |
-          echo 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main' | sudo tee /etc/apt/sources.list.d/llvm.list
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo apt-get update
-          sudo apt-get install --no-install-recommends llvm-11-dev
-      - name: Test LLVM 11
-        run:
-          go test -v -tags=llvm11

backports.cpp

@@ -10,64 +10,12 @@
 #include "llvm/Transforms/Coroutines.h"
 #include "llvm-c/DebugInfo.h"
 
-namespace llvm {
-
-#if LLVM_VERSION_MAJOR < 11
-inline PassManagerBuilder *unwrap(LLVMPassManagerBuilderRef P) {
-  return reinterpret_cast<PassManagerBuilder*>(P);
-}
-
-inline LLVMPassManagerBuilderRef wrap(PassManagerBuilder *P) {
-  return reinterpret_cast<LLVMPassManagerBuilderRef>(P);
-}
-#endif
-
-} // end namespace llvm
-
-void LLVMPassManagerBuilderAddCoroutinePassesToExtensionPoints_backport(LLVMPassManagerBuilderRef PMB) {
-  llvm::PassManagerBuilder *Builder = llvm::unwrap(PMB);
-  llvm::addCoroutinePassesToExtensionPoints(*Builder);
-}
-
 void LLVMGlobalObjectAddMetadata(LLVMValueRef Global, unsigned KindID, LLVMMetadataRef MD) {
   llvm::MDNode *N = MD ? llvm::unwrap<llvm::MDNode>(MD) : nullptr;
   llvm::GlobalObject *O = llvm::unwrap<llvm::GlobalObject>(Global);
   O->addMetadata(KindID, *N);
 }
 
-LLVMMetadataRef
-LLVMGoDIBuilderCreateTypedef(LLVMDIBuilderRef Builder, LLVMMetadataRef Type,
-                             const char *Name, size_t NameLen,
-                             LLVMMetadataRef File, unsigned LineNo,
-                             LLVMMetadataRef Scope, uint32_t AlignInBits) {
-#if LLVM_VERSION_MAJOR >= 10
-	return LLVMDIBuilderCreateTypedef(Builder, Type, Name, NameLen, File, LineNo, Scope, AlignInBits);
-#else
-	return LLVMDIBuilderCreateTypedef(Builder, Type, Name, NameLen, File, LineNo, Scope);
-#endif
-}
-
-LLVMMetadataRef LLVMGoDIBuilderCreateCompileUnit(
-    LLVMDIBuilderRef Builder, LLVMDWARFSourceLanguage Lang,
-    LLVMMetadataRef FileRef, const char *Producer, size_t ProducerLen,
-    LLVMBool isOptimized, const char *Flags, size_t FlagsLen,
-    unsigned RuntimeVer, const char *SplitName, size_t SplitNameLen,
-    LLVMDWARFEmissionKind Kind, unsigned DWOId, LLVMBool SplitDebugInlining,
-    LLVMBool DebugInfoForProfiling, const char *SysRoot, size_t SysRootLen,
-    const char *SDK, size_t SDKLen) {
-
-#if LLVM_VERSION_MAJOR >= 11
-  return LLVMDIBuilderCreateCompileUnit(Builder, Lang, FileRef, Producer,
-    ProducerLen, isOptimized, Flags, FlagsLen, RuntimeVer, SplitName,
-    SplitNameLen, Kind, DWOId, SplitDebugInlining, DebugInfoForProfiling,
-    SysRoot, SysRootLen, SDK, SDKLen);
-#else
-  return LLVMDIBuilderCreateCompileUnit(Builder, Lang, FileRef, Producer,
-    ProducerLen, isOptimized, Flags, FlagsLen, RuntimeVer, SplitName,
-    SplitNameLen, Kind, DWOId, SplitDebugInlining, DebugInfoForProfiling);
-#endif
-}
-
 // See https://reviews.llvm.org/D119431
 LLVMMemoryBufferRef LLVMGoWriteThinLTOBitcodeToMemoryBuffer(LLVMModuleRef M) {
   std::string Data;

backports.go

@@ -7,25 +7,8 @@
 extern "C" {
 #endif
 
-void LLVMPassManagerBuilderAddCoroutinePassesToExtensionPoints_backport(LLVMPassManagerBuilderRef PMB);
-
 void LLVMGlobalObjectAddMetadata(LLVMValueRef objValue, unsigned KindID, LLVMMetadataRef md);
 
-LLVMMetadataRef
-LLVMGoDIBuilderCreateTypedef(LLVMDIBuilderRef Builder, LLVMMetadataRef Type,
-                             const char *Name, size_t NameLen,
-                             LLVMMetadataRef File, unsigned LineNo,
-                             LLVMMetadataRef Scope, uint32_t AlignInBits);
-
-LLVMMetadataRef LLVMGoDIBuilderCreateCompileUnit(
-    LLVMDIBuilderRef Builder, LLVMDWARFSourceLanguage Lang,
-    LLVMMetadataRef FileRef, const char *Producer, size_t ProducerLen,
-    LLVMBool isOptimized, const char *Flags, size_t FlagsLen,
-    unsigned RuntimeVer, const char *SplitName, size_t SplitNameLen,
-    LLVMDWARFEmissionKind Kind, unsigned DWOId, LLVMBool SplitDebugInlining,
-    LLVMBool DebugInfoForProfiling, const char *SysRoot, size_t SysRootLen,
-    const char *SDK, size_t SDKLen);
-
 LLVMMemoryBufferRef LLVMGoWriteThinLTOBitcodeToMemoryBuffer(LLVMModuleRef M);
 
 LLVMMetadataRef LLVMGoDIBuilderCreateExpression(LLVMDIBuilderRef Builder,

backports.h

@@ -136,7 +136,7 @@ func (d *DIBuilder) CreateCompileUnit(cu DICompileUnit) Metadata {
 	defer C.free(unsafe.Pointer(sysroot))
 	sdk := C.CString(cu.SDK)
 	defer C.free(unsafe.Pointer(sdk))
-	result := C.LLVMGoDIBuilderCreateCompileUnit(
+	result := C.LLVMDIBuilderCreateCompileUnit(
 		d.ref,
 		C.LLVMDWARFSourceLanguage(cu.Language),
 		C.LLVMDIBuilderCreateFile(d.ref, file, C.size_t(len(cu.File)), dir, C.size_t(len(cu.Dir))),
@@ -557,7 +557,7 @@ type DITypedef struct {
 func (d *DIBuilder) CreateTypedef(t DITypedef) Metadata {
 	name := C.CString(t.Name)
 	defer C.free(unsafe.Pointer(name))
-	result := C.LLVMGoDIBuilderCreateTypedef(
+	result := C.LLVMDIBuilderCreateTypedef(
 		d.ref,
 		t.Type.C,
 		name,

dibuilder.go

@@ -1,5 +1,5 @@
-//go:build !byollvm && darwin && !llvm11 && !llvm12
-// +build !byollvm,darwin,!llvm11,!llvm12
+//go:build !byollvm && darwin
+// +build !byollvm,darwin
 
 package llvm