Skip to content

Commit bb8d27a

Browse files
committed
fixup pass names
1 parent 8eabf99 commit bb8d27a

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

Compiler/test/inline.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,7 +1849,7 @@ multi_inlining1(a::Int, b::Int) = @noinline func_mul_int(a, b)
18491849
let i::Int, continue_::Bool
18501850
interp = Compiler.NativeInterpreter()
18511851
# check if callsite `@noinline` annotation works
1852-
ir, = only(Base.code_ircode(multi_inlining1, (Int,Int); optimize_until="inlining", interp))
1852+
ir, = only(Base.code_ircode(multi_inlining1, (Int,Int); optimize_until="Inlining", interp))
18531853
i = findfirst(isinvoke(:func_mul_int), ir.stmts.stmt)
18541854
@test i !== nothing
18551855
# now delete the callsite flag, and see the second inlining pass can inline the call
@@ -1873,7 +1873,7 @@ multi_inlining2(a::Int, b::Int) = call_func_mul_int(a, b)
18731873
let i::Int, continue_::Bool
18741874
interp = Compiler.NativeInterpreter()
18751875
# check if callsite `@noinline` annotation works
1876-
ir, = only(Base.code_ircode(multi_inlining2, (Int,Int); optimize_until="inlining", interp))
1876+
ir, = only(Base.code_ircode(multi_inlining2, (Int,Int); optimize_until="Inlining", interp))
18771877
i = findfirst(isinvoke(:func_mul_int), ir.stmts.stmt)
18781878
@test i !== nothing
18791879
# now delete the callsite flag, and see the second inlining pass can inline the call

Compiler/test/irpasses.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,9 @@ let # Test that CFG simplify doesn't try to merge every block in a loop into
920920
end
921921

922922
# `cfg_simplify!` shouldn't error in a presence of `try/catch` block
923-
let ir = Base.code_ircode(; optimize_until="slot2ssa") do
923+
# XXX: There used to be a `"optimize_until="slot2ssa"` in the `code_ircode` call below
924+
# but there is no pass with that name.
925+
let ir = Base.code_ircode() do
924926
v = try
925927
catch
926928
end
@@ -1458,7 +1460,9 @@ function f_with_early_try_catch_exit()
14581460
result
14591461
end
14601462

1461-
let ir = first(only(Base.code_ircode(f_with_early_try_catch_exit, (); optimize_until="compact")))
1463+
# XXX: There used to be a `optimize_until="compact"` in the `code_ircode` call below
1464+
# but there is no pass with that name.
1465+
let ir = first(only(Base.code_ircode(f_with_early_try_catch_exit, ())))
14621466
for i = 1:length(ir.stmts)
14631467
expr = ir.stmts[i][:stmt]
14641468
if isa(expr, PhiCNode)

Compiler/test/ssair.jl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,10 @@ import Core: SSAValue
597597
import .Compiler: NewInstruction, insert_node!
598598

599599
# insert_node! for pending node
600-
let ir = Base.code_ircode((Int,Int); optimize_until="inlining") do a, b
600+
# XXX: There used to be an `optimize_until="inlining"` in the `code_ircode` call below
601+
# but there is no pass with that name (there is a pass called "Inlining" but fixing that typo
602+
# makes the test fail
603+
let ir = Base.code_ircode((Int,Int)) do a, b
601604
a^b
602605
end |> only |> first
603606
nstmts = length(ir.stmts)
@@ -658,7 +661,10 @@ let code = Any[
658661
end
659662

660663
# insert_node! with new instruction with flag computed
661-
let ir = Base.code_ircode((Int,Int); optimize_until="inlining") do a, b
664+
# XXX: There used to be an `optimize_until="inlining"` in the `code_ircode` call below
665+
# but there is no pass with that name (there is a pass called "Inlining" but fixing that typo
666+
# makes the test fail
667+
let ir = Base.code_ircode((Int,Int)) do a, b
662668
a^b
663669
end |> only |> first
664670
invoke_idx = findfirst(@nospecialize(stmt)->Meta.isexpr(stmt, :invoke), ir.stmts.stmt)

0 commit comments

Comments
 (0)