322446: parent type munger remembers declaring aspect

org.aspectj.matcher/src/org/aspectj/weaver/NewParentTypeMunger.java

@@ -16,11 +16,13 @@ import java.io.IOException;
 
 public class NewParentTypeMunger extends ResolvedTypeMunger {
 	ResolvedType newParent;
+	ResolvedType declaringType;
 	private boolean isMixin;
 
-	public NewParentTypeMunger(ResolvedType newParent) {
+	public NewParentTypeMunger(ResolvedType newParent, ResolvedType declaringType) {
 		super(Parent, null);
 		this.newParent = newParent;
+		this.declaringType = declaringType;
 		this.isMixin = false;
 	}
 
@@ -52,6 +54,10 @@ public class NewParentTypeMunger extends ResolvedTypeMunger {
 		return hashCode;
 	}
 
+	public ResolvedType getDeclaringType() {
+		return declaringType;
+	}
+
 	public void setIsMixin(boolean b) {
 		isMixin = true;
 	}