Mercurial > hg > truffle

diff graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ExecutableTypeData.java @ 20966:05a2b72c071f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: fixed potential non generic executes in uninitialized nodes.
author Christian Humer <christian.humer@gmail.com>
date Wed, 15 Apr 2015 13:49:38 +0200
parents 833e088ee7d3
children 6361fa2e3321
line wrap: on
line diff
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ExecutableTypeData.java	Wed Apr 15 14:06:17 2015 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/ExecutableTypeData.java	Wed Apr 15 13:49:38 2015 +0200
@@ -192,9 +192,7 @@
         for (int i = from.getEvaluatedCount(); i < to.getEvaluatedCount(); i++) {
             TypeMirror delegateToParameter = to.getEvaluatedParameters().get(i);
             if (i < node.getChildExecutions().size()) {
-                List<TypeMirror> genericTypes = node.getGenericTypes(node.getChildExecutions().get(i));
-
-                TypeMirror genericType = ElementUtils.getCommonSuperType(context, genericTypes);
+                TypeMirror genericType = node.getGenericType(node.getChildExecutions().get(i));
                 if (!isSubtypeBoxed(context, genericType, delegateToParameter)) {
                     return false;
                 }