Merge pull request #296 from maleadt/tb/augment_platform

Use new LLVMExtra jll supporting asserts builds.

Author: maleadt

.github/workflows/ci.yml

@@ -12,21 +12,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['1.6', '^1.7', 'nightly']
+        version: ['1.6', '1.7', '^1.8.0-beta1', 'nightly']
         os: [ubuntu-latest, macOS-latest, windows-latest]
         arch: [x64]
-        libLLVMExtra: [local, packaged]
+        libLLVMExtra: [packaged]
         assertions: [false]
-        exclude:
-          # our simple build_local.jl cannot build libLLVMExtra on Windows
-          - os: windows-latest
-            arch: x64
-            libLLVMExtra: local
         include:
-          # specially-handled assertions build
+          # special test with a locally-built libLLVMExtra
           - os: ubuntu-latest
             arch: x64
             libLLVMExtra: local
+            version: '1.7'
+            assertions: true
+          # special test with LLVM assertions enabled
+          # TODO: enable this across all versions
+          #       (needs LLVM.jl fixes, and julia-actions/setup-julia support)
+          - os: ubuntu-latest
+            arch: x64
+            libLLVMExtra: packaged
+            version: '1.7'
+            assertions: true
+          - os: ubuntu-latest
+            arch: x64
+            libLLVMExtra: packaged
             version: '1.8'
             assertions: true
     steps:

Manifest.toml

@@ -33,10 +33,14 @@ uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 version = "1.4.1"
 
 [[LLVMExtra_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "67cc5406b15bd04ff72a45f628bec61d36078908"
+deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"]
+git-tree-sha1 = "5558ad3c8972d602451efe9d81c78ec14ef4f5ef"
 uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
-version = "0.0.13+3"
+version = "0.0.14+2"
+
+[[LazyArtifacts]]
+deps = ["Artifacts", "Pkg"]
+uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
@@ -80,9 +84,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[Preferences]]
 deps = ["TOML"]
-git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af"
+git-tree-sha1 = "de893592a221142f3db370f48290e3a2ef39998f"
 uuid = "21216c6a-2e73-6563-6e65-726566657250"
-version = "1.2.3"
+version = "1.2.4"
 
 [[Printf]]
 deps = ["Unicode"]

Project.toml

@@ -11,5 +11,5 @@ Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
 [compat]
 CEnum = "0.2, 0.3, 0.4"
-LLVMExtra_jll = "=0.0.13"
+LLVMExtra_jll = "=0.0.14"
 julia = "1.6"

src/LLVM.jl

@@ -18,17 +18,6 @@ if libllvm === nothing
              If you are, please file an issue and attach the output of `Libdl.dllist()`.""")
 end
 
-# our JLL doesn't support LLVM with assertions yet, so loading LLVMExtra might fail.
-Libdl.dlopen(libllvm) do handle
-    if Libdl.dlsym(handle, "_ZN4llvm23EnableABIBreakingChecksE"; throw_error=false) !== nothing
-        @warn """You are using a version of Julia that links against a build of LLVM with assertions enabled.
-
-                    This is not supported out-of-the-box, and you need a build of libLLVMExtra that supports this.
-                    Use `deps/build_local.jl` for that, add the resulting LocalPreferences.toml to your project
-                    and add a direct dependency on LLVMExtra_jll to pick up those preferences."""
-    end
-end
-
 module API
 using CEnum
 using ..LLVM

src/version.jl

@@ -18,3 +18,9 @@ function runtime_version()
         VersionNumber(m[:version])
     end
 end
+
+function is_asserts()
+    Libdl.dlopen(libllvm) do handle
+        Libdl.dlsym(handle, "_ZN4llvm23EnableABIBreakingChecksE"; throw_error=false) !== nothing
+    end
+end

test/runtests.jl

@@ -1,13 +1,10 @@
 using LLVM
-using LLVMExtra_jll
 using Test
 
 if Base.JLOptions().debug_level < 2
     @warn "It is recommended to run the LLVM.jl test suite with -g2"
 end
 
-@info "Using libLLVMExtra from $(LLVM.API.libLLVMExtra)"
-
 @testset "LLVM" begin
 
 # HACK: if a test throws within a Context() do block, displaying the LLVM value may crash
@@ -71,7 +68,7 @@ include("utils.jl")
 if LLVM.has_orc_v1()
     include("orc.jl")
 end
-if LLVM.has_orc_v2()
+if LLVM.has_orc_v2() && !(LLVM.version() < v"13" && LLVM.is_asserts())
     include("orcv2.jl")
 end