Discrepancy in annotation processing, between full and incremental

builds #4617

Author: jarthana

org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar

@@ -58,7 +58,7 @@
 	                       "org.eclipse.jdt.compiler.apt.tests.annotations.IFoo", "org.eclipse.jdt.compiler.apt.tests.annotations.IFooContainer",
 	                       "org.eclipse.jdt.compiler.apt.tests.annotations.Goo", "org.eclipse.jdt.compiler.apt.tests.annotations.GooNonContainer",
 	                       "org.eclipse.jdt.compiler.apt.tests.annotations.FooNonContainer", "targets.filer8.PackageAnnot",
-	                       "java.lang.Deprecated"})
+	                       "java.lang.Deprecated", "org.eclipse.jdt.compiler.apt.tests.annotations.GenClass"})
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 public class Java8ElementProcessor extends BaseProcessor {
@@ -161,6 +161,7 @@ public void testAll() throws AssertionFailedError {
 		testBug526288();
 		testEnumConstArguments();
 		testBug544288();
+		testGH4617();
 	}
 
 	public void testLambdaSpecifics() {
@@ -1070,6 +1071,17 @@ public void testBug544288() {
 		Element asElement = _typeUtils.asElement(asType);
 		verifyAnnotations(asElement, new String[]{"@Deprecated()"});
 	}
+	public void testGH4617() {
+		TypeElement type = _elementUtils.getTypeElement("targets.GH4617.ParentClass");
+		List<? extends Element> enclosedElements = type.getEnclosedElements();
+		List<ExecutableElement> methodsIn = ElementFilter.methodsIn(enclosedElements);
+		assertEquals("Incorrect number of methods", 3, methodsIn.size());
+		StringBuilder builder = new StringBuilder();
+		for (ExecutableElement executableElement : methodsIn) {
+			builder.append(executableElement.getSimpleName().toString()).append(',');
+		}
+		assertEquals("Incorrect order received", "gamma,alpha,beta,", builder.toString());
+	}
 	private void createPackageBinary() throws IOException {
 		String path = packageName.replace('.', '/');
 		ClassLoader loader = getClass().getClassLoader();

org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors8.jar

@@ -0,0 +1,7 @@
+package targets.GH4617;
+@org.eclipse.jdt.compiler.apt.tests.annotations.GenClass(clazz="p.q.R", method="foo")
+public abstract class ParentClass {
+  public abstract int gamma();
+  public abstract byte alpha();
+  public abstract int beta();
+}

org.eclipse.jdt.compiler.apt.tests/processors8/org/eclipse/jdt/compiler/apt/tests/processors/elements/Java8ElementProcessor.java

@@ -413,6 +413,12 @@ public void testBug544288() throws Exception {
 		JavaCompiler compiler = BatchTestUtils.getEclipseCompiler();
 		internalTestWithBinary(compiler, JAVA8_ANNOTATION_PROC, "testBug544288", null, "bug544288", "9");
 	}
+	public void testGH4617() throws Exception {
+		if (!canRunJava9())
+			return;
+		JavaCompiler compiler = BatchTestUtils.getEclipseCompiler();
+		internalTestWithBinary(compiler, JAVA8_ANNOTATION_PROC, "testGH4617", null, "GH4617", "9");
+	}
 	private void internalTest(JavaCompiler compiler, String processor, String testMethod) throws IOException {
 		internalTest(compiler, processor, testMethod, null);
 	}

org.eclipse.jdt.compiler.apt.tests/resources/targets/GH4617/ParentClass.java

@@ -77,9 +77,11 @@ private int determineSourceStart(ElementImpl e) {
 				case METHOD :
 					ExecutableElementImpl executableElementImpl = (ExecutableElementImpl) e;
 					Binding binding = executableElementImpl._binding;
-					if (binding instanceof MethodBinding) {
-						MethodBinding methodBinding = (MethodBinding) binding;
-						return methodBinding.sourceStart();
+					if(binding instanceof MethodBinding bmd) {
+						if (bmd.declaringClass.isBinaryBinding()) {
+							return bmd.order;
+						}
+						return bmd.sourceStart();
 					}
 					break;
 				case ENUM_CONSTANT :
@@ -129,6 +131,8 @@ protected AnnotationBinding[] getAnnotationBindings()
 	@Override
 	public List<? extends Element> getEnclosedElements() {
 		ReferenceBinding binding = (ReferenceBinding)this._binding;
+		long bkup = binding.tagBits;
+		binding.tagBits |= TagBits.AreMethodsSorted;
 		List<Element> enclosed = new ArrayList<>(binding.fieldCount() + binding.methods().length + binding.memberTypes().length);
 		for (MethodBinding method : binding.methods()) {
 			ExecutableElement executable = new ExecutableElementImpl(this._env, method);
@@ -141,6 +145,7 @@ public List<? extends Element> getEnclosedElements() {
 				 enclosed.add(variable);
 			}
 		}
+		binding.tagBits = bkup;
 		if (binding.isRecord()) {
 			RecordComponentBinding[] components = binding.components();
 			for (RecordComponentBinding comp : components) {

org.eclipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/Java8ElementsTests.java

@@ -1152,6 +1152,7 @@ private IBinaryMethod[] createMethods(IBinaryMethod[] iMethods, IBinaryType bina
 				if (hasRestrictedAccess)
 					method.modifiers |= ExtraCompilerModifiers.AccRestrictedAccess;
 				methods1[i] = method;
+				method.order = i;
 			}
 			this.methods = methods1;
 			return iMethods;
@@ -1164,6 +1165,7 @@ private IBinaryMethod[] createMethods(IBinaryMethod[] iMethods, IBinaryType bina
 						method.modifiers |= ExtraCompilerModifiers.AccRestrictedAccess;
 					mappedBinaryMethods[index] = iMethods[i];
 					methods1[index++] = method;
+					method.order = i;
 				}
 			}
 			this.methods = methods1;

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/apt/model/TypeElementImpl.java

@@ -94,6 +94,7 @@ public static byte flowBitFromAnnotationTagBit(long tagBit) {
 
 	/** Store parameter names from MethodParameters attribute (incl. applicable default). */
 	public char[][] parameterNames = Binding.NO_PARAMETER_NAMES;
+	public int order;
 
 protected MethodBinding() {
 	// for creating problem or synthetic method