From 7051338a0064c3a43223e26e3ace8b64258200d7 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 14 May 2004 09:27:42 +0000
Subject: [PATCH] Tests for Bugzilla Bug 62073    false ambigous binding error
 (introduced in 1.2rc2)

---
 tests/ajcTests.xml                   | 16 ++++++-
 tests/bugs/DisjunctVarBinding_2.java | 67 ++++++++++++++++++++++++++++
 tests/bugs/DisjunctVarBinding_3.java |  8 ++++
 3 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 tests/bugs/DisjunctVarBinding_2.java
 create mode 100644 tests/bugs/DisjunctVarBinding_3.java

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 35742e80c..d30ddb380 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -7710,8 +7710,8 @@
     <ajc-test dir="bugs"
 		pr="61568" title="wrong variable binding in || pointcuts">
         <compile files="DisjunctVarBinding.java">
-          <message kind="error" line="18" text="Ambiguous binding of type B"/>
-          <message kind="error" line="18" text="Ambiguous binding of type A"/>
+          <message kind="error" line="34" text="Ambiguous binding of type B"/>
+          <message kind="error" line="34" text="Ambiguous binding of type A"/>
         </compile>
     </ajc-test>
  
@@ -7721,5 +7721,17 @@
           <message kind="warning" line="10" text="no interface constructor-execution join point"/>
         </compile>
     </ajc-test>
+    
+   	<ajc-test dir="bugs"
+		pr="62073" title="false ambigous binding error (introduced in 1.2rc2)">
+        <compile files="DisjunctVarBinding_2.java,DisjunctVarBinding_3.java">
+        	<message kind="error" line="25" file="DisjunctVarBinding_2.java" text="Ambiguous binding of type B"/>
+        	<message kind="error" line="25" file="DisjunctVarBinding_2.java" text="Ambiguous binding of type A"/>
+        </compile>
+        <compile files="DisjunctVarBinding_3.java,DisjunctVarBinding_2.java">
+        	<message kind="error" line="25" file="DisjunctVarBinding_2.java" text="Ambiguous binding of type B"/>
+        	<message kind="error" line="25" file="DisjunctVarBinding_2.java" text="Ambiguous binding of type A"/>
+        </compile>
+    </ajc-test>
  
 </suite>
diff --git a/tests/bugs/DisjunctVarBinding_2.java b/tests/bugs/DisjunctVarBinding_2.java
new file mode 100644
index 000000000..30a96bd93
--- /dev/null
+++ b/tests/bugs/DisjunctVarBinding_2.java
@@ -0,0 +1,67 @@
+class A {
+	void m() {
+		System.out.println("A");
+	}
+ }
+
+class B extends A {
+		void m() {
+		System.out.println("B");
+	}
+ }
+
+
+
+public class DisjunctVarBinding_2 { 
+
+	public static void foo(A a, A b) {
+	    a.m();
+		b.m();
+	}
+
+	public static void main(String[] args) {
+		A a = new A();
+		B b = new B(); 
+		foo(b,a); 
+	} 
+ 
+}
+
+/* Example to illustrate a problem with variable
+   binding and (||) in pointcuts. When run, this program produces
+   java.lang.ClassCastException immediately after
+   the call to "foo". 
+
+   The reason is that the instance tests inherent
+   in the pointcut are done separately from the
+   variable binding.
+
+   Decompiled, the code produced for the relevant call
+   to "foo" is as follows:
+   
+   -------------------------------------------------- 
+   DisjunctVarBinding.foo(r5, r4);
+   label_0:
+        {
+            if (r5 instanceof B == false)
+            {
+                if (r4 instanceof B == false)
+                {
+                    break label_0;
+                }
+            }
+
+            IfPointcut.aspectOf().ajc$afterReturning$IfPointcut$26d(r5, (B) r4);
+        }
+   --------------------------------------------------
+   It should however read something like this, using the instance
+   tests to determine the appropriate variable binding
+
+   --------------------------------------------------
+   DisjunctVarBinding.foo(r5,r4);
+   if (r4 instanceof B)
+      IfPointcut.aspectOf().ajc$afterReturning$IfPointcut$26d(r5, (B)r4)
+   else if (r5 instanceof A)
+           IfPointcut.aspectOf().ajc$afterReturning$IfPointcut$26d(r4,(B)r5)
+   --------------------------------------------------
+*/
\ No newline at end of file
diff --git a/tests/bugs/DisjunctVarBinding_3.java b/tests/bugs/DisjunctVarBinding_3.java
new file mode 100644
index 000000000..3876b3521
--- /dev/null
+++ b/tests/bugs/DisjunctVarBinding_3.java
@@ -0,0 +1,8 @@
+aspect IfPointcut { 
+
+	after(A a, B b) returning:
+	   call(* foo(*,*)) && 
+	(args(b,a) || args(a,b)) { 
+		System.out.println("Woven"); 
+	}
+}
\ No newline at end of file
-- 
2.39.5