Mercurial > hg > graal-jvmci-8
comparison 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 |
comparison
equal
deleted
inserted
replaced
16897:f90dcdbbb75e | 16898:433ece7d941d |
---|---|
528 } | 528 } |
529 | 529 |
530 public static boolean isEnclosedIn(Element enclosedIn, Element element) { | 530 public static boolean isEnclosedIn(Element enclosedIn, Element element) { |
531 if (element == null) { | 531 if (element == null) { |
532 return false; | 532 return false; |
533 } else if (enclosedIn.equals(element)) { | 533 } else if (typeEquals(enclosedIn.asType(), element.asType())) { |
534 return true; | 534 return true; |
535 } else { | 535 } else { |
536 return isEnclosedIn(enclosedIn, element.getEnclosingElement()); | 536 return isEnclosedIn(enclosedIn, element.getEnclosingElement()); |
537 } | 537 } |
538 } | 538 } |