From b18436307ecfed63c8995fd35013ffa07e5116e7 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 27 Jul 2004 14:17:32 +0000
Subject: [PATCH] Fix for bug 69459 	  	Hiding of Instance Methods by
 static methods

---
 tests/ajcTests.xml                            |  19 ++++++++++++++++++
 tests/bugs/intertypeOverrides/Aspect1.class   | Bin 0 -> 1540 bytes
 tests/bugs/intertypeOverrides/Aspect1.java    |   3 +++
 tests/bugs/intertypeOverrides/Aspect2.class   | Bin 0 -> 1506 bytes
 tests/bugs/intertypeOverrides/Aspect2.java    |   3 +++
 .../IntertypeOverrides.java                   |   9 +++++++++
 .../IntertypeOverrides2.java                  |   9 +++++++++
 tests/bugs/intertypeOverrides/Subclass.class  | Bin 0 -> 243 bytes
 tests/bugs/intertypeOverrides/Subclass.java   |   2 ++
 tests/bugs/intertypeOverrides/Super.class     | Bin 0 -> 382 bytes
 .../bugs/intertypeOverrides/Superclass.class  | Bin 0 -> 392 bytes
 tests/bugs/intertypeOverrides/Superclass.java |   4 ++++
 .../src/org/aspectj/weaver/ResolvedTypeX.java |  14 ++++++++++---
 13 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 tests/bugs/intertypeOverrides/Aspect1.class
 create mode 100644 tests/bugs/intertypeOverrides/Aspect1.java
 create mode 100644 tests/bugs/intertypeOverrides/Aspect2.class
 create mode 100644 tests/bugs/intertypeOverrides/Aspect2.java
 create mode 100644 tests/bugs/intertypeOverrides/IntertypeOverrides.java
 create mode 100644 tests/bugs/intertypeOverrides/IntertypeOverrides2.java
 create mode 100644 tests/bugs/intertypeOverrides/Subclass.class
 create mode 100644 tests/bugs/intertypeOverrides/Subclass.java
 create mode 100644 tests/bugs/intertypeOverrides/Super.class
 create mode 100644 tests/bugs/intertypeOverrides/Superclass.class
 create mode 100644 tests/bugs/intertypeOverrides/Superclass.java

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index a74b3d915..85c36164b 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -7776,4 +7776,23 @@
         <message kind="error" line="9" text="can't bind type name 'unknown.Error'"/>
         </compile>
     </ajc-test> 
+    
+    <ajc-test dir="bugs/intertypeOverrides"
+		pr="69459" title="Hiding of Instance Methods by static methods">
+        <compile files="IntertypeOverrides.java">
+          <message kind="error" line="8" text="void Sub.m() cannot override void Super.m(); overriding method is static"/>
+        </compile>
+        <compile files="IntertypeOverrides2.java">
+          <message kind="error" line="8" text="void Sub.m() cannot override void Super.m(); overridden method is static"/>
+        </compile>
+        <compile files="Superclass.java,Subclass.java,Aspect1.java">
+          <message file="Aspect1.java" kind="error" line="2" 
+             text="void Subclass.staticMethod() cannot override void Superclass.staticMethod(); overridden method is static"/>
+        </compile>
+        <compile files="Superclass.java,Subclass.java,Aspect2.java">
+          <message file="Aspect2.java" kind="error" line="2"
+             text="void Subclass.nonstaticMethod() cannot override void Superclass.nonstaticMethod(); overriding method is static"/>
+        </compile>
+    </ajc-test>
+    
 </suite>
