Fix and tests for pr86832, pr92163. NPE in detectHierarchyCycle

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 7a37db3c0208ecb3496dda326a383ecf19cfea62..036e71508cd83197d15639427d112e677b8c101a 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index e53abe8a3138bfa23792831d3d871ef70329a0bc..2aa5d14c0b3027ce931237d8cd131a6f3848cefa 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ

diff --git a/tests/bugs150/PR86832.aj b/tests/bugs150/PR86832.aj
new file mode 100644 (file)
index 0000000..f78fe64
--- /dev/null
+++ b/tests/bugs150/PR86832.aj
@@ -0,0 +1,4 @@
+import java.util.*;
+
+class A extends ArrayList {}
+class B extends ArrayList<Object> {}

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 1f9d16ca034d380d389f7df880c32139d4b4465f..b84ee076e0715c5ddfe1108078bc7da0731b6c2b 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -161,6 +161,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
          runTest("enum called Enum, annotation called Annotation, etc");
   }
   
+  public void testInternalCompilerError_pr86832() {
+         runTest("Internal compiler error");
+  }
+  
   // helper methods.....
   
   public SyntheticRepository createRepos(File cpentry) {

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 068ac051cf218f1d82ab3518ca30452f34f4185f..6a5222ae67b5747640ba0d4b63a18a26de7534dc 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2191,4 +2191,8 @@
    <ajc-test dir="bugs150" title="enum called Enum, annotation called Annotation, etc">
      <compile files="PR90827.aj" options="-1.5"/>
    </ajc-test>
+   
+   <ajc-test dir="bugs150" title="Internal compiler error">
+     <compile files="PR86832.aj" options="-1.5"/>
+   </ajc-test>
 </suite>
\ No newline at end of file