374964

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java
index 18cdfa3f3dbed41a2f78ad2ccefb3ec69b5d13d2..5f3a3291f63c2e8aeae7a5d47943c1e4854ae1cf 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java
@@ -25,14 +25,15 @@ public class PointcutEvaluationExpenseComparator implements Comparator<Pointcut>
        private static final int WITHINCODE = 7;
        private static final int ATWITHINCODE = 8;
        private static final int EXE_INIT_PREINIT = 9;
-       private static final int THIS_OR_TARGET = 10;
-       private static final int CALL = 11;
-       private static final int ANNOTATION = 12;
-       private static final int AT_THIS_OR_TARGET = 13;
-       private static final int ARGS = 14;
-       private static final int AT_ARGS = 15;
-       private static final int CFLOW = 16;
-       private static final int IF = 17;
+       private static final int CALL_WITH_DECLARING_TYPE = 10;
+       private static final int THIS_OR_TARGET = 11;
+       private static final int CALL_WITHOUT_DECLARING_TYPE = 12;
+       private static final int ANNOTATION = 13;
+       private static final int AT_THIS_OR_TARGET = 14;
+       private static final int ARGS = 15;
+       private static final int AT_ARGS = 16;
+       private static final int CFLOW = 17;
+       private static final int IF = 18;
        private static final int OTHER = 20;
 
        /**
@@ -85,7 +86,12 @@ public class PointcutEvaluationExpenseComparator implements Comparator<Pointcut>
                        if (kind == Shadow.AdviceExecution) {
                                return ADVICEEXECUTION;
                        } else if ((kind == Shadow.ConstructorCall) || (kind == Shadow.MethodCall)) {
-                               return CALL;
+                               TypePattern declaringTypePattern = kp.getSignature().getDeclaringType();
+                               if (declaringTypePattern instanceof AnyTypePattern) {
+                                       return CALL_WITHOUT_DECLARING_TYPE;
+                               } else {
+                                       return CALL_WITH_DECLARING_TYPE;                                        
+                               }
                        } else if ((kind == Shadow.ConstructorExecution) || (kind == Shadow.MethodExecution) || (kind == Shadow.Initialization)
                                        || (kind == Shadow.PreInitialization)) {
                                return EXE_INIT_PREINIT;

diff --git a/tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java b/tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java
index 77a50869cd485a6d2969ba28d0004815ae37a115..9ce29a36feab9679f99f73fc9ff93bdc5d67f963 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java
@@ -17,14 +17,51 @@ import junit.framework.Test;
 import org.aspectj.apache.bcel.classfile.Field;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.testing.XMLBasedAjcTestCase;
+import org.aspectj.weaver.ResolvedMember;
+import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.TypeFactory;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.World;
+import org.aspectj.weaver.internal.tools.StandardPointcutExpressionImpl;
+import org.aspectj.weaver.patterns.BasicTokenSource;
+import org.aspectj.weaver.patterns.ITokenSource;
+import org.aspectj.weaver.patterns.PatternParser;
+import org.aspectj.weaver.patterns.Pointcut;
+import org.aspectj.weaver.patterns.PointcutEvaluationExpenseComparator;
+import org.aspectj.weaver.patterns.PointcutRewriter;
+import org.aspectj.weaver.reflect.ReflectionWorld;
+import org.aspectj.weaver.tools.StandardPointcutExpression;
+import org.aspectj.weaver.tools.StandardPointcutParser;
 
 /**
  * @author Andy Clement
  */ 
 public class Ajc170Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       public void testPointcutExpense_374964() {
+               // check a declaring type being specified causes the call() to be considered cheaper than this()
+               
+               World world = new ReflectionWorld(true, getClass().getClassLoader());
+               StandardPointcutParser pointcutParser = StandardPointcutParser.getPointcutParserSupportingAllPrimitives(world);
+               StandardPointcutExpressionImpl pointcutExpression = (StandardPointcutExpressionImpl)pointcutParser.parsePointcutExpression("call(* *(..)) && this(Object)");
+               Pointcut pc = pointcutExpression.getUnderlyingPointcut();
+               Pointcut newp = new PointcutRewriter().rewrite(pc);
+               // no declaring type so this() is considered cheaper
+               assertEquals("(this(java.lang.Object) && call(* *(..)))",newp.toString());
+               
+               pointcutExpression = (StandardPointcutExpressionImpl)pointcutParser.parsePointcutExpression("call(* String.*(..)) && this(Object)");
+               pc = pointcutExpression.getUnderlyingPointcut();
+               newp = new PointcutRewriter().rewrite(pc);
+               // declaring type, so call() is cheaper
+               assertEquals("(call(* java.lang.String.*(..)) && this(java.lang.Object))",newp.toString());
+
+               pointcutExpression = (StandardPointcutExpressionImpl)pointcutParser.parsePointcutExpression("this(Object) && call(* *(..)) && call(* String.*(..))");
+               pc = pointcutExpression.getUnderlyingPointcut();
+               newp = new PointcutRewriter().rewrite(pc);
+               // more complex example, mix of them
+               assertEquals("((call(* java.lang.String.*(..)) && this(java.lang.Object)) && call(* *(..)))",newp.toString());
+       }
+       
 /*
        public void testPublicITDFs_pr73507_1() {
                runTest("public ITDfs - 1");