Pass TypeAssigns along to more places

gselzer · ctrueden · commit 7e199734823b · 2019-09-22T15:21:35.000+02:00
More research needed to determine whether this approach is really right.

Signed-off-by: Curtis Rueden &lt;ctrueden@wisc.edu&gt;
diff --git a/src/main/java/org/scijava/ops/matcher/MatchingUtils.java b/src/main/java/org/scijava/ops/matcher/MatchingUtils.java
@@ -336,7 +336,7 @@ private static boolean checkGenericAssignability(Type[] srcTypes, Type[] destTyp
 		// assignability
 		Class<?> matchingRawType = Types.raw(dest);
 		Type inferredSrcType = Types.parameterize(matchingRawType, mappedSrcTypes);
-		if (!Types.isAssignable(inferredSrcType, dest)) {
+		if (!Types.isAssignable(inferredSrcType, dest, typeVarAssigns)) {
 			if (!safeAssignability || !isSafeAssignable(destTypes, typeVarAssigns, src, dest))
 				return false;
 		}
@@ -477,7 +477,7 @@ private static void inferTypeVariables(Type[] types, Type[] inferFrom, Map<TypeV
 				if (!(inferFrom[i] instanceof ParameterizedType)) {
 					Type[] fromType = { types[i] };
 					fromType = Types.mapVarToTypes(fromType, typeAssigns);
-					if (!Types.isAssignable(inferFrom[i], fromType[0])) {
+					if (!Types.isAssignable(inferFrom[i], fromType[0], typeAssigns)) {
 						throw new TypeInferenceException();
 					}
 				} else {
