Skip to content

Commit ceb30f5

Browse files
authored
Merge pull request #165 from maleadt/tb/bbpass
Remove BBpass
2 parents 792edc1 + 65241d4 commit ceb30f5

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ test:source:llvm9:
4646
- .julia:source
4747
- .test
4848
variables:
49-
CI_BUILD_ARGS: 'LLVM_VER=9.0.0rc6 USE_BINARYBUILDER_LLVM=0'
49+
CI_BUILD_ARGS: 'LLVM_VER=9.0.0 USE_BINARYBUILDER_LLVM=0'
5050

5151

5252
# other tasks
5353

5454
coverage:
5555
extends:
56-
- .julia:1.2
56+
- .julia:1.3
5757
- .coverage
5858

5959
documentation:
6060
extends:
61-
- .julia:1.2
61+
- .julia:1.3
6262
- .documentation

src/pass.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ export BasicBlockPass
5858
root::Any
5959

6060
function BasicBlockPass(name::String, runner::Core.Function)
61+
VERSION >= v"1.4.0-DEV.589" && error("BasicBlockPass functionality has been removed from Julia and LLVM")
62+
6163
function callback(ptr::Ptr{Cvoid})::Core.Bool
6264
bb = BasicBlock(convert(reftype(BasicBlock), ptr))
6365
return runner(bb)::Core.Bool

test/pass.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ LLVM.Module("SomeModule", ctx) do mod
5151
return false
5252
end
5353

54-
let pass = BasicBlockPass("SomeBasicBlockPass", runOnBasicBlock)
54+
if VERSION < v"1.4.0-DEV.589"
55+
let pass = BasicBlockPass("SomeBasicBlockPass", runOnBasicBlock)
5556

56-
FunctionPassManager(mod) do fpm
57-
add!(fpm, pass)
58-
run!(fpm, fn)
57+
FunctionPassManager(mod) do fpm
58+
add!(fpm, pass)
59+
run!(fpm, fn)
60+
end
5961
end
6062
end
6163
end

0 commit comments

Comments
 (0)