Apply fallback for proxy with negative match or annotation pointcut

See gh-30534

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@@ -471,10 +471,12 @@ private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
 								fallbackExpression = null;
 							}
 						}
-						if (targetMethod != originalMethod && (shadowMatch == null || shouldFallback(targetMethod))) {
+						if (targetMethod != originalMethod && (shadowMatch == null ||
+								(Proxy.isProxyClass(targetMethod.getDeclaringClass()) &&
+										(shadowMatch.neverMatches() || containsAnnotationPointcut())))) {
 							// Fall back to the plain original method in case of no resolvable match or a
 							// negative match on a proxy class (which doesn't carry any annotations on its
-							// redeclared methods).
+							// redeclared methods), as well as for annotation pointcuts.
 							methodToMatch = originalMethod;
 							try {
 								shadowMatch = obtainPointcutExpression().matchesMethodExecution(methodToMatch);
@@ -513,13 +515,11 @@ else if (shadowMatch.maybeMatches() && fallbackExpression != null) {
 		return shadowMatch;
 	}
 
-	private boolean shouldFallback(Method targetMethod) {
-		if (!Proxy.isProxyClass(targetMethod.getDeclaringClass())) {
-			return false;
-		}
-		return this.resolveExpression().contains("@annotation");
+	private boolean containsAnnotationPointcut() {
+		return resolveExpression().contains("@annotation");
 	}
 
+
 	@Override
 	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof AspectJExpressionPointcut that &&