From 3e5974557278e81a9891edd4269eca39a8d42f43 Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Fri, 8 Aug 2003 01:23:31 +0000
Subject: [PATCH] fix and tests for Bugzilla Bug 41123 	  	Weaving
 failure when using injars

---
 .../compiler/lookup/AjLookupEnvironment.java  |   8 +++-
 tests/ajcTests.xml                            |  36 ++++++++++++++++++
 tests/bugs/moreInterfaceLibrary/lib.jar       | Bin 0 -> 1458 bytes
 .../lib/ExecutionMonitor.aj                   |   6 +++
 .../moreInterfaceLibrary/model/BusObj.java    |   5 +++
 .../model/MonitorBusObj.java                  |   7 ++++
 .../aspectj/weaver/bcel/BcelTypeMunger.java   |   4 +-
 .../aspectj/weaver/bcel/LazyMethodGen.java    |  15 ++++++++
 8 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 tests/bugs/moreInterfaceLibrary/lib.jar
 create mode 100644 tests/bugs/moreInterfaceLibrary/lib/ExecutionMonitor.aj
 create mode 100644 tests/bugs/moreInterfaceLibrary/model/BusObj.java
 create mode 100644 tests/bugs/moreInterfaceLibrary/model/MonitorBusObj.java

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index daacbc4e5..8bbf228a8 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -160,7 +160,7 @@ public class AjLookupEnvironment extends LookupEnvironment {
 			Collection mungers = 
 				onType.getWeaverState().getTypeMungers(onType);
 				
-			//System.out.println("mungers: " + mungers);
+			//System.out.println(onType + " mungers: " + mungers);
 			for (Iterator i = mungers.iterator(); i.hasNext(); ) {
 				ConcreteTypeMunger m = (ConcreteTypeMunger)i.next();
 				EclipseTypeMunger munger = factory.makeEclipseTypeMunger(m);
@@ -235,6 +235,12 @@ public class AjLookupEnvironment extends LookupEnvironment {
 		if (!newParents.isEmpty()) {
 			for (Iterator i = newParents.iterator(); i.hasNext(); ) {
 				ResolvedTypeX parent = (ResolvedTypeX)i.next();
+				if (dangerousInterfaces.containsKey(parent)) {
+					ResolvedTypeX onType = factory.fromEclipse(sourceType);
+					factory.showMessage(IMessage.ERROR, 
+										onType + ": " + dangerousInterfaces.get(parent),
+										onType.getSourceLocation(), null);
+				}
 				addParent(sourceType, parent);
 			}
 		}
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 1a73d9990..5fa1ab82d 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -6667,4 +6667,40 @@
 			</compile>
 		</ajc-test>
 		
+		
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (no jars)">
+		<compile
+			files="lib/ExecutionMonitor.aj,model/BusObj.java,model/MonitorBusObj.java">
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (on aspectpath)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java"
+			aspectpath="lib.jar">
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (on classpath)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java"
+			classpath="lib.jar">
+		    <message kind="error" line="3"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (actual injars)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java,lib.jar">
+		    <message kind="error" line="3"/>
+		</compile>
+	</ajc-test>
 </suite>
diff --git a/tests/bugs/moreInterfaceLibrary/lib.jar b/tests/bugs/moreInterfaceLibrary/lib.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0c6f6c26e516cbdf8d688c2455ac709016a188dd
GIT binary patch
literal 1458
zcmWIWW@Zs#-~hso3GDg|NI(k6&dE&DcdbZGE-lH-&-2aC%Ph$+(o4=sEH2&~674VS
zDDrQauCA`AK!}ObA~9W!wGU!@IF;0nF!8J2+tfKTuf5FsW^UT@n0bG6_x*U%Je_@y
z%CBS1_FlHeyIl^NPMWdd<hwVP#n0xvulano=J&ss+>a!V=e8;PE)SY>SD-A~a-Q}3
zoqeBDxOx_DKX|=j<H@^Gg&QvkZ1Yk)S1`x?O^o-6O^>h5a;khc=e72`TTKrmG_|ga
zI6s%&{c=L#bj5k{wMQn*__%7zg4<6%)tDwP+k9eyakIoOi7Kx?ZLwRcMHQ!4EcHBC
zt9t&~S@#&LTYPg*TC3%Y*;b`8?VS>RRd#-&<MXl@)hBxbO4rX)&N=@*sk^Lg@rrYr
z8)r>E^etuT!$iAHd+%NhUK+n->Qt3JC7W4|g8tXI?&J%u?LD;XLAH}v+VtrsORl-x
zT)8u5tE%aYYq>A_<{3Zv#@sNi!}Q^*rDvxpzU_Zy&B$Fdl}YaX!k7CVZ{M-$webJ5
z*KgK0`zB6!_$pq&$4&gUXT9Qn`&FAI4!zWybI9POfkI8;%#=Cue`iOvD{V{L6?m^C
zG*;vIxkbz;O;(n)I0R%E^6<XWtGIk@&-1N!U%hG5jk2ob5;r=LUApY`9e$-Vkrin|
znP<PZX&R@l*UkNS;Nquu_qo>}kmk8*d0n(<*~!}Y377caKAQ3{gr#n6+s|#$!jm4l
zgw!i8dDyX&;X;pl^p=H-URLI`ZF<z@puS^GEMHq^!i*!5S$d2OtFnK+&~NqoETo#k
zt5hK*KcP1J5#L2~PvsYjl73aRPjr>qx;;6EyS+4n=kAxYQtB7dC;i`N(OW08aK+-3
ztKTa-d~T&EY^~Kkd*%Lu@2NHoRfn!DPy1GO#qqK_zm$mRwFS#KCb3PG+g<Te`P>n~
zhRZU1vpFBIvGwrp@U%5p#dT-VehF2J?qZW?J~0~#56-$*Zt=fFy3>6A#QI&W7uP2q
zk<feBWiR$F_?fI;?qcPSR{yLve7(D0yXe3b)?IeWZj#6EFaB`NV$u>u-=nEMGg_Ba
zY*L%d6MiDDQ<i7$v-hixovLf$UpMh5)1iI2t<MifeSg9go4##BoxSOvz);pz+H0H+
z1|16D7n*s!CVOg3@h`QQWumIfm3H3QvO-k*k(7ZE*OYtC>z6&^+`GOYc6FcGQ}qCE
zb`IMM?)%)C85o|jGcW|;%#Ip3vZD$#Tc)OXmZauFGG}kVX)k6+fi?GfBZcQLs1TXL
z`t<?Zk?1}<g$WN59s7-D=9+C@W1Ltf^qBvL{J%DK`vd(#>YWOPmKGO+FPmNny*fYs
zy*x)@pX{N+mA}@`<~%(y*zJ2y*tr`&*ezdM)O9(u+;!@4T`gjjfA=f*G(9JejAdyl
zs`pn-;;gPeuChoWr)*1Fb!gYBM_n8Cd+8stO3ZegQjn1|uOsWl)~+WrkIu;bWYBzt
z^Z8e)m)&K|WnMyhu8PS^WpB&vZaldz)KtWePcLcx_Z?HtZ!$4co-?PczIf?5t-0H$
z&)od`mmt#>1KW_#VH<hp=Ui)#_*~v#rPS|xo;_nhq<YSef2LoKIF^ULD0Aot|EIHV
zzpcFe_CNW@jq`=$^DiGa2L*Rr;4cA5Mh1pYKpf!B$RxsmDF2Y70#yE?0^Fq`x;e;p
gfFce7`hgLR%^Yme7~svy2GYp{g!6#(KNb)V0Pt3OFaQ7m

literal 0
HcmV?d00001

diff --git a/tests/bugs/moreInterfaceLibrary/lib/ExecutionMonitor.aj b/tests/bugs/moreInterfaceLibrary/lib/ExecutionMonitor.aj
new file mode 100644
index 000000000..ec2314d14
--- /dev/null
+++ b/tests/bugs/moreInterfaceLibrary/lib/ExecutionMonitor.aj
@@ -0,0 +1,6 @@
+package lib;
+
+public aspect ExecutionMonitor {
+    public interface MonitoredItem {}
+    private void MonitoredItem.record(String eventType, String eventName) {}
+}   
\ No newline at end of file
diff --git a/tests/bugs/moreInterfaceLibrary/model/BusObj.java b/tests/bugs/moreInterfaceLibrary/model/BusObj.java
new file mode 100644
index 000000000..90efbd79d
--- /dev/null
+++ b/tests/bugs/moreInterfaceLibrary/model/BusObj.java
@@ -0,0 +1,5 @@
+package model;
+
+public class BusObj {
+
+}
diff --git a/tests/bugs/moreInterfaceLibrary/model/MonitorBusObj.java b/tests/bugs/moreInterfaceLibrary/model/MonitorBusObj.java
new file mode 100644
index 000000000..2d5224004
--- /dev/null
+++ b/tests/bugs/moreInterfaceLibrary/model/MonitorBusObj.java
@@ -0,0 +1,7 @@
+package model;
+
+import lib.ExecutionMonitor;
+
+public aspect MonitorBusObj {
+	declare parents: BusObj implements ExecutionMonitor.MonitoredItem;
+}
\ No newline at end of file
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
index 5b9de1855..6f57e56bf 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
@@ -223,13 +223,15 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
 	
 	
 	private LazyMethodGen makeMethodGen(LazyClassGen gen, ResolvedMember member) {
-		return new LazyMethodGen(
+		LazyMethodGen ret = new LazyMethodGen(
 			member.getModifiers(),
 			BcelWorld.makeBcelType(member.getReturnType()),
 			member.getName(),
 			BcelWorld.makeBcelTypes(member.getParameterTypes()),
 			TypeX.getNames(member.getExceptions()),
 			gen);
+		ret.makeSynthetic();
+		return ret;
 	}
 
 
diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
index 7c4e660db..dd011f6c3 100644
--- a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
@@ -30,11 +30,13 @@ import org.apache.bcel.Constants;
 import org.apache.bcel.classfile.Attribute;
 import org.apache.bcel.classfile.ConstantPool;
 import org.apache.bcel.classfile.Method;
+import org.apache.bcel.classfile.Synthetic;
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.BranchInstruction;
 import org.apache.bcel.generic.CPInstruction;
 import org.apache.bcel.generic.ClassGenException;
 import org.apache.bcel.generic.CodeExceptionGen;
+import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.Instruction;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
@@ -85,6 +87,8 @@ public final class LazyMethodGen {
     private boolean canInline = true;
     private boolean hasExceptionHandlers;
     
+    private boolean isSynthetic = false;
+    
     /**
      * only used by {@link BcelClassWeaver}
      */
@@ -702,6 +706,13 @@ public final class LazyMethodGen {
         for (int i = 0, len = attributes.length; i < len; i++) {
             gen.addAttribute(attributes[i]);
         }
+        
+        if (isSynthetic) {
+			ConstantPoolGen cpg = gen.getConstantPool();
+			int index = cpg.addUtf8("Synthetic");
+			gen.addAttribute(new Synthetic(index, 0, new byte[0], cpg.getConstantPool()));
+        }
+        
         if (hasBody()) {
             packBody(gen);
             gen.setMaxLocals();
@@ -711,6 +722,10 @@ public final class LazyMethodGen {
         }
         return gen;
     }
+    
+    public void makeSynthetic() {
+    	isSynthetic = true;
+    }    	
         
     /** fill the newly created method gen with our body, 
      * inspired by InstructionList.copy()
-- 
2.39.5