add world counter to MethodError

Author: vtjnash

base/base.jl

@@ -57,7 +57,10 @@ Alternatively, there is no unique most-specific method.
 type MethodError <: Exception
     f
     args
+    world::UInt
+    MethodError(f::ANY, args::ANY, world::UInt) = new(f, args, world)
 end
+MethodError(f::ANY, args::ANY) = MethodError(f, args, 0)
 
 """
     EOFError()

base/replutil.jl

@@ -341,6 +341,7 @@ function showerror(io::IO, ex::MethodError)
             print(io, "you may have intended to import Base.", name)
         end
     end
+    # TODO: world counter check
     if !is_arg_types
         # Check for row vectors used where a column vector is intended.
         vec_args = []
@@ -538,6 +539,7 @@ function show_method_candidates(io::IO, ex::MethodError, kwargs::Vector=Any[])
                         end
                     end
                 end
+                # TODO: indicate if it's in the wrong world
                 push!(lines, (buf, right_matches))
             end
         end

src/ast.c

@@ -156,7 +156,7 @@ value_t fl_invoke_julia_macro(fl_context_t *fl_ctx, value_t *args, uint32_t narg
         mfunc = jl_method_lookup(jl_gf_mtable(margs[0]), margs, nargs, 1, world);
         if (mfunc == NULL) {
             JL_GC_POP();
-            jl_method_error((jl_function_t*)margs[0], margs, nargs);
+            jl_method_error((jl_function_t*)margs[0], margs, nargs, world);
             // unreachable
         }
         margs[nargs] = result = jl_call_method_internal(mfunc, margs, nargs);

src/gf.c

@@ -1070,14 +1070,22 @@ JL_DLLEXPORT void jl_method_table_insert(jl_methtable_t *mt, jl_method_t *method
     JL_GC_POP();
 }
 
-void JL_NORETURN jl_method_error_bare(jl_function_t *f, jl_value_t *args)
+void JL_NORETURN jl_method_error_bare(jl_function_t *f, jl_value_t *args, size_t world)
 {
     if (jl_methoderror_type) {
-        jl_throw(jl_new_struct(jl_methoderror_type, f, args));
+        jl_value_t *e = jl_new_struct_uninit(jl_methoderror_type);
+        struct jl_method_error {
+            jl_value_t *f;
+            jl_value_t *args;
+            size_t world;
+        } *pe = (void*)e,
+           ee = {f, args, world};
+        *pe = ee;
+        jl_throw(e);
     }
     else {
         jl_printf((JL_STREAM*)STDERR_FILENO, "A method error occurred before the base MethodError type was defined. Aborting...\n");
-        jl_static_show((JL_STREAM*)STDERR_FILENO,(jl_value_t*)f); jl_printf((JL_STREAM*)STDERR_FILENO,"\n");
+        jl_static_show((JL_STREAM*)STDERR_FILENO,(jl_value_t*)f); jl_printf((JL_STREAM*)STDERR_FILENO," world %u\n", (unsigned)world);
         jl_static_show((JL_STREAM*)STDERR_FILENO,args); jl_printf((JL_STREAM*)STDERR_FILENO,"\n");
         jl_ptls_t ptls = jl_get_ptls_states();
         ptls->bt_size = rec_backtrace(ptls->bt_data, JL_MAX_BT_SIZE);
@@ -1087,11 +1095,11 @@ void JL_NORETURN jl_method_error_bare(jl_function_t *f, jl_value_t *args)
     // not reached
 }
 
-void JL_NORETURN jl_method_error(jl_function_t *f, jl_value_t **args, size_t na)
+void JL_NORETURN jl_method_error(jl_function_t *f, jl_value_t **args, size_t na, size_t world)
 {
     jl_value_t *argtup = jl_f_tuple(NULL, args+1, na-1);
     JL_GC_PUSH1(&argtup);
-    jl_method_error_bare(f, argtup);
+    jl_method_error_bare(f, argtup, world);
     // not reached
 }
 
@@ -1891,7 +1899,7 @@ JL_DLLEXPORT jl_value_t *jl_apply_generic(jl_value_t **args, uint32_t nargs)
             if (error_en)
                 show_call(F, args, nargs);
 #endif
-            jl_method_error((jl_function_t*)args[0], args, nargs);
+            jl_method_error((jl_function_t*)args[0], args, nargs, world);
             // unreachable
         }
     }
@@ -1938,7 +1946,7 @@ jl_value_t *jl_gf_invoke(jl_tupletype_t *types0, jl_value_t **args, size_t nargs
     jl_typemap_entry_t *entry = (jl_typemap_entry_t*)jl_gf_invoke_lookup(types, world);
 
     if ((jl_value_t*)entry == jl_nothing) {
-        jl_method_error_bare(gf, (jl_value_t*)types0);
+        jl_method_error_bare(gf, (jl_value_t*)types0, world);
         // unreachable
     }
 

src/julia_internal.h

@@ -239,8 +239,8 @@ void jl_set_t_uid_ctr(int i);
 uint32_t jl_get_gs_ctr(void);
 void jl_set_gs_ctr(uint32_t ctr);
 
-void JL_NORETURN jl_method_error_bare(jl_function_t *f, jl_value_t *args);
-void JL_NORETURN jl_method_error(jl_function_t *f, jl_value_t **args, size_t na);
+void JL_NORETURN jl_method_error_bare(jl_function_t *f, jl_value_t *args, size_t world);
+void JL_NORETURN jl_method_error(jl_function_t *f, jl_value_t **args, size_t na, size_t world);
 
 JL_DLLEXPORT void jl_typeassert(jl_value_t *x, jl_value_t *t);