merge MethodInfo and Method

MethodTable.defs is now a linked list of Method objects
and MethodList now contains LambdaInfo specializations, not Methods

Author: vtjnash

base/boot.jl

@@ -65,12 +65,14 @@
 #    sparam_vals::SimpleVector
 #    specTypes::Any
 #    unspecialized::LambdaInfo
-#    def::MethodInfo
+#    def::Method
 #    pure::Bool
 #end
 
-#type MethodInfo
+#type Method
 #    ast::Expr
+#    sig::Type
+#    tvars::Expr
 #    sparam_syms::SimpleVector
 #    tfunc
 #    name::Symbol
@@ -82,6 +84,10 @@
 #    line::Int32
 #    called::Int32
 #    pure::Bool
+#    isstaged::Bool
+#    va::Bool
+#    invokes::Union{MethodTable,Void}
+#    next::Union{Method,Void}
 #end
 
 #abstract Ref{T}
@@ -138,7 +144,7 @@ export
     Tuple, Type, TypeConstructor, TypeName, TypeVar, Union, Void,
     SimpleVector, AbstractArray, DenseArray,
     # special objects
-    Box, Function, Builtin, IntrinsicFunction, LambdaInfo, MethodInfo, Method, MethodTable,
+    Box, Function, Builtin, IntrinsicFunction, LambdaInfo, MethodList, Method, MethodTable,
     Module, Symbol, Task, Array, WeakRef,
     # numeric types
     Number, Real, Integer, Bool, Ref, Ptr,
@@ -311,7 +317,7 @@ TypeVar(n::Symbol, lb::ANY, ub::ANY, b::Bool) =
     ccall(:jl_new_typevar_, Any, (Any, Any, Any, Any), n, lb::Type, ub::Type, b)::TypeVar
 
 TypeConstructor(p::ANY, t::ANY) = ccall(:jl_new_type_constructor, Any, (Any, Any), p::SimpleVector, t::Type)
-LambdaInfo(ast::MethodInfo, sparam_vals::SimpleVector, specTypes::DataType) = ccall(:jl_new_lambda_info, Any, (Any, Any, Any), ast, sparam_vals, specTypes)
+LambdaInfo(ast::Method, sparam_vals::SimpleVector, specTypes::DataType) = ccall(:jl_new_lambda_info, Any, (Any, Any, Any), ast, sparam_vals, specTypes)
 
 Void() = nothing
 

base/inference.jl

@@ -651,7 +651,7 @@ let stagedcache=Dict{Any,Any}()
         spvals = Any[env[i] for i = 2:2:length(env)]
         _any(sp -> isa(sp, TypeVar), spvals) && empty!(spvals)
         if !m.isstaged
-            return LambdaInfo(m.func, svec(spvals...), tt)
+            return LambdaInfo(m, svec(spvals...), tt)
         elseif haskey(stagedcache, (m, tt))
             return stagedcache[(m, tt)]
         else
@@ -661,7 +661,7 @@ let stagedcache=Dict{Any,Any}()
                 # we can't guarantee that their type behavior is monotonic.
                 return NF
             end
-            f = ccall(:jl_instantiate_staged, Any, (Any, Any, Any), m.func, tt, env)
+            f = ccall(:jl_instantiate_staged, Any, (Any, Any, Any), m, tt, env)
             f = LambdaInfo(f, svec(spvals...), tt)
             stagedcache[(m, tt)] = f
             return f
@@ -1384,7 +1384,7 @@ f_argnames(ast) =
 
 is_rest_arg(arg::ANY) = (ccall(:jl_is_rest_arg,Int32,(Any,), arg) != 0)
 
-function typeinf_ext(linfo::LambdaInfo, atypes::ANY, def::MethodInfo)
+function typeinf_ext(linfo::LambdaInfo, atypes::ANY, def::Method)
     global inference_stack
     last = inference_stack
     inference_stack = EmptyCallStack()
@@ -1394,7 +1394,7 @@ function typeinf_ext(linfo::LambdaInfo, atypes::ANY, def::MethodInfo)
 end
 
 typeinf(linfo::LambdaInfo,atypes::ANY,sparams::ANY) = typeinf(linfo,atypes,sparams,linfo.def,true,false)
