Skip to content

Commit 0d7bcf7

Browse files
authored
Merge pull request #167 from maleadt/tb/julia_updates
Updates for Julia
2 parents b9620d7 + d333ec7 commit 0d7bcf7

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ test:nightly:
3434

3535
# special tests
3636

37-
test:source:llvm8:
38-
extends:
39-
- .julia:source
40-
- .test
41-
variables:
42-
CI_BUILD_ARGS: 'LLVM_VER=8.0.0 USE_BINARYBUILDER_LLVM=0'
43-
4437
test:source:llvm9:
4538
extends:
4639
- .julia:source

src/transform.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,7 @@ internalize!(pm::PassManager, exports::Vector{String}) =
137137

138138
export nvvm_reflect!
139139

140-
nvvm_reflect!(pm::PassManager, smversion=35) = API.LLVMAddNVVMReflectPass(ref(pm), smversion)
140+
function nvvm_reflect!(pm::PassManager, smversion=35)
141+
VERSION >= v"1.5.0-DEV.138" && error("NVVMReflect pass has been removed from Julia and LLVM")
142+
API.LLVMAddNVVMReflectPass(ref(pm), smversion)
143+
end

test/transform.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ModulePassManager() do pm
9292
internalize!(pm, false)
9393
internalize!(pm, ["SomeFunction", "SomeOtherFunction"])
9494

95-
if :NVPTX in LLVM.libllvm_targets
95+
if :NVPTX in LLVM.libllvm_targets && VERSION <= v"1.5.0-DEV.138"
9696
nvvm_reflect!(pm)
9797
end
9898
end

0 commit comments

Comments
 (0)