Fix for Bugzilla Bug 50641

   Better binary compatibility for advice method names 
- I've run the tests a thousand times and they all pass, I'm still nervous about this first big commit though *gulp*

2 files changed, 10 insertions, 2 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
index 6b6b801f5..9d10f6381 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
@@ -263,11 +263,18 @@ public class AdviceDeclaration extends MethodDeclaration {
 		return ret;
 	}
 
-
 	
 	public void postParse(TypeDeclaration typeDec) {
+		int adviceSequenceNumberInType = ((AspectDeclaration)typeDec).adviceCounter++;
+		
+		StringBuffer stringifiedPointcut = new StringBuffer(30);
+		pointcutDesignator.print(0,stringifiedPointcut);
 		this.selector =
-			NameMangler.adviceName(EclipseFactory.fromBinding(typeDec.binding), kind, sourceStart).toCharArray();
+			NameMangler.adviceName(
+			  EclipseFactory.fromBinding(typeDec.binding), 
+			  kind, 
+			  adviceSequenceNumberInType,
+			  stringifiedPointcut.toString().hashCode()).toCharArray();
 		if (arguments != null) {
 			baseArgumentCount = arguments.length;
 		}
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index a3cff8ae6..27db10c3e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -53,6 +53,7 @@ public class AspectDeclaration extends TypeDeclaration {
 	
 	public EclipseFactory factory;  //??? should use this consistently
 
+    public int adviceCounter = 1; // Used as a part of the generated name for advice methods
 
 	// for better error messages in 1.0 to 1.1 transition
 	public TypePattern dominatesPattern;