From 8d5101c858324f957b8deed851742b2dc322a45a Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Thu, 3 Jul 2003 00:06:53 +0000
Subject: [PATCH] test for Bugzilla Bug 39479    NPE in bcel.LazyMethodGen when
 delegating from one ctor to a second that includes a switch.

---
 tests/ajcTestsFailing.xml |  6 ++++++
 tests/bugs/NewSwitch.java | 31 +++++++++++++++++++++++++++++++
 tests/jimTests.xml        |  8 ++++----
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 tests/bugs/NewSwitch.java

diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index 4292bacbd..25314b777 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -9,5 +9,11 @@
         <compile files="lib.jar,TestAspect.aj,Test.java"/>
         <run class="Test"/>
     </ajc-test>
+    
+    <ajc-test dir="bugs" pr="39479"
+   	 title="NPE in bcel.LazyMethodGen when delegating from one ctor to a second that includes a switch">
+        <compile files="NewSwitch.java"/>
+        <run class="NewSwitch"/>
+    </ajc-test>
 
 </suite>
diff --git a/tests/bugs/NewSwitch.java b/tests/bugs/NewSwitch.java
new file mode 100644
index 000000000..f07efba6b
--- /dev/null
+++ b/tests/bugs/NewSwitch.java
@@ -0,0 +1,31 @@
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.reflect.SourceLocation;
+
+public class NewSwitch {
+  public static void main(String[] args) {
+  	new NewSwitch(2);
+  }
+
+  protected NewSwitch() {
+	this(3);
+  }
+
+  protected NewSwitch(int p) {
+	switch (p) {
+	  case 3: break;
+	}
+  }
+}
+
+aspect FFDC {
+
+	pointcut initializers( ) : staticinitialization( * ) || initialization( *.new(..) );
+	pointcut methodsAndConstructors( ) : execution(* *(..)) || execution(new(..) );
+	pointcut guarded( ) :  initializers( ) || methodsAndConstructors( );    
+
+	final pointcut nonStaticContext( Object o ) : this( o );
+
+	after(Object o) throwing(Throwable t) : guarded( ) && nonStaticContext( o ) { }
+
+}
diff --git a/tests/jimTests.xml b/tests/jimTests.xml
index 353042abe..c10a38f4a 100644
--- a/tests/jimTests.xml
+++ b/tests/jimTests.xml
@@ -1,9 +1,9 @@
 <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
 <suite> 
-    <ajc-test dir="bugs" pr="38345" keywords="purejava"
-   	 title="try switch VerifyError, InconsistentStackHeight">
-        <compile files="TrySwitch.java"/>
-        <run class="TrySwitch"/>
+    <ajc-test dir="bugs" pr="39479"
+   	 title="NPE in bcel.LazyMethodGen when delegating from one ctor to a second that includes a switch">
+        <compile files="NewSwitch.java"/>
+        <run class="NewSwitch"/>
     </ajc-test>
 
 </suite>
\ No newline at end of file
-- 
2.39.5