76030 - cflow optimizations. Part 1 fix - use counters rather than stacks when we can.

3 files changed, 80 insertions, 0 deletions

diff --git a/tests/cflow/CounterTest01.java b/tests/cflow/CounterTest01.java
new file mode 100644
index 000000000..1578ea0f8
--- /dev/null
+++ b/tests/cflow/CounterTest01.java
@@ -0,0 +1,68 @@
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class CounterTest01 {
+
+	public static void main(String []argv) {
+		new CounterTest01().sayMessage();
+		int ctrs = ReflectionHelper.howManyCflowCounterFields(Cflow1.aspectOf());
+		if (ctrs!=2) {
+			throw new RuntimeException("Should be two cflow counters, but found: "+ctrs);
+		}
+		int stacks = ReflectionHelper.howManyCflowStackFields(Cflow1.aspectOf());
+		if (stacks!=1) {
+			throw new RuntimeException("Should be one cflow stacks, but found: "+stacks);
+		}
+	}
+	
+	public void sayMessage() {
+		print("Hello ");
+		print("World\n");
+	}
+	
+	public void print(String msg) {
+		System.out.print(msg);
+	}
+}
+
+aspect Cflow1 {
+	before(): execution(* print(..)) && cflow(execution(* main(..))) {
+		// Managed by a CflowCounter
+	}
+	
+	before(): execution(* print(..)) && cflow(execution(* main(..))) {
+		// Managed by a CflowCounter
+	}
+	
+	before(Object o): execution(* print(..)) && cflow(execution(* main(..)) && target(o)) {
+		// Managed by a CflowStack - since state is exposed
+	}
+}
+
+class ReflectionHelper {
+  public static List getCflowfields(Object o,boolean includeCounters,boolean includeStacks) {
+  	List res = new ArrayList();
+  	Class clazz = o.getClass();
+  	Field[] fs = clazz.getDeclaredFields();
+  	for (int i = 0; i < fs.length; i++) {
+		Field f = fs[i];
+		if ((f.getType().getName().endsWith("CFlowCounter") && includeCounters) ||
+			(f.getType().getName().endsWith("CFlowStack") && includeStacks)) {
+			res.add(f.getType().getName()+":"+f.getName());
+		}
+	}
+  	return res;
+  }
+  
+  public static int howManyCflowCounterFields(Object o) {
+    return getCflowfields(o,true,false).size();
+  }
+  
+  public static int howManyCflowStackFields(Object o) {
+    return getCflowfields(o,false,true).size();
+  }
+  
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
index 022424090..82574a339 100644
--- a/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
@@ -313,5 +313,9 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test058_npeOnTJPerror() {
     runTest("NPE on thisJoinPoint mistake");
   }
+  
+  public void test059_cflowOptimization_counters() {
+  	runTest("Optimization of cflow - counters");
+  }
 
 }
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
index 5c76906a3..2d443d55c 100644
--- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
@@ -464,4 +464,12 @@
         <compile files="TjpMistake.java">
         	<message kind="error" line="22"/>
         </compile>
+    </ajc-test>
+
+	<ajc-test 
+    	dir="cflow" 
+    	pr="76030"
+		title="Optimization of cflow - counters">
+        <compile files="CounterTest01.java"/>
+		<run class="CounterTest01"/>
     </ajc-test>
\ No newline at end of file