Fix 493554 - Missing InnerClasses attribute for nested interfaces created by AspectJ

8 files changed, 189 insertions, 0 deletions

diff --git a/tests/bugs1810/493554/Cmd.java b/tests/bugs1810/493554/Cmd.java
new file mode 100644
index 000000000..8954d08af
--- /dev/null
+++ b/tests/bugs1810/493554/Cmd.java
@@ -0,0 +1,10 @@
+package example.kusedep;
+
+import example.dep.Dep;
+
+public class Cmd {
+  public static void main(String[] args) {
+    Dep dep = new Dep();
+    System.out.println(dep);
+  }
+}
diff --git a/tests/bugs1810/493554/Cmd.kt b/tests/bugs1810/493554/Cmd.kt
new file mode 100644
index 000000000..a9a0238eb
--- /dev/null
+++ b/tests/bugs1810/493554/Cmd.kt
@@ -0,0 +1,9 @@
+package example.kusedep;
+
+import example.dep.Dep;
+
+fun main(args: Array<String>) {
+    val dep = Dep()
+    println(dep)
+    System.exit(0)
+}
diff --git a/tests/bugs1810/493554/Code.java b/tests/bugs1810/493554/Code.java
new file mode 100644
index 000000000..16a6a642b
--- /dev/null
+++ b/tests/bugs1810/493554/Code.java
@@ -0,0 +1,5 @@
+public class Code {
+  public static void main(String []argv) { 
+    new Runnable() { public void run() {}};
+  }
+}
diff --git a/tests/bugs1810/493554/Dep.java b/tests/bugs1810/493554/Dep.java
new file mode 100644
index 000000000..8ed5c1500
--- /dev/null
+++ b/tests/bugs1810/493554/Dep.java
@@ -0,0 +1,14 @@
+package example.dep;

+

+public class Dep {

+    private int a, b, c;

+

+    public Dep() {

+	a = 5;

+    }

+

+    public String toString() {

+

+        return "Dep";

+    }

+}

