Skip to content
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

set type of statement when processing GlobalRefs #44200

Merged
merged 5 commits into from
Feb 18, 2022
Merged

set type of statement when processing GlobalRefs #44200

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
de7b7a7
set type of statement when processing `GlobalRef`s
simeonschaub Feb 16, 2022
4ec5f87
Update test/compiler/inline.jl
simeonschaub Feb 16, 2022
5772df2
Merge remote-tracking branch 'origin/master' into sds/set_type_globalref
simeonschaub Feb 17, 2022
a0a1c7d
fix style nits in tests
simeonschaub Feb 17, 2022
77d8811
fix typo
simeonschaub Feb 18, 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
6 changes: 5 additions & 1 deletion base/compiler/ssair/ir.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,11 @@ function process_node!(compact::IncrementalCompact, result_idx::Int, inst::Instr
elseif isa(stmt, GotoNode) && compact.cfg_transforms_enabled
result[result_idx][:inst] = GotoNode(compact.bb_rename_succ[stmt.label])
result_idx += 1
elseif isa(stmt, GlobalRef) || isa(stmt, GotoNode)
elseif isa(stmt, GlobalRef)
result[result_idx][:inst] = stmt
result[result_idx][:type] = argextype(stmt, compact)
result_idx += 1
elseif isa(stmt, GotoNode)
result[result_idx][:inst] = stmt
result_idx += 1
elseif isa(stmt, GotoIfNot) && compact.cfg_transforms_enabled
Expand Down
12 changes: 12 additions & 0 deletions test/compiler/inline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,3 +1069,15 @@ end
@test fully_eliminated() do
issue41694(2)
end

global x44200::Int = 0
function f44200()
global x = 0
while x < 10
x += 1
end
x
Comment on lines +1075 to +1079
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
global x = 0
while x < 10
x += 1
end
x
global x44200 = 0
while x44200 < 10
x44200 += 1
end
x44200

end
let src = code_typed1(f44200)
@test count(x -> isa(x, Core.PiNode), src.code) == 0
end