-typeinf(linfo::LambdaInfo,atypes::ANY,sparams::ANY,def::MethodInfo) = typeinf(linfo,atypes,sparams,def,true,false)
+typeinf(linfo::LambdaInfo,atypes::ANY,sparams::ANY,def::Method) = typeinf(linfo,atypes,sparams,def,true,false)
 
 CYCLE_ID = 1
 
@@ -1403,7 +1403,7 @@ CYCLE_ID = 1
 
 # def is the original unspecialized version of a method. we aggregate all
 # saved type inference data there.
-function typeinf(linfo::LambdaInfo, atypes::ANY, sparams::SimpleVector, def::MethodInfo, cop, needtree)
+function typeinf(linfo::LambdaInfo, atypes::ANY, sparams::SimpleVector, def::Method, cop, needtree)
     if def.module === Core && isempty(sparams) && isempty(linfo.sparam_vals)
         atypes = Tuple
     end
@@ -1484,7 +1484,7 @@ typeinf_uncached(linfo::LambdaInfo, atypes::ANY, sparams::ANY; optimize=true) =
 tupletype_tail(t::ANY, n) = Tuple{t.parameters[n:end]...}
 
 # compute an inferred (optionally optimized) AST without global effects (i.e. updating the cache)
-function typeinf_uncached(linfo::LambdaInfo, atypes::ANY, sparams::SimpleVector, def::MethodInfo, curtype, cop, optimize)
+function typeinf_uncached(linfo::LambdaInfo, atypes::ANY, sparams::SimpleVector, def::Method, curtype, cop, optimize)
     ast0 = def.ast
     #if dbg
     #    print("typeinf ", def.name, " ", object_id(ast0), "\n")
