Mercurial > hg > graal-jvmci-8

diff graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeMethodParser.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
line wrap: on
line diff
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeMethodParser.java	Wed Apr 15 14:06:17 2015 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeMethodParser.java	Wed Apr 15 13:49:38 2015 +0200
@@ -58,12 +58,7 @@
     }
 
     protected Collection<TypeMirror> getPossibleReturnTypes() {
-        List<TypeMirror> possibleTypes = getNode().getGenericTypes(getNode().getThisExecution());
-        if (possibleTypes.size() > 1) {
-            return Arrays.asList(ElementUtils.getCommonSuperType(getContext(), possibleTypes));
-        } else {
-            return possibleTypes;
-        }
+        return Arrays.asList(getNode().getGenericType(getNode().getThisExecution()));
     }
 
     @Override