From b5e6307a63b0513cb058e8d6e56ff87287bdfa15 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 27 Aug 2004 10:03:54 +0000
Subject: [PATCH] fix for Bugzilla Bug 72150 	  	AJC possible bug with
 static nested classes

---
 tests/bugs/java5/arrayCloning/A.java          |   6 +++
 tests/bugs/java5/arrayCloning/C.java          |  41 ++++++++++++++++++
 tests/bugs/java5/arrayCloning/OneFiveCode.jar | Bin 0 -> 1467 bytes
 tests/bugs/java5/arrayCloning/explanation.txt |   2 +
 tests/bugs/java5/arrayCloning/rebuild.bat     |   4 ++
 .../systemtest/ajc121/Ajc121Tests.java        |   4 ++
 .../systemtest/ajc121/ajc121-tests.xml        |   6 +++
 weaver/src/org/aspectj/weaver/TypeX.java      |   9 +++-
 8 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 tests/bugs/java5/arrayCloning/A.java
 create mode 100644 tests/bugs/java5/arrayCloning/C.java
 create mode 100644 tests/bugs/java5/arrayCloning/OneFiveCode.jar
 create mode 100644 tests/bugs/java5/arrayCloning/explanation.txt
 create mode 100644 tests/bugs/java5/arrayCloning/rebuild.bat

