#120351 cflowbelow @AJ and binding

2 files changed, 11 insertions, 9 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
index 728b6c128..f18506e25 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
@@ -595,14 +595,16 @@ public class BcelAdvice extends Advice {
 		}
 	}
 
-	public BcelVar[] getExposedStateAsBcelVars() {
+	public BcelVar[] getExposedStateAsBcelVars(boolean isAround) {
         // ATAJ aspect
-        // the closure instantiation has the same mapping as the extracted method from wich it is called
-        if (getConcreteAspect()!= null && getConcreteAspect().isAnnotationStyleAspect()) {
-            return BcelVar.NONE;
+        if (isAround) {
+            // the closure instantiation has the same mapping as the extracted method from wich it is called
+            if (getConcreteAspect()!= null && getConcreteAspect().isAnnotationStyleAspect()) {
+                return BcelVar.NONE;
+            }
         }
 
-		//System.out.println("vars: " + Arrays.asList(exposedState.vars));
+        //System.out.println("vars: " + Arrays.asList(exposedState.vars));
 		if (exposedState == null) return BcelVar.NONE;
 		int len = exposedState.vars.length;
 		BcelVar[] ret = new BcelVar[len];
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index 96fe92f4d..1e8312eb0 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -1894,7 +1894,7 @@ public class BcelShadow extends Shadow {
 	      						new Type[] { }, 
 	      						Constants.INVOKESTATIC));
 			} else {
-				BcelVar[] cflowStateVars = munger.getExposedStateAsBcelVars();
+				BcelVar[] cflowStateVars = munger.getExposedStateAsBcelVars(false);
 	
 				if (cflowStateVars.length == 0) {
 					// This should be getting managed by a counter - lets make sure.
@@ -1958,7 +1958,7 @@ public class BcelShadow extends Shadow {
 				exitInstructions.append(Utility.createGet(fact, cflowField));
 				if (munger.getKind() != AdviceKind.PerCflowEntry &&
 					munger.getKind() != AdviceKind.PerCflowBelowEntry &&
-					munger.getExposedStateAsBcelVars().length==0) {
+					munger.getExposedStateAsBcelVars(false).length==0) {
 					exitInstructions
 					.append(
 						fact
@@ -2342,7 +2342,7 @@ public class BcelShadow extends Shadow {
 		// we have on stack all the arguments for the ADVICE call.
 		// we have in frame somewhere all the arguments for the non-advice call.
 		
-		BcelVar[] adviceVars = munger.getExposedStateAsBcelVars();		
+		BcelVar[] adviceVars = munger.getExposedStateAsBcelVars(true);
 		IntMap proceedMap =  makeProceedArgumentMap(adviceVars);
 
 //		System.out.println(proceedMap + " for " + this);
@@ -2587,7 +2587,7 @@ public class BcelShadow extends Shadow {
         		    0,
         		    munger);
         			    
-    	BcelVar[] adviceVars = munger.getExposedStateAsBcelVars();
+    	BcelVar[] adviceVars = munger.getExposedStateAsBcelVars(true);
     	
     	String closureClassName = 
     		NameMangler.makeClosureClassName(