fix another pre-existing bug, this time in jl_typemap_assoc_exact compuation of args[1-offs]

vtjnash · vtjnash · commit 9b50b9898cfc · 2016-04-12T11:54:36.000-04:00
diff --git a/src/gf.c b/src/gf.c
@@ -666,7 +666,7 @@ static jl_lambda_info_t *jl_typemap_assoc_exact(union jl_typemap_t ml_or_cache,
                     return li;
             }
             assert(jl_is_datatype(ty));
-            if (cache->arg1 != (void*)jl_nothing && offs < 2) {
+            if (cache->arg1 != (void*)jl_nothing && offs < 2 && n > 1) {
                 ml_or_cache = mtcache_hash_lookup(cache->arg1, ty, 0, offs);
                 if (jl_typeof(ml_or_cache.unknown) == (jl_value_t*)jl_typemap_entry_type &&
                         ml_or_cache.leaf->simplesig == (void*)jl_nothing) {

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ static jl_lambda_info_t *jl_typemap_assoc_exact(union jl_typemap_t ml_or_cache,`
`666`	`666`	`return li;`
`667`	`667`	`}`
`668`	`668`	`assert(jl_is_datatype(ty));`
`669`		`- if (cache->arg1 != (void*)jl_nothing && offs < 2) {`
	`669`	`+ if (cache->arg1 != (void*)jl_nothing && offs < 2 && n > 1) {`
`670`	`670`	`ml_or_cache = mtcache_hash_lookup(cache->arg1, ty, 0, offs);`
`671`	`671`	`if (jl_typeof(ml_or_cache.unknown) == (jl_value_t*)jl_typemap_entry_type &&`
`672`	`672`	`ml_or_cache.leaf->simplesig == (void*)jl_nothing) {`