diff --git a/tests/bugs/java5/arrayCloning/A.java b/tests/bugs/java5/arrayCloning/A.java
new file mode 100644
index 000000000..10cb71381
--- /dev/null
+++ b/tests/bugs/java5/arrayCloning/A.java
@@ -0,0 +1,6 @@
+aspect A {
+  Object around(): call(* clone(..)) {
+    return proceed();
+  }
+}
+
diff --git a/tests/bugs/java5/arrayCloning/C.java b/tests/bugs/java5/arrayCloning/C.java
new file mode 100644
index 000000000..8886906f5
--- /dev/null
+++ b/tests/bugs/java5/arrayCloning/C.java
@@ -0,0 +1,41 @@
+import java.lang.reflect.*;
+
+class C {
+
+  public static B.D[] arr = new B.D[5];
+
+  public static void main(String[]argv) {
+    arr[0] = new B.D(42);
+    arr[1] = new B.D(22);
+    arr[2] = new B.D(46);
+    arr[3] = new B.D(50);
+    arr[4] = new B.D(54);
+
+    B.D[] arr2 = arr.clone();
+
+
+    // Check the clone is OK
+    if (arr2[0].i!=42) throw new RuntimeException("Call that a clone 0");
+    if (arr2[1].i!=22) throw new RuntimeException("Call that a clone 1");
+    if (arr2[2].i!=46) throw new RuntimeException("Call that a clone 2");
+    if (arr2[3].i!=50) throw new RuntimeException("Call that a clone 3");
+    if (arr2[4].i!=54) throw new RuntimeException("Call that a clone 4");
+    System.err.println("Clone OK - attempting value manipulation");
+
+    // Change the clone, check the original is OK
+    arr2[2] = new B.D(1);
+    if (arr[2].i == 1)  throw new RuntimeException("Shouldnt have affected original");
+    if (arr2[2].i != 1) throw new RuntimeException("Should have affected clone");
+
+
+    System.err.println("Clone OK - finished");
+  }
+}
+
+
+class B {
+  public static class D {
+    public int i;
+    D(int x) { i=x;}
+  }
+}
diff --git a/tests/bugs/java5/arrayCloning/OneFiveCode.jar b/tests/bugs/java5/arrayCloning/OneFiveCode.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0196f39b0ac812d95a8cdb16a02fe6843733315c
GIT binary patch
literal 1467
zcmWIWW@Zs#-~d8DFKI&tB*4kQ!r-LhqL-YLSX}(?6a#~7pTGBE2Z5vaRSYwew$!iL
zTM@*P&9A%Ho8MQHWr^IBd*-DRbql#YUw{9k(8O-<U_a%D8IN&(+PCAkE&u)f!!#pl
zg2I7F9{J~jR)TsgNi%jT)EHcQlirjt<NkWho9{xoZ}lI0b@k!i3s<|fyz(YJzq|0(
zi=~CmGkUkba$eeT!N0J{;Ly?o^Y81uIOS8ET{?B@s&%EhFDxp8w0@gaYHh39tZrSh
z|D??IJz5W@%FGG8+_+CS>&!bgIc5*H`x7o+72k8d%`@U~+up~&HLp5%%~Rg_^`e{j
zNBaP8b`HN;1^m~6erIB2U<kk&BJ4mFPLS}B^*hMb6d*9?>ZhfV*W^VcLfV&9mw0eC
zt#H2hH?!a14QJHf@Z}4f<uACqW^?bh-fXP%`RBfS49i|v8C(>~;I3ejWpZUHU%FN6
zkk7QGTAbH(uD&ewGiYDTyin|!yX%K*E5l~rRt-BEcT6&VPHdgF&{iMqq}Ius_jrpl
z@&4PTP@*N55;VUlw<hf5RC&EW9JUg37HU08v(BF#IKRAfW&ivI$K%T?ta8|Et{5a-
zNy$0T`Ze4_X0z2Bd5~|@*mdXc1p4Ix5aai)GsL&KlkWNnJBl3te>iXV?WGQx3$>co
zbVWsFE>u|bK%8~UM!}@swgS^F&bw1~tG=DKLjR%ii&lLFsSct2dA<G*ohv%$$wp;+
z=$ECP%Rhg8&i_9azrL^@5ZT1GNP;^-V7f_+;R1!U1ero!XGS9-sdcYr7%Wg;sk}5f
z==hYr5{An&E*73WptJ7vjLU`2$9;J}ONmK{#H}{mpxTyjt<Xg``Eyn570Ex+JCAN$
zT4|*d(f9P8+VvYhg4s-ib-CL1&3W44-g|1<3fqUX%>=g|(rs6ix_u(|bL_lLJA=KR
z-ktSy%Co%=wF?u>jU|6(Ee;dVo+keMyo&9Ag>y+39l;Wp3c9-j3;FLZyUkk2Uf#T;
z-L-9D*}LPs$G2)F{j79+vm<P3mb=lNZNA&j#7>^gy89JJ@g?s`FMnjOQuZxha#{9e
z4_j7|q&CmS9+lPnXE`VDUbiB^+wbI^r)ADFMBhbN^Uki0&DtS<gn9kai#0oMZRqaH
zp7wK{!Ov^cG<Gb?2+IyTS+v7<y6rcMkMY;O{mKl#v*_Tp(~CU3f*u7_yRDvmTf}9C
z+wx<Z=JD-I`{R&fQ+{dUlQgl~$hLzK>5~7w=hX);@17KPsM@*t_`fjIt#0S^S~=nt
zwoK%k;duL_&h19e_m*DoXDdGF^jB}StKxQXdtu^az4)%UJwvs+?D>nYrUxus5a^{C
zd(-&G1=la<<#tVR)_ASh75F)2<)tn&-T7N4`JUEaTXOl*64TpTzCHZSR<E~kiM<2&
z(fGyB1%6do6fiu_cA9E%tLd)LFBP9{2?0*~TV9I2nHVs+U>j?-?T+?+1sU>xId3ky
z_3HZPkozXGhu>OdX<J<4l3VcL+k~(S{;T`qq%Irq9J$zQ$<p~fi8qnM<%1A&g{#ya
zRZ+W1O!qyT=bQYG7x_55t=i@B)xv-C<(A3Vq+YdmuIyhoc~XT?%!0k#;)QKx%`2Kt
zTl5}?2dDq3->gqFF)*BB0i}ONCJ_ci35Z-0fJ#7AfKnc!YemjhprQf+gn-2gwBW$d
dgya@fO$<O6Li1mMH!B;+G-e=N3SzK=2mo~DP$~cb

literal 0
HcmV?d00001

diff --git a/tests/bugs/java5/arrayCloning/explanation.txt b/tests/bugs/java5/arrayCloning/explanation.txt
new file mode 100644
index 000000000..b3f4de2c0
--- /dev/null
+++ b/tests/bugs/java5/arrayCloning/explanation.txt
@@ -0,0 +1,2 @@
+Under Java 1.4 the target of a clone() method called on an array type was 'Object.clone' in the byte code.
+Under Java 1.5 this has been changed to be (correctly) a call to the clone() method on the array type.
\ No newline at end of file
diff --git a/tests/bugs/java5/arrayCloning/rebuild.bat b/tests/bugs/java5/arrayCloning/rebuild.bat
new file mode 100644
index 000000000..f0004a93e
--- /dev/null
+++ b/tests/bugs/java5/arrayCloning/rebuild.bat
@@ -0,0 +1,4 @@
+erase *.class
+javac C.java
+jar -cvMf OneFiveCode.jar *.class
+erase *.class
diff --git a/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
index bdd752160..7c3e3a261 100644
--- a/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
@@ -267,5 +267,9 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test050_typePatternMatchingWithArrays() {
   	runTest("declare warning warns at wrong points");
   }
+
+  public void test051_arrayCloningInJava5() {
+    runTest("AJC possible bug with static nested classes");
+  }
 }
 
diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
index edf21cf94..dd9664295 100644
--- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
@@ -412,4 +412,10 @@
 			<message kind="warning" line="22" text="*[] returning method called"/>
 		</compile>
 	</ajc-test>
+	
+	<ajc-test dir="bugs/java5/arrayCloning" pr="72150"
+	   title="AJC possible bug with static nested classes">
+	   <compile files="A.java" inpath="OneFiveCode.jar"/>
+	   <!--run class="C"/-->
+    </ajc-test>
 	
\ No newline at end of file
diff --git a/weaver/src/org/aspectj/weaver/TypeX.java b/weaver/src/org/aspectj/weaver/TypeX.java
index b871d721b..eb0ec35b4 100644
--- a/weaver/src/org/aspectj/weaver/TypeX.java
+++ b/weaver/src/org/aspectj/weaver/TypeX.java
@@ -583,8 +583,13 @@ public class TypeX {
         if (name.equals("void")) return "V";
         if (name.endsWith("[]")) 
             return "[" + nameToSignature(name.substring(0, name.length() - 2));
-        if (name.length() != 0)  // lots more tests could be made here...
-            return "L" + name.replace('.', '/') + ";";
+        if (name.length() != 0) {
+        	// lots more tests could be made here...
+        	
+        	// 1) If it is already an array type, do not mess with it.
+        	if (name.charAt(0)=='[' && name.charAt(name.length()-1)==';') return name;
+        	else return "L" + name.replace('.', '/') + ";";
+        }
         else 
             throw new BCException("Bad type name: " + name);
     }
-- 
2.39.5