Skip to content

try to fix nightly #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Roger-luo wants to merge 5 commits into
base: master
Choose a base branch
from
Open

try to fix nightly #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab61270
try to fix 1.9
Roger-luo Nov 3, 2022
15a41ed
update CI julia versions to only test on LTS, stable and nightly
Roger-luo Nov 3, 2022
2da9c7b
fix inline pass
Roger-luo Nov 3, 2022
0cf06fe
fix undef var
Roger-luo Nov 3, 2022
30b3400
rm patches for 1.9
Roger-luo Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.7'
- '1'
- '1.6'
- 'nightly'
os:
Expand Down
7 changes: 6 additions & 1 deletion src/passes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ The default julia optimization pass.
"""
function default_julia_pass(ir::IRCode, sv::OptimizationState)
ir = compact!(ir)
ir = ssa_inlining_pass!(ir, ir.linetable, sv.inlining, sv.src.propagate_inbounds)
if VERSION < v"1.9-"
ir = ssa_inlining_pass!(ir, ir.linetable, sv.inlining, sv.src.propagate_inbounds)
else
ir = ssa_inlining_pass!(ir, sv.inlining, sv.src.propagate_inbounds)
end

ir = compact!(ir)

@static if VERSION < v"1.8-"
Expand Down
10 changes: 6 additions & 4 deletions src/patches.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,12 @@ end
end

# move this to Base?
Base.iterate(ic::Core.Compiler.IncrementalCompact) = Core.Compiler.iterate(ic)
Base.iterate(ic::Core.Compiler.IncrementalCompact, st) = Core.Compiler.iterate(ic, st)
Base.getindex(ic::Core.Compiler.IncrementalCompact, idx) = Core.Compiler.getindex(ic, idx)
Base.setindex!(ic::Core.Compiler.IncrementalCompact, v, idx) = Core.Compiler.setindex!(ic, v, idx)
@static if VERSION < v"1.9-"
Base.iterate(ic::Core.Compiler.IncrementalCompact) = Core.Compiler.iterate(ic)
Base.iterate(ic::Core.Compiler.IncrementalCompact, st) = Core.Compiler.iterate(ic, st)
Base.getindex(ic::Core.Compiler.IncrementalCompact, idx) = Core.Compiler.getindex(ic, idx)
Base.setindex!(ic::Core.Compiler.IncrementalCompact, v, idx) = Core.Compiler.setindex!(ic, v, idx)
end

Base.getindex(ic::Core.Compiler.Instruction, idx) = Core.Compiler.getindex(ic, idx)
Base.setindex!(ic::Core.Compiler.Instruction, v, idx) = Core.Compiler.setindex!(ic, v, idx)
Expand Down
12 changes: 9 additions & 3 deletions src/typeinf.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@ return ret
```
"""
function typeinf_lock(f)
ccall(:jl_typeinf_begin, Cvoid, ())
ret = f()
ccall(:jl_typeinf_end, Cvoid, ())
@static if VERSION < v"1.9-"
ccall(:jl_typeinf_begin, Cvoid, ())
ret = f()
ccall(:jl_typeinf_end, Cvoid, ())
else
ccall(:jl_typeinf_timing_begin, Cvoid, ())
ret = f()
ccall(:jl_typeinf_timing_end, Cvoid, ())
end
return ret
end