Merge remote-tracking branch 'master' into BETA_JAVA26

- re-generate apttestprocessors8.jar after sources were merged

Author: stephan-herrmann

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

@@ -161,6 +161,7 @@ private boolean doesClassContainArgsConstructor(Element el,
 		return false;
 	}
 
+	@SuppressWarnings("deprecation")
 	private final TypeVisitor<Boolean, List<TypeMirror>> argsVisitor = new SimpleTypeVisitor6<>() {
 		@Override
 		public Boolean visitExecutable(ExecutableType t,

org.eclipse.jdt.compiler.apt.tests/processors/org/eclipse/jdt/compiler/apt/tests/processors/inherited/ArgsConstructorProcessor.java

@@ -49,6 +49,7 @@ public class VisitorProc extends BaseProcessor
 	 * This visitor is invoked on the top-level types in resources/targets/model.
 	 * We expect to see each of the visitX() methods get hit as a result.
 	 */
+	@SuppressWarnings("deprecation")
 	private static class ElementVisitorTester extends ElementScanner6<Void, Void> {
 
 		public enum Visited { TYPE, EXECUTABLE, VARIABLE, TYPEPARAM, PACKAGE, UNKNOWN }
@@ -131,6 +132,7 @@ public Void visitUnknown(Element e, Void p) {
 	/*
 	 * The specific values checked by this visitor correspond to values in targets.model.pc.TypedAnnos.java
 	 */
+	@SuppressWarnings("deprecation")
 	private static class AnnotationVisitorTester extends AbstractAnnotationValueVisitor6<Void, Void> {
 
 		public enum Visited { ANNOTATION, ARRAY, BOOLEAN, BYTE, CHAR, DOUBLE, ENUMCONSTANT, FLOAT, INT, LONG, SHORT, STRING, TYPE }

org.eclipse.jdt.compiler.apt.tests/processors/org/eclipse/jdt/compiler/apt/tests/processors/visitors/VisitorProc.java

@@ -1082,6 +1082,23 @@ public void testGH4617() {
 		}
 		assertEquals("Incorrect order received", "gamma,alpha,beta,", builder.toString());
 	}
+	public void testGH1752() {
+		TypeElement type = _elementUtils.getTypeElement("targets.GH1752.GH1752SubClass");
+		List<? extends Element> allMembers = _elementUtils.getAllMembers(type);
+		ExecutableElement m1 = null;
+		ExecutableElement m3 = null;
+		for (Element element : allMembers) {
+			if (element.getSimpleName().toString().equals("m1")) {
+				m1 = (ExecutableElement) element;
+			}
+			if (element.getSimpleName().toString().equals("m3")) {
+				m3 = (ExecutableElement) element;
+				break;
+			}
+		}
+		assertNotNull("Method m1 should not be null", m1);
+		assertNull("Method m3 should be null", m3);
+	}
 	private void createPackageBinary() throws IOException {
 		String path = packageName.replace('.', '/');
 		ClassLoader loader = getClass().getClassLoader();

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

@@ -0,0 +1,6 @@
+package targets.GH1752;
+@Deprecated
+public class GH1752BaseClass {
+    static void m1() {}
+    private static void m3() {}
+}

org.eclipse.jdt.compiler.apt.tests/resources/targets/GH1752/GH1752BaseClass.java

@@ -0,0 +1,6 @@
+package targets.GH1752;
+@Deprecated
+public class GH1752SubClass extends GH1752BaseClass {
+    void m2() {
+    }
+}

org.eclipse.jdt.compiler.apt.tests/resources/targets/GH1752/GH1752SubClass.java

@@ -419,6 +419,18 @@ public void testGH4617() throws Exception {
 		JavaCompiler compiler = BatchTestUtils.getEclipseCompiler();
 		internalTestWithBinary(compiler, JAVA8_ANNOTATION_PROC, "testGH4617", null, "GH4617", "9");
 	}
+	public void testGH1752() throws Exception {
+		if (!canRunJava9())
+			return;
+		JavaCompiler compiler = BatchTestUtils.getEclipseCompiler();
+		internalTestWithBinary(compiler, JAVA8_ANNOTATION_PROC, "testGH1752", null, "GH1752", "9");
+	}
+	public void testGH1752Javac() throws Exception {
+		if (!canRunJava9())
+			return;
+		JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+		internalTestWithBinary(compiler, JAVA8_ANNOTATION_PROC, "testGH1752", null, "GH1752", "9");
+	}
 	private void internalTest(JavaCompiler compiler, String processor, String testMethod) throws IOException {
 		internalTest(compiler, processor, testMethod, null);
 	}

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

@@ -612,7 +612,7 @@ protected void handleInternalException(
 				needToPrint = false;
 			}
 		}
-		if (needToPrint) {
+		if (needToPrint || this.options.verbose) {
 			/* dump a stack trace to the console */
 			internalException.printStackTrace();
 		}

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/Compiler.java

@@ -155,7 +155,7 @@ public boolean visit(TypeParameter typeParameter, BlockScope scope) {
 			// when we get here, it is guaranteed that class type parameters are connected, but method type parameters may not be.
 			MethodBinding methodBinding = (MethodBinding) binding.declaringElement;
 			((SourceTypeBinding) methodBinding.declaringClass).resolveTypesFor(methodBinding);
-			this.resolveAnnotations(scope, annotations, binding);
+			this.resolveAnnotations(scope, annotations, typeParameter.binding /* treat as volatile as Scope.preprocessTypeVariables() called by resolveTypesFor() may modify!!! */);
 		}
 		return false;
 	}
@@ -248,10 +248,10 @@ private void resolveAnnotations(BlockScope scope, Annotation[] annotations, Bind
 		if (length == 0)
 			return;
 
-		boolean old = scope.insideTypeAnnotation;
-		scope.insideTypeAnnotation = true;
+		boolean old = scope.insideTypeDeclarationAnnotations;
+		scope.insideTypeDeclarationAnnotations = true;
 		currentBinding.getAnnotationTagBits();
-		scope.insideTypeAnnotation = old;
+		scope.insideTypeDeclarationAnnotations = old;
 		ElementImpl element = (ElementImpl) this._factory.newElement(currentBinding);
 		AnnotationBinding [] annotationBindings = element.getPackedAnnotationBindings(); // discovery is never in terms of repeating annotation.
 		for (AnnotationBinding binding : annotationBindings) {

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/apt/dispatch/AnnotationDiscoveryVisitor.java

@@ -221,8 +221,10 @@ private void addMembers(ReferenceBinding binding, boolean directMembers, Map<Str
 			}
 		}
 		for (MethodBinding method : binding.methods()) {
-			if (!directMembers && method.isStatic())
-				continue;
+			if (!directMembers &&
+				(method.isPrivate() || (binding.isInterface() && method.isStatic()))) {
+					continue;
+			}
 			if (!method.isSynthetic() && (directMembers || (!method.isPrivate() && !method.isConstructor()))) {
 				String methodName = new String(method.selector);
 				Set<MethodBinding> sameNamedMethods = methods.get(methodName);