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

Add unique_id field to Var #29

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add unique_id field to Var #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e6511f
Add unique_id field to Var
cscherrer Mar 1, 2022
4d54e33
Missed some cases
cscherrer Mar 1, 2022
78c93d2
Apply suggestions from https://github.com/JuliaStaging/JuliaVariables…
cscherrer Mar 17, 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
10 changes: 7 additions & 3 deletions src/JuliaVariables.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ SymRef(sym::Symbol, ana::Union{Nothing, Analyzer}) = SymRef(sym, ana, false)

struct Var
name::Symbol
unique_id:: Union{Ref{Bool}, Nothing} # nothing when it's a global variable
is_mutable::Bool
is_shared::Bool
is_global::Bool
Expand Down Expand Up @@ -135,6 +136,7 @@ function solve!(ast; toplevel=true)
PHYSICAL = true
PSEUDO = false
IS_BOUND_INIT = Ref(false)
id = Dict{Symbol, Int}()

@nospecialize
function LHS(ex)
Expand Down Expand Up @@ -442,7 +444,8 @@ function solve!(ast; toplevel=true)
end

function local_var_to_var(var::LocalVar)::Var
Var(var.sym, var.is_mutable[], var.is_shared[], false)
unique_id = var.is_shared
Var(var.sym, unique_id, var.is_mutable[], var.is_shared[], false)
end

function to_symref(ex::Expr)
Expand Down Expand Up @@ -477,10 +480,11 @@ function solve!(ast; toplevel=true)
end

function from_symref(s::SymRef)
id[s.sym] = get(id, s.sym, 0) + 1
s.as_non_sym && return s.sym
s.ana === nothing && return Var(s.sym, true, true, true)
s.ana === nothing && return Var(s.sym, nothing, true, true, true)
var = s.ana.solved[s.sym]
var isa Symbol && return Var(var, true, true, true)
var isa Symbol && return Var(var, nothing, true, true, true)
local_var_to_var(var)
end

Expand Down