Fix for bug 69459

	  	Hiding of Instance Methods by static methods

12 files changed, 49 insertions, 0 deletions

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 000000000..824e468a1
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Aspect1.class
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 000000000..f4421e9e3
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Aspect2.class
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 000000000..c0a203fbd
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Subclass.class
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 000000000..0a91a0098
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Super.class
diff --git a/tests/bugs/intertypeOverrides/Superclass.class b/tests/bugs/intertypeOverrides/Superclass.class
new file mode 100644
index 000000000..6b0ea6b94
--- /dev/null
+++ b/tests/bugs/intertypeOverrides/Superclass.class
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() {};
+}