@@ -2298,7 +2298,7 @@ function inlineable(f::ANY, ft::ANY, e::Expr, atype::ANY, sv::VarInfo, enclosing
     if linfo === NF
         return NF
     end
-    methfunc = meth[3].func
+    methfunc = meth[3]
     methsig = meth[3].sig
     if !(atype <: metharg)
         incompletematch = true
@@ -2346,7 +2346,7 @@ function inlineable(f::ANY, ft::ANY, e::Expr, atype::ANY, sv::VarInfo, enclosing
     #                 return NF
     #             end
     #             meth = meth[1]::Tuple
-    #             linfo2 = meth[3].func.code
+    #             linfo2 = meth[3].code
     #             if linfo2 !== linfo
     #                 return NF
     #             end
@@ -3354,6 +3354,6 @@ function replace_getfield!(ast, e::ANY, tupname, vals, sv, i0)
     end
 end
 
-#tfunc(f,t) = methods(f,t)[1].func.code.tfunc
+#tfunc(f,t) = methods(f,t)[1].code.tfunc
 
 ccall(:jl_set_typeinf_func, Void, (Any,), typeinf_ext)

base/interactiveutil.jl

@@ -65,8 +65,7 @@ function edit(path::AbstractString, line::Integer=0)
 end
 
 function edit(m::Method)
-    tv, decls, file, line = arg_decl_parts(m)
-    edit(string(file), line)
+    edit(string(m.file), m.line)
 end
 
 edit(f)          = edit(functionloc(f)...)
@@ -599,7 +598,7 @@ function summarysize(obj::MethodTable, seen, excl)
     return size
 end
 
-function summarysize(m::Method, seen, excl)
+function summarysize(m::MethodList, seen, excl)
     size::Int = 0
     while true
         haskey(seen, m) ? (return size) : (seen[m] = true)
@@ -608,10 +607,8 @@ function summarysize(m::Method, seen, excl)
             size += summarysize(m.func, seen, excl)::Int
         end
         size += summarysize(m.sig, seen, excl)::Int
-        size += summarysize(m.tvars, seen, excl)::Int
-        size += summarysize(m.invokes, seen, excl)::Int
         m.next === nothing && break
-        m = m.next::Method
+        m = m.next::MethodList
     end
     return size
 end

base/methodshow.jl

@@ -28,47 +28,50 @@ end
 
 function arg_decl_parts(m::Method)
     tv = m.tvars
-    if !isa(tv,SimpleVector)
+    if !isa(tv, SimpleVector)
         tv = Any[tv]
     else
         tv = Any[tv...]
     end
-    li = m.func
-    e = uncompressed_ast(li)
+    e = uncompressed_ast(m)
     argnames = e.args[1]
     s = symbol("?")
     decls = [argtype_decl(:tvar_env => tv, get(argnames,i,s), m.sig.parameters[i])
                 for i = 1:length(m.sig.parameters)]
-    return tv, decls, li.file, li.line
+    return tv, decls
 end
 
 function show(io::IO, m::Method)
-    tv, decls, file, line = arg_decl_parts(m)
-    ft = m.sig.parameters[1]
-    d1 = decls[1]
-    if ft <: Function &&
-            isdefined(ft.name.module, ft.name.mt.name) &&
-            ft == typeof(getfield(ft.name.module, ft.name.mt.name))
-        print(io, ft.name.mt.name)
-    elseif isa(ft, DataType) && is(ft.name, Type.name) && isleaftype(ft)
-        f = ft.parameters[1]
-        if isa(f, DataType) && isempty(f.parameters)
-            print(io, f)
+    if isdefined(m, :sig)
+        tv, decls = arg_decl_parts(m)
+        ft = m.sig.parameters[1]
+        d1 = decls[1]
+        if ft <: Function &&
+                isdefined(ft.name.module, ft.name.mt.name) &&
+                ft == typeof(getfield(ft.name.module, ft.name.mt.name))
+            print(io, ft.name.mt.name)
+        elseif isa(ft, DataType) && is(ft.name, Type.name) && isleaftype(ft)
+            f = ft.parameters[1]
+            if isa(f, DataType) && isempty(f.parameters)
+                print(io, f)
+            else
+                print(io, "(", d1[1], "::", d1[2], ")")
+            end
         else
             print(io, "(", d1[1], "::", d1[2], ")")
         end
+        if !isempty(tv)
+            show_delim_array(io, tv, '{', ',', '}', false)
+        end
+        print(io, "(")
+        print_joined(io, [isempty(d[2]) ? d[1] : d[1]*"::"*d[2] for d in decls[2:end]],
+                     ", ", ", ")
+        print(io, ")")
     else
-        print(io, "(", d1[1], "::", d1[2], ")")
-    end
-    if !isempty(tv)
-        show_delim_array(io, tv, '{', ',', '}', false)
+        print(io, m.name, "(?)")
     end
-    print(io, "(")
-    print_joined(io, [isempty(d[2]) ? d[1] : d[1]*"::"*d[2] for d in decls[2:end]],
-                 ", ", ", ")
-    print(io, ")")
-    if line > 0
-        print(io, " at ", file, ":", line)
+    if m.line > 0
+        print(io, " at ", m.file, ":", m.line)
     end
 end
 
@@ -114,10 +117,10 @@ end
 fileurl(file) = let f = find_source_file(file); f === nothing ? "" : "file://"*f; end
 
 function url(m::Method)
-    M = m.func.module
-    (m.func.file == :null || m.func.file == :string) && return ""
-    file = string(m.func.file)
-    line = m.func.line
+    M = m.module
+    (m.file == :null || m.file == :string) && return ""
+    file = string(m.file)
+    line = m.line
     line <= 0 || ismatch(r"In\[[0-9]+\]", file) && return ""
     if inbase(M)
         if isempty(Base.GIT_VERSION_INFO.commit)
@@ -149,39 +152,43 @@ function url(m::Method)
 end
 
 function writemime(io::IO, ::MIME"text/html", m::Method)
-    tv, decls, file, line = arg_decl_parts(m)
-    ft = m.sig.parameters[1]
-    d1 = decls[1]
-    if ft <: Function &&
-            isdefined(ft.name.module, ft.name.mt.name) &&
-            ft == typeof(getfield(ft.name.module, ft.name.mt.name))
-        print(io, ft.name.mt.name)
-    elseif isa(ft, DataType) && is(ft.name, Type.name) && isleaftype(ft)
-        f = ft.parameters[1]
-        if isa(f, DataType) && isempty(f.parameters)
-            print(io, f)
+    if isdefined(m, :sig)
+        tv, decls = arg_decl_parts(m)
+        ft = m.sig.parameters[1]
+        d1 = decls[1]
+        if ft <: Function &&
+                isdefined(ft.name.module, ft.name.mt.name) &&
+                ft == typeof(getfield(ft.name.module, ft.name.mt.name))
+            print(io, ft.name.mt.name)
+        elseif isa(ft, DataType) && is(ft.name, Type.name) && isleaftype(ft)
+            f = ft.parameters[1]
+            if isa(f, DataType) && isempty(f.parameters)
+                print(io, f)
+            else
+                print(io, "(", d1[1], "::<b>", d1[2], "</b>)")
+            end
         else
             print(io, "(", d1[1], "::<b>", d1[2], "</b>)")
         end
+        if !isempty(tv)
+            print(io,"<i>")
+            show_delim_array(io, tv, '{', ',', '}', false)
+            print(io,"</i>")
+        end
+        print(io, "(")
+        print_joined(io, [isempty(d[2]) ? d[1] : d[1]*"::<b>"*d[2]*"</b>"
+                          for d in decls[2:end]], ", ", ", ")
+        print(io, ")")
     else
-        print(io, "(", d1[1], "::<b>", d1[2], "</b>)")
-    end
-    if !isempty(tv)
-        print(io,"<i>")
-        show_delim_array(io, tv, '{', ',', '}', false)
-        print(io,"</i>")
-    end
-    print(io, "(")
-    print_joined(io, [isempty(d[2]) ? d[1] : d[1]*"::<b>"*d[2]*"</b>"
-                      for d in decls[2:end]], ", ", ", ")
-    print(io, ")")
-    if line > 0
+        print(io, m.name, "(?)")
+    end
+    if m.line > 0
         u = url(m)
         if isempty(u)
-            print(io, " at ", file, ":", line)
+            print(io, " at ", m.file, ":", m.line)
         else
             print(io, """ at <a href="$u" target="_blank">""",
-                  file, ":", line, "</a>")
+                  m.file, ":", m.line, "</a>")
         end
     end
 end

base/reflection.jl

@@ -170,8 +170,8 @@ end
 
 tt_cons(t::ANY, tup::ANY) = (@_pure_meta; Tuple{t, (isa(tup, Type) ? tup.parameters : tup)...})
 
-code_lowered(f, t::ANY=Tuple) = map(m->uncompressed_ast(m.func), methods(f, t))
-function methods(f::ANY,t::ANY)
+code_lowered(f, t::ANY=Tuple) = map(m->uncompressed_ast(m), methods(f, t))
+function methods(f::ANY, t::ANY)
     if isa(f,Builtin)
         throw(ArgumentError("argument is not a generic function"))
     end
@@ -240,13 +240,13 @@ function length(mt::MethodTable)
 end
 
 start(mt::MethodTable) = mt.defs
-next(mt::MethodTable, m::Method) = (m,m.next)
+next(mt::MethodTable, m::Method) = (m, m.next)
 done(mt::MethodTable, m::Method) = false
 done(mt::MethodTable, i::Void) = true
 
 uncompressed_ast(l::LambdaInfo) =
     isa(l.inferred_ast,Expr) ? l.inferred_ast : ccall(:jl_uncompress_ast, Any, (Any,Any), l.def, l.inferred_ast)
-uncompressed_ast(l::MethodInfo) =
+uncompressed_ast(l::Method) =
     isa(l.ast,Expr) ? l.ast : ccall(:jl_uncompress_ast, Any, (Any,Any), l, l.ast)
 
 # Printing code representations in IR and assembly
@@ -279,7 +279,7 @@ code_native(f::ANY, types::ANY=Tuple) = code_native(STDOUT, f, types)
 
 # give a decent error message if we try to instantiate a staged function on non-leaf types
 function func_for_method_checked(m, types)
-    linfo = Core.Inference.func_for_method(m[3],m[1],m[2])
+    linfo = Core.Inference.func_for_method(m[3], m[1], m[2])
     if linfo === Core.Inference.NF
         error("cannot call @generated function `", m[3], "` ",
               "with abstract argument types: ", types)
@@ -348,12 +348,11 @@ function which_module(m::Module, s::Symbol)
 end
 
 function functionloc(m::Method)
-    lsd = m.func::MethodInfo
-    ln = lsd.line
+    ln = m.line
     if ln <= 0
         error("could not determine location of method definition")
     end
-    (find_source_file(string(lsd.file)), ln)
+    (find_source_file(string(m.file)), ln)
 end
 
 functionloc(f::ANY, types::ANY) = functionloc(which(f,types))
@@ -377,7 +376,7 @@ function function_module(f, types::ANY)
     if isempty(m)
         error("no matching methods")
     end
-    m[1].func.module
+    m[1].module
 end
 
 function method_exists(f::ANY, t::ANY)