Fix for change in CodeInfo.slotnames type on julia master (#251)

Author: timholy

src/JuliaInterpreter.jl

@@ -36,6 +36,8 @@ if VERSION < v"1.2.0-DEV.572"
     Base.convert(::Type{Some{T}}, x::Some{T}) where {T} = x
 end
 
+const SlotNamesType = VERSION < v"1.2.0-DEV.606" ? Vector{Any} : Vector{Symbol}
+
 include("types.jl")
 include("utils.jl")
 include("construct.jl")

src/construct.jl

@@ -246,7 +246,7 @@ end
 function prepare_framedata(framecode, argvals::Vector{Any}, caller_will_catch_err::Bool=false)
     if isa(framecode.scope, Method)
         meth, src = framecode.scope::Method, framecode.src
-        slotnames = src.slotnames::Vector{Any}  # this is more strongly typed in julia.h than in jltypes.c
+        slotnames = src.slotnames::SlotNamesType
         ssavt = src.ssavaluetypes
         ng = isa(ssavt, Int) ? ssavt : length(ssavt::Vector{Any})
         nargs, meth_nargs = length(argvals), Int(meth.nargs)

src/interpret.jl

@@ -327,7 +327,7 @@ function do_assignment!(frame, @nospecialize(lhs), @nospecialize(rhs))
         data.ssavalues[lhs.id] = rhs
     elseif isa(lhs, SlotNumber)
         data.locals[lhs.id] = Some{Any}(rhs)
-        slotnames = code.src.slotnames::Vector{Any}
+        slotnames = code.src.slotnames::SlotNamesType
         data.last_reference[slotnames[lhs.id]::Symbol] = lhs.id
     elseif isa(lhs, GlobalRef)
         Core.eval(lhs.mod, :($(lhs.name) = $(QuoteNode(rhs))))

src/utils.jl

@@ -293,7 +293,7 @@ function locals(frame::Frame)
     vars = Variable[]
     data, code = frame.framedata, frame.framecode
     added = Set{Symbol}()
-    slotnames = code.src.slotnames::Vector{Any}
+    slotnames = code.src.slotnames::SlotNamesType
     for sym in slotnames
         sym ∈ added && continue
         idx = get(data.last_reference, sym, 0)