From bf51fe3e3fded74ae0ba424fdcf8f07394e665b5 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 4 Nov 2005 10:05:05 +0000
Subject: [PATCH] test and fix for pr115038

---
 .../compiler/ast/InterTypeDeclaration.java    |  6 ++-
 tests/bugs150/pr115038.aj                     |  5 +++
 .../systemtest/ajc150/Ajc150Tests.java        |  1 +
 .../org/aspectj/systemtest/ajc150/ajc150.xml  | 40 ++++++-------------
 4 files changed, 23 insertions(+), 29 deletions(-)
 create mode 100644 tests/bugs150/pr115038.aj

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java
index 2de741e10..ef7ecdb7e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java
@@ -358,7 +358,11 @@ public abstract class InterTypeDeclaration extends AjMethodDeclaration {
 			scope.problemReporter().signalError(sourceStart,sourceEnd,
 					  "Cannot make inter-type declarations on type variables, use an interface and declare parents");
 			this.ignoreFurtherInvestigation=true;
-			rb = new ProblemReferenceBinding(rb.compoundName,((TypeVariableBinding)rb).firstBound.enclosingType(),0);
+			ReferenceBinding closestMatch = null;
+			if (((TypeVariableBinding)rb).firstBound!=null) {
+				closestMatch = ((TypeVariableBinding)rb).firstBound.enclosingType();
+			}
+			rb = new ProblemReferenceBinding(rb.compoundName,closestMatch,0);
 			return;
 		}
 
diff --git a/tests/bugs150/pr115038.aj b/tests/bugs150/pr115038.aj
new file mode 100644
index 000000000..46dc5a1d5
--- /dev/null
+++ b/tests/bugs150/pr115038.aj
@@ -0,0 +1,5 @@
+public abstract aspect pr115038<Observable, Observer, Event> {
+	public boolean Observer.handle(Observable o, Event e) {
+		return true;
+	}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 92b29d6b8..8d8f2a837 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -52,6 +52,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   */
   
   public void testUnboundFormal_pr112027()    { runTest("unexpected error unboundFormalInPC");}
+  public void testNPEScopeSetup_pr115038()    { runTest("NPE in ensureScopeSetup");}
   public void testCCEGenerics_pr113445()      { runTest("Generics ClassCastException");}
   public void testMatthewsAspect_pr113947_1() { runTest("maws generic aspect - 1");}
   public void testMatthewsAspect_pr113947_2() { runTest("maws generic aspect - 2");}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 4316e6ec8..b6b5e6bf8 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -10,13 +10,22 @@
     <ajc-test dir="bugs150" title="Problem with constructor ITDs">
         <compile files="pr112783.aj" options="-1.5"/>
     </ajc-test>
-
-    <ajc-test dir="bugs150" title="ITDC with no explicit cons call">
+ 
+    <ajc-test dir="bugs150" title="NPE in ensureScopeSetup">
+        <compile files="pr115038.aj" options="-1.5">
+          <!-- fixme asc the 'static ref' messages are a bit poor and ought to be eliminated... -->
+          <message kind="error" line="2" text="Cannot make a static reference to the non-static type Observable"/>
+          <message kind="error" line="2" text="Cannot make a static reference to the non-static type Event"/>
+          <message kind="error" line="2" text="Cannot make inter-type declarations on type variables"/>
+        </compile>
+    </ajc-test>
+ 
+   <ajc-test dir="bugs150" title="ITDC with no explicit cons call">
       <compile files="Pr62606.aj" options="-1.5">
         <message kind="warning" line="6" text="[Xlint:noExplicitConstructorCall]"/>
       </compile>
     </ajc-test>
-    
+ 
     <ajc-test dir="java5/generics/bugs" title="using same type variable in ITD">
       <compile files="SameTypeVariable.aj" options="-1.5">
       </compile>
@@ -27,31 +36,6 @@
       </compile>
     </ajc-test>
     
-    <ajc-test dir="java5/compliance" title="java 5 pointcuts and declares at pre-java 5 compliance levels">
-      <compile files="AJ5FeaturesAtJ14.aj" options="-1.4">
-        <message kind="error" line="3" text="the @annotation pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="11" text="the @within pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="13" text="the @withincode pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="5" text="the @this pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="7" text="the @target pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="9" text="the @args pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="declare @type is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="annotations are only available if source level is 5.0"/>
-        <message kind="error" line="15" text="cannot convert from Foo to Annotation"/>     
-        <message kind="error" line="17" text="declare @method is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="17" text="annotations are only available if source level is 5.0"/>
-        <message kind="error" line="17" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="19" text="declare @field is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="19" text="annotations are only available if source level is 5.0"/>
-        <message kind="error" line="19" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="21" text="declare @constructor is only supported at Java 5 compliance level or above"/>       
-        <message kind="error" line="21" text="annotations are only available if source level is 5.0"/>
-        <message kind="error" line="21" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="25" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="27" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-      </compile>
-    </ajc-test>
-    
     <ajc-test dir="bugs150/pr86903" title="bcelrenderer bad">
       <compile files="GenericService.java,Service.java,Main.java,BadWormhole.java"/>
       <run class="Main"/>
-- 
2.39.5