diff --git a/tests/bugs/intertypeOverrides/Aspect1.class b/tests/bugs/intertypeOverrides/Aspect1.class
new file mode 100644
index 0000000000000000000000000000000000000000..824e468a16a3adbe5dca1921faf9725b1fd56428
GIT binary patch
literal 1540
zcmbVMTTc@~6#k|KdSQVAa#OjeMcN`Q1;q<QgB22Efrk<jOcOF)hIX5}+w4xc{32g?
z5J<#GqHmh`qtr9ICA8SY=q6`&=FB<gJLk+d^W*2|F94Ew$`Dv~szR6P02o80%=dY!
z!p&l8qfjPw0DguWysSqJ(~zs&sMKtc;WbAv3}mmYH%qp4zzY?z$S|zTtHRD1X0alq
zWxh5Y$xWSHLfJYRnFW{hiVFIi!5@onF|=i@U9#zR-7QCE+-(gS!eRK(rJ)@iA)56t
z^tXTxpqHU1YnWoa_O2l8O_dKrU)IujWsBQ}TGy2wOD?pA0TsLrg9I;2hQl!96)T0k
zCS=Lljn*@c=4u7K!W}0{#YjW<b{V>2*~^_pRmG%b7n9uWX*qcy_`a}{D|>s?OJiT;
zjH1aUwUAn&a1`VYL-;BL!@{)$UKvi6OTCo-TPDHFJOUVJ&>GX!a7WcSfxFaqFS(69
zhR#^L;XuY(WWHR^9htHus9+5N1XcT|7^cWHRWH(`%ev+D>7`XOcUKN|QI&>e1`rP_
zUL|4;T**nBn6cQPxnfUzOC8CBFcO%d9+kM`g>^ad)<sub7_8?J&RI2E7psOkXw5TC
zClxmsMq8A#c~li^HM1yehLINgmtYeu_B^PJWlC`<sh>Wg4QLE2TGDJp^@sjy43U=F
zORI+@j70l{?)M13Nt_{a;%fZl)kpsQwA<lo=%&%!M*_vmdW01HRfP7$IfhPX@~4aD
z8DQ8=AVjI$B&%CwJKIDqQd}d3d-X^S#7P$Dva6)0Nfacz4(D?-^xzn7W0Z_S82ev1
z!ccG{1m;!v5%(12RU<-(Vv=gPPg>7-+HE^9bc)z_L@ton?wdYE<Q&Pbr225pJ%!mO
z_c0d<2%jST4ef2m{^KT(uzGHqJjQ9IzRnByw$CwlhWX|k+uTF;;Sm<dY~J^8Eq7x-
zrZL2R)jvF;<qp;|&+;quMphk>pG(i>MSae_$7SchnafMzNGD&Y6`j06#Iz+5e1o1G
U+t?LOzVSj(NIyw0$r8zn-^ICDjQ{`u

literal 0
HcmV?d00001

diff --git a/tests/bugs/intertypeOverrides/Aspect1.java b/tests/bugs/intertypeOverrides/Aspect1.java
new file mode 100644
index 000000000..e6dbf8bd8
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Aspect1.java
@@ -0,0 +1,3 @@
+aspect Aspect1 {
+  public void Subclass.staticMethod() {};
+}
diff --git a/tests/bugs/intertypeOverrides/Aspect2.class b/tests/bugs/intertypeOverrides/Aspect2.class
new file mode 100644
index 0000000000000000000000000000000000000000..f4421e9e36eeebe0ebde7259a46f2d62e8761a70
GIT binary patch
literal 1506
zcmbtUTTc@~6#k|y^uh`S<fd}dA~$WJD2YOhSRo-6cqk#kG$GSvXt$}m&F+-TFY<*4
zfd_~r`lg9LN<Fi?2rYfkxXIa>IdjhW&iUrd{P_9#3xFi%8Ny3WRp>Gu24jeq`94oo
zxLHhX6w0IyBgk-<m-U2U8ghjjm6|Owyyggop6s>tX34e=c%dQ|82XiYRoFShELMcH
z%vIBo+|<b>n)T7hEV8IqRM1xp!HLN&hET@ZC7X8F-Ew5c-PWKX7DE7cG_;^KO0y1z
z?k3P-bTV{g4O6VwJ`{w#sq$gy%33<FY;oIAYhT&A=t67gQNcs#C3smf9EKUMSSjo^
zAxqY7!p}I7s}=MLcbtT2sd}WLdj<?+mR(G8m&S7PK=6HGCztp3h(2Rq<cy-pC9%fv
zq9OEK!>MwqmuCM0BXR{F#sjLdAqNdZs*XVn6R%z-8+#0G6O%UxA8L~3QaN{I%95aJ
zG=vdR^d=a_$u#9x<h8@P<?-;ws+qgXhq|ar!!pBo98rBUHF2XCa?+-gU$~*U?vBYV
zMfqe5<Cvm$C~?ON>-NBV7hRooub)ROXVq+7tQhJbHP1AiRA<jH*rc4zqpDb|nMGkU
z3^dul0vl<v=RsvGQ;I{0QOY7jcO-zAYCD<@D1K;E|0rpRURpgPVI<lG+CL)lZt4v2
z6IT-?uP*ZMrrlOoLpO=$0TQUb^CP5aR1sRH&e3;5liMzuXMlb;fheV-NV-S1a}2TU
zRckDeB6_Pg+}lMvzzoT2y3Z=_QKg`dH6jN7BpJp1|G=S=6i&a30)#FwqM)uhh*Ay@
zsf<Uig|eM?83+1KG4>ttON?)KO`IZrj_I$Y`qbe51W)VShg_C`*eR0V&=NWh9@lxq
z)Jsz5F-$A<wOt~xeU8)_X6kbcVV1T7NMnx1`M^K3t)ja<5@o;q56?-pgSE`d{4%|O
zRY&C0v+2C>=iGZob`G3$UJ6G#`9iJe<PB;|TT**((CcCwyTZxeybcsHNYY8NLbCcB
DX983U

