fix #782

JuliaLang · May 1, 2012 · e1ea610 · e1ea610
1 parent 735cc6c
commit e1ea610
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/base/inference.jl b/base/inference.jl
@@ -1299,6 +1299,9 @@ end
 # static parameters are ok if all the static parameter values are leaf types,
 # meaning they are fully known.
 function inlineable(f, e::Expr, vars)
+    if !(isa(f,Function)||isa(f,CompositeKind))
+        return NF
+    end
     argexprs = a2t_butfirst(e.args)
     atypes = limit_tuple_type(map(exprtype, argexprs))
 

diff --git a/src/gf.c b/src/gf.c
@@ -1487,6 +1487,7 @@ JL_CALLABLE(jl_f_ctor_trampoline);
 DLLEXPORT
 jl_value_t *jl_matching_methods(jl_function_t *gf, jl_value_t *type, int lim)
 {
+    assert(jl_is_func(gf));
     if (gf->fptr == jl_f_ctor_trampoline)
         jl_add_constructors((jl_struct_type_t*)gf);
     if (!jl_is_gf(gf)) {