Mercurial > hg > graal-jvmci-8

comparison graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java @ 20943:810d466073f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: fixed common supertype was always Object if generic child types contained void.
author Christian Humer <christian.humer@gmail.com>
date Tue, 14 Apr 2015 19:23:32 +0200
parents 476374f3fe9a
children 833e088ee7d3
comparison
equal deleted inserted replaced
20942:a2e295c6cf7c 20943:810d466073f0
163 return type1; 163 return type1;
164 } 164 }
165 TypeElement element1 = fromTypeMirror(type1); 165 TypeElement element1 = fromTypeMirror(type1);
166 TypeElement element2 = fromTypeMirror(type2); 166 TypeElement element2 = fromTypeMirror(type2);
167 if (element1 == null || element2 == null) { 167 if (element1 == null || element2 == null) {
168 if (element1 != null) {
169 return type1;
170 }
168 return context.getType(Object.class); 171 return context.getType(Object.class);
169 } 172 }
170 173
171 List<TypeElement> element1Types = getDirectSuperTypes(element1); 174 List<TypeElement> element1Types = getDirectSuperTypes(element1);
172 element1Types.add(0, element1); 175 element1Types.add(0, element1);