From: aclement <aclement>
Date: Tue, 8 Feb 2005 11:14:14 +0000 (+0000)
Subject: Performance optimization - don't use toString() of a pointcut on the main code path.
X-Git-Tag: V1_5_0M2~177
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cc6a37364a6eac962de2f3af693898bfc2cec9c5;p=aspectj.git

Performance optimization - don't use toString() of a pointcut on the main code path.
---

diff --git a/weaver/src/org/aspectj/weaver/patterns/PointcutRewriter.java b/weaver/src/org/aspectj/weaver/patterns/PointcutRewriter.java
index 8b725721b..f6383e575 100644
--- a/weaver/src/org/aspectj/weaver/patterns/PointcutRewriter.java
+++ b/weaver/src/org/aspectj/weaver/patterns/PointcutRewriter.java
@@ -193,7 +193,8 @@ public class PointcutRewriter {
 			if (element instanceof IfPointcut) {
 				if (((IfPointcut)element).alwaysFalse()) return Pointcut.makeMatchesNothing(element.state);
 			}
-			if (element.toString().equals("")) return element;  // matches nothing...
+			// If it can't match anything, the whole AND can't match anything
+			if (element.couldMatchKinds().isEmpty()) return element;
 		}
 		if (apc.couldMatchKinds().isEmpty()) return Pointcut.makeMatchesNothing(apc.state);
 		// write out with cheapest on left