AspectJ upgraded to Mars compiler

2 files changed, 14 insertions, 3 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java
index 6cf6527b6..20bbef57a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java
@@ -28,7 +28,11 @@ public class KnownMessageSend extends MessageSend {
 		this.receiver = receiver;
 		this.actualReceiverType = binding.declaringClass;
 		this.selector = binding.selector;
-		constant = Constant.NotAConstant;
+		// 1.8.7 change:
+		// If we don't set this to NotAConstant then we run the code in MessageSend.resolveType that sorts
+		// out this.argumentTypes - which we need set because further down MessageSend.resolveType it will
+		// attempt to use it.
+//		constant = Constant.NotAConstant;
 	}
 
 	public void manageSyntheticAccessIfNecessary(BlockScope currentScope) {
@@ -38,8 +42,7 @@ public class KnownMessageSend extends MessageSend {
 	protected void resolveMethodBinding(
 		BlockScope scope,
 		TypeBinding[] argumentTypes) {
-			// we've already resolved this
-		
+		// we've already resolved this
 	}
 	
 	public String toStringExpression() {
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
index 6770b647a..1a88cb3c6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
@@ -19,6 +19,8 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryMethod;
 import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryNestedType;
 import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryType;
 import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryTypeAnnotation;
+import org.aspectj.org.eclipse.jdt.internal.compiler.env.ITypeAnnotationWalker;
+import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
 
 /**
  * Used to determine if a type has structurally changed during incremental compilation. At the end of compilation we create one of
@@ -181,4 +183,10 @@ public class CompactTypeStructureRepresentation implements IBinaryType {
 		return typeAnnotations;
 	}
 
+	public ITypeAnnotationWalker enrichWithExternalAnnotationsFor(ITypeAnnotationWalker walker, Object member,
+			LookupEnvironment environment) {
+		// TODO[1.8.7] more to do here? In what contexts?
+		return walker;
+	}
+
 }
\ No newline at end of file