Merge pull request JuliaLang#33861 from JuliaLang/aa/1.3.0-rc5

[release-1.3] Set VERSION to 1.3.0-rc5
soediro · Nov 17, 2019 · 36c4eb2 · 36c4eb2
2 parents 937e842 + b49a57a
commit 36c4eb2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.0-rc4
+1.3.0-rc5
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -1408,8 +1408,10 @@ void jl_generate_fptr(jl_code_instance_t *output)
                     break;
                 ucache = ucache->next;
             }
-            if (codeinst->invoke)
+            if (codeinst->invoke) {
+                JL_UNLOCK(&codegen_lock);
                 return;
+            }
             if (ucache != NULL) {
                 codeinst->specptr = ucache->specptr;
                 codeinst->rettype_const = ucache->rettype_const;

diff --git a/src/gf.c b/src/gf.c
@@ -271,7 +271,7 @@ JL_DLLEXPORT jl_code_instance_t *jl_get_method_inferred(
 }
 
 JL_DLLEXPORT jl_code_instance_t *jl_set_method_inferred(
-        jl_method_instance_t *mi, jl_value_t *rettype,
+        jl_method_instance_t *mi JL_PROPAGATES_ROOT, jl_value_t *rettype,
         jl_value_t *inferred_const, jl_value_t *inferred,
         int32_t const_flags, size_t min_world, size_t max_world
         /*, jl_array_t *edges, int absolute_max*/)
@@ -1825,6 +1825,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
 {
     jl_code_instance_t *codeinst;
     codeinst = mi->cache;
+
     while (codeinst) {
         if (codeinst->min_world <= world && world <= codeinst->max_world && codeinst->invoke != NULL) {
             return codeinst;
@@ -1861,6 +1862,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
         }
     }
 
+    JL_LOCK(&codegen_lock);
     codeinst = mi->cache;
     while (codeinst) {
         if (codeinst->min_world <= world && world <= codeinst->max_world && codeinst->functionObjectsDecls.functionObject != NULL)
@@ -1885,17 +1887,20 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
                 jl_generate_fptr(ucache);
             if (ucache->invoke != jl_fptr_sparam &&
                 ucache->invoke != jl_fptr_interpret_call) {
+                JL_UNLOCK(&codegen_lock);
                 return ucache;
             }
             jl_code_instance_t *codeinst = jl_set_method_inferred(mi, (jl_value_t*)jl_any_type, NULL, NULL,
                 0, 1, ~(size_t)0);
             codeinst->specptr = ucache->specptr;
             codeinst->rettype_const = ucache->rettype_const;
             jl_atomic_store_release(&codeinst->invoke, ucache->invoke);
+            JL_UNLOCK(&codegen_lock);
             return codeinst;
         }
     }
 
+    JL_UNLOCK(&codegen_lock);
     jl_generate_fptr(codeinst);
     return codeinst;
 }