Mercurial > hg > graal-jvmci-8
diff graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java @ 16898:433ece7d941d
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 22 Aug 2014 16:03:49 +0200 |
parents | f90dcdbbb75e 2db61eddcb97 |
children | 62cfffca9be2 |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java Fri Aug 22 15:56:51 2014 +0200 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/ElementUtils.java Fri Aug 22 16:03:49 2014 +0200 @@ -530,7 +530,7 @@ public static boolean isEnclosedIn(Element enclosedIn, Element element) { if (element == null) { return false; - } else if (enclosedIn.equals(element)) { + } else if (typeEquals(enclosedIn.asType(), element.asType())) { return true; } else { return isEnclosedIn(enclosedIn, element.getEnclosingElement());