literal 0
HcmV?d00001

diff --git a/tests/bugs/intertypeOverrides/Aspect2.java b/tests/bugs/intertypeOverrides/Aspect2.java
new file mode 100644
index 000000000..b2ea3ca56
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Aspect2.java
@@ -0,0 +1,3 @@
+aspect Aspect2 {
+  public static void Subclass.nonstaticMethod() {};
+}
diff --git a/tests/bugs/intertypeOverrides/IntertypeOverrides.java b/tests/bugs/intertypeOverrides/IntertypeOverrides.java
new file mode 100644
index 000000000..895a49b91
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/IntertypeOverrides.java
@@ -0,0 +1,9 @@
+class Super {
+  public void m(){};
+}
+
+class Sub extends Super {}
+
+aspect A {
+  public static void Sub.m(){}
+}
diff --git a/tests/bugs/intertypeOverrides/IntertypeOverrides2.java b/tests/bugs/intertypeOverrides/IntertypeOverrides2.java
new file mode 100644
index 000000000..ae86cc3bf
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/IntertypeOverrides2.java
@@ -0,0 +1,9 @@
+class Super {
+  public static void m(){};
+}
+
+class Sub extends Super {}
+
+aspect A {
+  public void Sub.m(){}
+}
diff --git a/tests/bugs/intertypeOverrides/Subclass.class b/tests/bugs/intertypeOverrides/Subclass.class
new file mode 100644
index 0000000000000000000000000000000000000000..c0a203fbd45e8ae2cf0f9b3f46c405d93f58a998
GIT binary patch
literal 243
zcmXv{%MQU%5Is}XR@EcEz!D2SfY?Z^8k>s!ZQaC`Qn_{gmzBiA2lyy4w`!6(XXeb~
zyg$zufGPTfATeo{i?Z}VgfKA|sq4N$@D}Q<u1i8=G~N;1Rk4>5n(#un2nfAco#n=y
zQmMBh%_U(F7n#U+LMz+XqI*54lE24)v$?e@jLzg**{jZfFg=Q!zz`1qw?Uk2$Lw=8
eW3H6R1Fbs?4njsdwySN%=(oV!skAPmgWeZ5*e$96

literal 0
HcmV?d00001

diff --git a/tests/bugs/intertypeOverrides/Subclass.java b/tests/bugs/intertypeOverrides/Subclass.java
new file mode 100644
index 000000000..b87d7c845
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Subclass.java
@@ -0,0 +1,2 @@
+class Subclass extends Superclass {
+}
diff --git a/tests/bugs/intertypeOverrides/Super.class b/tests/bugs/intertypeOverrides/Super.class
new file mode 100644
index 0000000000000000000000000000000000000000..0a91a0098de7e94e5b22f2b1089100c021594cb1
GIT binary patch
literal 382
zcmZutOHRWu5PjpM4Gn=nPXIeUQgZ+h8zfc%7De4Vu0>r18zm0+Vui$l18^wB*q{m!
zBhCN4nX%tLUf%%BFeQxU!=vsp5MggEpJdfadtco)Ypr~SgfKog*7yrTa&){Pq?c}~
z3yd(%kz$Kb*2e0a;i1vpoorf7nAT3ob|E_x^6z5mSEeUqb=-GGD0(lwQP<k9+>*yw
zXMb1nxf?pAuS}R(Mw)76-_OFCIDp{&K@wIz2RxjkiamwO$qOdW90=rWLmRByY>O`d
p`yI|E*xis1IS)dAi6Rn3XrbJ|Ph<WMJo&MQUmExD|1w-){}W=7JEH&q

literal 0
HcmV?d00001

diff --git a/tests/bugs/intertypeOverrides/Superclass.class b/tests/bugs/intertypeOverrides/Superclass.class
new file mode 100644
index 0000000000000000000000000000000000000000..6b0ea6b94f2851c3960c72e1832920b866b5d059
GIT binary patch
literal 392
zcmZutOHRWu5Pjo>hK4{&PXIeUQgZ+h8zfeNE{eK$T#LF2HcA}s#R`c92jEbs<A7Q~
zj5MD&^X6lJe7?N{m|#puXWf%-R4v;!0TD(k`7DcC+J|CVt+et9BEsO(SmUn<(aGtY
z5MR56&ai_)iWs|uyfjwdb&r*9?qyYL!nkxw)^pjIfWMQmUz(PXmD{Bk3|lX~QMcMJ
z-GXOXXMbnXnd=&*Z%i1RZ+j=<Rvba_5kVqWz6pecqk=t!%-Ji3FB}M@Y(p8Wdu+2W
q0{eYNLmX_Hj~NG{zm1}A6rqHCLqG5FKlJFw9)4-Rhd-I=0*7l&r9asK

literal 0
HcmV?d00001

diff --git a/tests/bugs/intertypeOverrides/Superclass.java b/tests/bugs/intertypeOverrides/Superclass.java
new file mode 100644
index 000000000..eface6c39
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Superclass.java
@@ -0,0 +1,4 @@
+class Superclass {
+  public static void staticMethod(){} {}
+  public void nonstaticMethod() {};
+}
diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
index 15c86bdbb..16634af07 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
@@ -1107,9 +1107,9 @@ public abstract class ResolvedTypeX extends TypeX {
 		ResolvedMember sig = munger.getSignature();
 		while (existingMembers.hasNext()) {
 			ResolvedMember existingMember = (ResolvedMember)existingMembers.next();
-			
+			//System.err.println("Comparing munger: "+sig+" with member "+existingMember);
 			if (conflictingSignature(existingMember, munger.getSignature())) {
-				//System.err.println("conflict: " + existingMember + " with " + munger);
+				//System.err.println("conflict: existingMember=" + existingMember + "   typeMunger=" + munger);
 				//System.err.println(munger.getSourceLocation() + ", " + munger.getSignature() + ", " + munger.getSignature().getSourceLocation());
 				
 				if (isVisible(existingMember.getModifiers(), this, munger.getAspectType())) {
@@ -1191,7 +1191,15 @@ public abstract class ResolvedTypeX extends TypeX {
 						
 			return false;
 		}
-		
+		if (parent.isStatic() && !child.isStatic()) {
+			world.showMessage(IMessage.ERROR,
+			  child.toString()+" cannot override "+parent.toString()+"; overridden method is static",
+			  child.getSourceLocation(),null);
+		} else if (child.isStatic() && !parent.isStatic()) {
+			world.showMessage(IMessage.ERROR,
+			  child.toString()+" cannot override "+parent.toString()+"; overriding method is static",
+			  child.getSourceLocation(),null);
+		}
 		return true;
 		
 	}
-- 
2.39.5