diff --git a/tests/bugs1810/493554/FooAspect.aj b/tests/bugs1810/493554/FooAspect.aj
new file mode 100644
index 000000000..4ad4c22cc
--- /dev/null
+++ b/tests/bugs1810/493554/FooAspect.aj
@@ -0,0 +1,17 @@
+package example.aspect;
+
+import example.dep.Dep;
+
+public aspect FooAspect pertarget(setFieldValue(Dep)) {
+
+  // interface ajcMightHaveAspect { }
+
+  pointcut setFieldValue(Dep dep) :
+    set(private * Dep.*) && target(dep);
+
+  void around(Dep dep) : setFieldValue(dep) {
+System.out.println("advised");
+    proceed(dep);
+  }
+
+}
diff --git a/tests/bugs1810/493554/FooAspect.java b/tests/bugs1810/493554/FooAspect.java
new file mode 100644
index 000000000..87406db94
--- /dev/null
+++ b/tests/bugs1810/493554/FooAspect.java
@@ -0,0 +1,25 @@
+
+package example.aspect;
+
+import org.aspectj.lang.*;
+import org.aspectj.lang.annotation.*;
+
+import example.dep.Dep;
+
+@Aspect("pertarget(setFieldValue(example.dep.Dep))")
+public class FooAspect {
+
+  // interface ajcMightHaveAspect { }
+
+  @Pointcut("set(private * example.dep.Dep.*) && target(dep)")
+  public void setFieldValue(Dep dep) {}
+  //pointcut setFieldValue(Dep dep) : set(private * Dep.*) && target(dep);
+
+  @Around("setFieldValue(dep)")
+  public void foo(Dep dep, ProceedingJoinPoint pjp) {
+  //void around(Dep dep) : setFieldValue(dep) {
+System.out.println("advised");
+    pjp.proceed(new Object[]{dep});
+  }
+
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java b/tests/src/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java
index 2cdf148db..cff7a3b7b 100644
--- a/tests/src/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java
@@ -14,6 +14,14 @@ import java.io.File;
 
 import junit.framework.Test;
 
+import org.aspectj.apache.bcel.Constants;
+import org.aspectj.apache.bcel.classfile.Attribute;
+import org.aspectj.apache.bcel.classfile.Constant;
+import org.aspectj.apache.bcel.classfile.ConstantClass;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
+import org.aspectj.apache.bcel.classfile.ConstantUtf8;
+import org.aspectj.apache.bcel.classfile.InnerClass;
+import org.aspectj.apache.bcel.classfile.InnerClasses;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
@@ -25,6 +33,101 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	public void testInvokeDynamic_490315() {
 		runTest("indy");
 	}
+
+	// http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6
+	public void testInnerClassesAttributeStructure_493554() throws Exception {
+		runTest("pertarget");
+		
+		// Testcode commented out below is for full analysis of the inner class attribute but under
+		// 493554 we are going to remove that attribute for this class
+		JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), "example/aspect/FooAspect$ajcMightHaveAspect");
+		assertNotNull(jc);
+		assertEquals(Constants.ACC_PUBLIC | Constants.ACC_INTERFACE | Constants.ACC_ABSTRACT,jc.getModifiers());
+		Attribute[] attributes = jc.getAttributes();
+		for (Attribute attribute: attributes) {
+			if (attribute.getName().equals("InnerClasses")) {
+				fail("Did not expect to find InnerClasses attribute");
+			}
+		}
+
+//		// Is InnerClasses attribute well formed for the pertarget interface?
+//		JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), "example/aspect/FooAspect$ajcMightHaveAspect");
+//		assertNotNull(jc);
+//		assertEquals(Constants.ACC_PUBLIC | Constants.ACC_INTERFACE | Constants.ACC_ABSTRACT,jc.getModifiers());
+//		Attribute attr = getAttributeStartsWith(jc.getAttributes(), "InnerClasses");
+//		assertNotNull(attr);
+//		InnerClasses innerClasses = (InnerClasses)attr;
+//		InnerClass[] innerClassArray = innerClasses.getInnerClasses();
+//		assertEquals(1,innerClassArray.length);
+//		InnerClass innerClass = innerClassArray[0];
+//		ConstantPool cp = jc.getConstantPool();
+//
+//		// The value of the inner_class_info_index item must be a valid index into the 
+//		// constant_pool table. The constant_pool entry at that index must be a CONSTANT_Class_info 
+//		// structure representing C.
+//		int innerClassIndex = innerClass.getInnerClassIndex();
+//		ConstantClass cc = (ConstantClass)cp.getConstant(innerClassIndex);
+//		ConstantUtf8 utf8 = cp.getConstantUtf8(cc.getNameIndex());
+//		assertEquals("example/aspect/FooAspect$ajcMightHaveAspect",utf8.getStringValue());
+//		
+//		// The remaining items in the classes array entry give information about C.
+//		// The value of the outer_class_info_index item must be a valid index into the 
+//		// constant_pool table, and the entry at that index must be a CONSTANT_Class_info
+//		// structure representing the class or interface of which C is a member.
+//		int outerClassIndex = innerClass.getOuterClassIndex();
+//		cc = (ConstantClass)cp.getConstant(outerClassIndex);
+//		utf8 = cp.getConstantUtf8(cc.getNameIndex());
+//		assertEquals("example/aspect/FooAspect",utf8.getStringValue());
+//		
+//		// The value of the inner_name_index item must be a valid index into the constant_pool table, 
+//		// and the entry at that index must be a CONSTANT_Utf8_info structure (§4.4.7) that represents 
+//		// the original simple name of C, as given in the source code from which this class file was compiled.
+//		int innerNameIndex = innerClass.getInnerNameIndex();
+//		utf8 = cp.getConstantUtf8(innerNameIndex);
+//		assertEquals("ajcMightHaveAspect",utf8.getStringValue());
+//		
+//		int innerAccessFlags = innerClass.getInnerAccessFlags();
+//		assertEquals(Constants.ACC_PUBLIC | Constants.ACC_ABSTRACT | Constants.ACC_INTERFACE | Constants.ACC_STATIC,innerAccessFlags);
+//		
+//		// Is InnerClasses attribute well formed for the containing type?
+//		jc = getClassFrom(ajc.getSandboxDirectory(), "example/aspect/FooAspect");
+//		assertNotNull(jc);
+//		attr = getAttributeStartsWith(jc.getAttributes(), "InnerClasses");
+//		assertNotNull(attr);
+//		innerClasses = (InnerClasses)attr;
+//		innerClassArray = innerClasses.getInnerClasses();
+//		assertEquals(1,innerClassArray.length);
+//		innerClass = innerClassArray[0];
+//		cp = jc.getConstantPool();
+//		System.out.println(innerClass);
+//		
+//		// inner class name
+//		innerClassIndex = innerClass.getInnerClassIndex();
+//		cc = (ConstantClass)cp.getConstant(innerClassIndex);
+//		utf8 = cp.getConstantUtf8(cc.getNameIndex());
+//		assertEquals("example/aspect/FooAspect$ajcMightHaveAspect",utf8.getStringValue());
+//		
+//		// outer class name
+//		outerClassIndex = innerClass.getOuterClassIndex();
+//		cc = (ConstantClass)cp.getConstant(outerClassIndex);
+//		utf8 = cp.getConstantUtf8(cc.getNameIndex());
+//		assertEquals("example/aspect/FooAspect",utf8.getStringValue());
+//
+//		// Simple name
+//		innerNameIndex = innerClass.getInnerNameIndex();
+//		utf8 = cp.getConstantUtf8(innerNameIndex);
+//		assertEquals("ajcMightHaveAspect",utf8.getStringValue());
+//		
+//		// inner modifiers
+//		innerAccessFlags = innerClass.getInnerAccessFlags();
+//		assertEquals(Constants.ACC_ABSTRACT | Constants.ACC_INTERFACE | Constants.ACC_STATIC,innerAccessFlags);
+//				
+//		// Reflection work getDeclaredClasses?
+//		
+//		// What about other interfaces?
+	}
+	
+	
 	
 //	public void testOverweaving_352389() throws Exception {
 //		runTest("overweaving");
diff --git a/tests/src/org/aspectj/systemtest/ajc1810/ajc1810.xml b/tests/src/org/aspectj/systemtest/ajc1810/ajc1810.xml
index be1c3d5f4..dd4237d22 100644
--- a/tests/src/org/aspectj/systemtest/ajc1810/ajc1810.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1810/ajc1810.xml
@@ -6,4 +6,10 @@
 		<compile options="-1.8" files="FailingAspect.java SomeAnno.java SomeContext.java SomeCriteria.java SomeDTO.java SomeEnum.java SomePiece.java SomePropertyDTO.java SomeService.java SomeServiceImpl.java"/>
 	</ajc-test>
 
+	<ajc-test dir="bugs1810/493554" title="pertarget">
+		<compile options="-1.8" files="Dep.java FooAspect.aj Cmd.java"/>
+		<run class="example.kusedep.Cmd"></run>
+	</ajc-test>
+
+
 </suite>