-
Notifications
You must be signed in to change notification settings - Fork 64
Adapt for julia 1.13 #2818
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.
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
base: main
Are you sure you want to change the base?
Adapt for julia 1.13 #2818
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,7 @@ jobs: | |
| - "1.10" | ||
| - "1.11" | ||
| - "1.12" | ||
| - "~1.13.0-0" | ||
| # - 'nightly' | ||
| os: | ||
| - ubuntu-24.04 | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -49,11 +49,14 @@ function Core.Compiler.optimize( | |||||
| opt.src, opt, caller | ||||||
| ) | ||||||
| Core.Compiler.ipo_dataflow_analysis!(interp, ir, caller) | ||||||
| else | ||||||
| elseif VERSION < v"1.13-" | ||||||
| Core.Compiler.@timeit "optimizer" ir = Core.Compiler.run_passes_ipo_safe( | ||||||
| opt.src, opt | ||||||
| ) | ||||||
| Core.Compiler.ipo_dataflow_analysis!(interp, opt, ir, caller) | ||||||
| else | ||||||
| Core.Compiler.@zone "optimizer" ir = Core.Compiler.run_passes_ipo_safe(opt.src, opt) | ||||||
| Core.Compiler.ipo_dataflow_analysis!(interp, opt, ir, caller) | ||||||
| end | ||||||
| mi = opt.linfo | ||||||
| if DEBUG_INTERP[] | ||||||
|
|
@@ -64,7 +67,11 @@ function Core.Compiler.optimize( | |||||
| safe_print("post rewrite_insts", ir) | ||||||
| end | ||||||
| Core.Compiler.verify_ir(ir) | ||||||
| res = Core.Compiler.finish(interp, opt, ir, caller) | ||||||
| @static if VERSION < v"1.13-" | ||||||
| res = Core.Compiler.finish(interp, opt, ir, caller) | ||||||
| else | ||||||
| res = Core.Compiler.finishopt!(interp, opt, ir) | ||||||
| end | ||||||
|
|
||||||
| return res | ||||||
| end | ||||||
|
|
@@ -196,7 +203,11 @@ const __skip_rewrite_func_set = Set([ | |||||
| typeof(Base.StackTraces.show_spec_sig), | ||||||
| typeof(Core.throw_inexacterror), | ||||||
| typeof(Base.throw_boundserror), | ||||||
| typeof(Base._shrink), | ||||||
| @static( | ||||||
| if VERSION < v"1.13-" | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Memoryref wass only introduced in 1.11 which causes the CI to fail on 1.10.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's a copy-pasted mistake, logic about Base.memoryref for 1.11 still exists in later context, thanks for remind! |
||||||
| typeof(Base._shrink) | ||||||
| end | ||||||
| ), | ||||||
| typeof(Base._shrink!), | ||||||
| typeof(Base.ht_keyindex), | ||||||
| typeof(Base.checkindex), | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am confused what the reasoning for removing this line entirely is for shouldn't this be wrapped in an @static if Version < 1.13 block instead?