fix incremental compile using the wrong method to re-add methods

Author: vtjnash

src/dump.c

@@ -1588,7 +1588,7 @@ void jl_deserialize_lambdas_from_mod(ios_t *s)
         jl_function_t *meth = (jl_function_t*)jl_deserialize_value(s, NULL);
         jl_svec_t *tvars = (jl_svec_t*)jl_deserialize_value(s, NULL);
         int8_t isstaged = read_int8(s);
-        jl_add_method(gf, types, meth, tvars, isstaged);
+        jl_method_table_insert(jl_gf_mtable(gf), types, meth, tvars, isstaged);
     }
 }
 
@@ -2075,9 +2075,6 @@ DLLEXPORT int jl_save_incremental(const char *fname, jl_array_t *worklist)
     return 0;
 }
 
-jl_function_t *jl_method_cache_insert(jl_methtable_t *mt, jl_tupletype_t *type,
-                                      jl_function_t *method);
-
 static jl_datatype_t *jl_recache_type(jl_datatype_t *dt, size_t start)
 {
     assert(dt->uid == -1);

src/julia_internal.h

@@ -109,6 +109,11 @@ jl_value_t *jl_type_match_morespecific(jl_value_t *a, jl_value_t *b);
 int jl_types_equal_generic(jl_value_t *a, jl_value_t *b, int useenv);
 jl_datatype_t *jl_inst_concrete_tupletype_v(jl_value_t **p, size_t np);
 jl_datatype_t *jl_inst_concrete_tupletype(jl_svec_t *p);
+jl_function_t *jl_method_cache_insert(jl_methtable_t *mt, jl_tupletype_t *type,
+                                      jl_function_t *method);
+jl_methlist_t *jl_method_table_insert(jl_methtable_t *mt, jl_tupletype_t *type,
+                                      jl_function_t *method, jl_svec_t *tvars,
+                                      int8_t isstaged);
 
 void jl_set_datatype_super(jl_datatype_t *tt, jl_value_t *super);
 void jl_add_constructors(jl_datatype_t *t);