fix inference ignorance of sparams when caching tfunc results

fix #9222

Author: vtjnash

base/inference.jl

@@ -1450,8 +1450,8 @@ CYCLE_ID = 1
 
 # def is the original unspecialized version of a method. we aggregate all
 # saved type inference data there.
-function typeinf(linfo::LambdaStaticData,atypes::ANY,sparams::SimpleVector, def, cop, needtree)
-    if linfo.module === Core
+function typeinf(linfo::LambdaStaticData, atypes::ANY, sparams::SimpleVector, def, cop, needtree)
+    if linfo.module === Core && isempty(sparams)
         atypes = Tuple
     end
     #dbg =
@@ -1463,12 +1463,12 @@ function typeinf(linfo::LambdaStaticData,atypes::ANY,sparams::SimpleVector, def,
     tf = def.tfunc
     if !is(tf,nothing)
         tfarr = tf::Array{Any,1}
-        for i = 1:3:length(tfarr)
-            if typeseq(tfarr[i],atypes)
-                code = tfarr[i+1]
-                if tfarr[i+2]
+        for i = 1:4:length(tfarr)
+            if tfarr[i + 3] === sparams && typeseq(tfarr[i], atypes)
+                code = tfarr[i + 1]
+                if tfarr[i + 2]
                     redo = true
-                    tfunc_idx = i+1
+                    tfunc_idx = i + 1
                     curtype = code
                     break
                 end
@@ -1501,24 +1501,26 @@ function typeinf(linfo::LambdaStaticData,atypes::ANY,sparams::SimpleVector, def,
         end
         tfarr = def.tfunc::Array{Any,1}
         idx = -1
-        for i = 1:3:length(tfarr)
-            if typeseq(tfarr[i],atypes)
+        for i = 1:4:length(tfarr)
+            if sparams === tfarr[i + 3] && typeseq(tfarr[i], atypes)
                 idx = i; break
             end
         end
         if idx == -1
             l = length(tfarr)
-            idx = l+1
-            resize!(tfarr, l+3)
+            idx = l + 1
+            resize!(tfarr, l + 4)
         end
         tfarr[idx] = atypes
         # in the "rec" state this tree will not be used again, so store
         # just the return type in place of it.
         tfarr[idx+1] = rec ? result : (fulltree,result)
         tfarr[idx+2] = rec
+        tfarr[idx+3] = sparams
     else
         def.tfunc[tfunc_idx] = rec ? result : (fulltree,result)
         def.tfunc[tfunc_idx+1] = rec
+        def.tfunc[tfunc_idx+2] = sparams
     end
 
     return (fulltree, result::Type)

src/dump.c

@@ -818,13 +818,13 @@ static void jl_serialize_value_(ios_t *s, jl_value_t *v)
             // not needed (e.g. they don't get inlined).
             if (tf && jl_typeis(tf, jl_array_any_type)) {
                 size_t i, l = jl_array_len(tf);
-                for(i=0; i < l; i += 3) {
+                for(i=0; i < l; i += 4) {
                     if (!jl_is_leaf_type(jl_cellref(tf,i))) {
-                        jl_value_t *ret = jl_cellref(tf,i+1);
+                        jl_value_t *ret = jl_cellref(tf, i + 1);
                         if (jl_is_tuple(ret)) {
                             jl_value_t *ast = jl_fieldref(ret, 0);
                             if (jl_is_array(ast) && jl_array_len(ast) > 500)
-                                jl_cellset(tf, i+1, jl_fieldref(ret,1));
+                                jl_cellset(tf, i+1, jl_fieldref(ret, 1));
                         }
                     }
                 }

test/core.jl

@@ -3651,3 +3651,23 @@ end
 # issue #14691
 type T14691; a::UInt; end
 @test (T14691(0).a = 0) === 0
+
+# issue #9222
+function SimpleTest9222{T1<:Real}(pdedata, mu_actual::Vector{T1},
+        nu_actual::Vector{T1}, v0::Vector{T1}, epsilon::T1, beta::Vector{T1},
+        delta::T1, l::T1, R::T1, s0::T1, show_trace::Bool = true)
+    return 0.0
+end
+function SimpleTest9222{T1<:Real}(pdedata, mu_actual::Vector{T1},
+        nu_actual::Vector{T1}, v0::Vector{T1}, epsilon::T1, beta::Vector{T1},
+        delta::T1, l::T1, R::T1)
+    return SimpleTest9222(pdedata, mu_actual, nu_actual, v0, epsilon,
+        beta, delta, l, R, v0[1])
+end
+function foo9222()
+    v0 = rand(10)
+    mu_actual = rand(10)
+    nu_actual = rand(10)
+    SimpleTest9222(0.0, mu_actual, nu_actual, v0, 0.0, [1.0,1.0], 0.5, 5.0, 20.0)
+end
+@test foo9222() === 0.0