don't match against synthetic constructor args

1 files changed, 8 insertions, 0 deletions

diff --git a/weaver/src/org/aspectj/weaver/patterns/ArgsPointcut.java b/weaver/src/org/aspectj/weaver/patterns/ArgsPointcut.java
index 2fd1eb7b6..33bcb26fc 100644
--- a/weaver/src/org/aspectj/weaver/patterns/ArgsPointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/ArgsPointcut.java
@@ -107,6 +107,14 @@ public class ArgsPointcut extends NameBindingPointcut {
 				System.arraycopy(argumentsToMatchAgainst, 0, argsSubset, 0, newArgLength);
 				argumentsToMatchAgainst = argsSubset;
 			}
+		} else if (shadow.getKind() == Shadow.ConstructorExecution) {		
+			if (shadow.getMatchingSignature().getParameterTypes().length < argumentsToMatchAgainst.length) {
+				// there are one or more synthetic args on the end, caused by non-public itd constructor 
+				int newArgLength = shadow.getMatchingSignature().getParameterTypes().length;
+				ResolvedType[] argsSubset = new ResolvedType[newArgLength];
+				System.arraycopy(argumentsToMatchAgainst, 0, argsSubset, 0, newArgLength);
+				argumentsToMatchAgainst = argsSubset;				
+			}
 		}
 		
 		return argumentsToMatchAgainst;