From: aclement <aclement>
Date: Thu, 12 May 2005 09:32:03 +0000 (+0000)
Subject: Fix and tests for pr86832, pr92163. NPE in detectHierarchyCycle
X-Git-Tag: PRE_ANDY~327
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0cb826c6a5d47a12eb03bf1751208c0b9a7b23a3;p=aspectj.git

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 7a37db3c0..036e71508 100644
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 e53abe8a3..2aa5d14c0 100644
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
index 000000000..f78fe6441
--- /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 1f9d16ca0..b84ee076e 100644
--- 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 068ac051c..6a5222ae6 100644
--- 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