master to BETA_JAVA22 merg (#1763)

* configure default output.. = bin/ * JavaSearchScope: improve encloses() performance #474 * [test] remove outdated latestBREE project * fix some ecj markers Especially after moving files to compiler.batch - which has no resource warnings - the @SuppressWarnings("resource") is not used - leading to a marker * Single async "Synchronizing projects" Job #419 Scheduling multiple times "while the job is running, the job will still only be rescheduled once" (javadoc) so there will be always only a single job running. Using a Set prevents touching projects multiple times. #419 Manually tested by changing Compiler Building options "Circular dependencies", which triggers a new build. * [test] fix AbstractJavaModelTests #1333 avoid asynchronous refresh. Implementation taken from org.eclipse.core.tests.resources.refresh.RefreshProviderTest.joinAutoRefreshJobs() #1333 * TestVerifier: never wait 100ms improve test time, accurate timeout * [performance] ClassFileReader: use already open Zip File instead of creating new ZipFile instance. also: * use Files.readAllBytes * removed unused code * faster toUri avoiding isDirectory() check for the JARs which are known to be no directory improves performance of read() on windows by factor 2 tested with java reference search to java.lang.Object * Stop skipping compare-with-baseline for jdt.annotation v2 One less thing that has to be manually tracked and done. * Version bump for jdt.annotation Pointed by https://download.eclipse.org/eclipse/downloads/drops4/I20231130-0020/buildlogs/reporeports/reports/versionChecks.html * Fix github urls in NOTICE file * Use try-with-resource and enable warning if not org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning StringWriter does not need flush() or close() and can not throw IOException. Tests excluded. To get rid of boiler plate code. * version bumps * [21] JEP 430 String Templates (#1513) Grammar, compiler AST, resolution and code generation changes * Javadoc: fix unclosed <code> * break from loop within labeled block causes loss of nullness info (#1660) fixes #1659 * Fixes incorrect Javadoc after StringBuffer to StringBuilder change * NPE in ASTRewriteFlattener as return value of GuardedPattern.getPattern() is null (#1647) NPE in ASTRewriteFlattener as return value of GuardedPattern.getPattern() is null * Adding pomless build to JDT core This enables pomless builds for JDT coreand removes the simple pom files. Future commits can reduce the usage of pom files further. This might require enhancements in pomless builds to specify the test classes and suites eclipse-tycho/tycho#3105 * Using Simplify lambda expression and method reference syntax cleanup on core Using the JDT UI "Simplify lambda expression and method reference syntax" clean-up on jdt.core. * Internal compiler error: ArrayIndexOutOfBoundsException in latest i build (#1664) fixes #1661 * Using Simplify lambda expression and method reference syntax cleanup on all plug-ins except core Using the JDT UI "Simplify lambda expression and method reference syntax" clean-up on all plug-ins except jdt.core. * Using short-circuit in IncrementalImageBuilder * Re-normalize line-endings in git of all files to Linux style ("\n") Some files were checked-in into git having windows style line endings (\r\n). This is in general not wanted because it can cause modified files without any difference in git-staging on Windows if auto-crlf is enabled. To re-normalize line endings of all files use the following command (including dot): git add --renormalize . * Bump bundle dependencies to trigger a rebuild / fix SDK build error The change in bytecode of FullSourceWorkspaceBuildTests is due the constant value change of o.e.jdt.internal.compiler.parser.TerminalTokens.TokenNameEOF coming from #1513. Fixes eclipse-platform/eclipse.platform.releng.aggregator#1617 * False positive "Dead code" compiler error reported on org.eclipse.pde.internal.core.util.PDEJavaHelper.getExternalPackageFragment(String, String) (#1671) fixes #1667 * Use diamond operator in jdt.core repo Using the JDT UI clean-up, this removes the redundant type information. Also activating org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning The rest of the changes in the prefs file were done by the tooling, not by selecting anther value. * Improve constructor completions inside method invocations Fix #1587 (#1588) * Try-with-resource clean-up in JDT core Using the JDT UI try-with-resource clean-up on core. Also manually inlining the declaration of multiple places into the try() clause. * Make inner classes static where possible in JDT core Running the JDT performnace clean-up "Make inner classes static where possible" in JDT core * Use Use lazy logical operator (&& and ||) Running the performance clean-up "Use lazy logical operator (&& and ||)" on JDT core * Using Integer.toString directly in Disassembler It is also a JDT UI performance clean-up but this clean-up found only one occurrence. * use Path.of() to avoid 'Potential resource leak' warnings * @NonNullByDefault does not work for type arguments of a local type (#1694) fixes #1693 * ClassCastException during code completion on Annotation (#1696) fixes #1440 Also fixes noise from #1662 * CompilationUnitResolver: Name the CU that causes Exception (#1690) for example during Cleanup eclipse-jdt/eclipse.jdt.ui#950 Co-authored-by: Jörg Kubitz <jkubitz-eclipse@gmx.de> * Code selection support for String template expressions (#1699) Fixes #1685 * Report error if string template is used without preview option enabled (#1697) Improves the fix for #544 * ECJ crashes when an embedded expression contains broken code (#1702) Set haltOnSyntaxError when parsing for embedded expressions. Also using the correct delimiters for text blocks in printExpression() methods. * Selection model tests for string templates (#1704) * tests: enable discouragedReference=warning, declare x-friends to get rid of warnings during build (does not respect the jdt preferences) * Javadoc format fixes Contributes to eclipse-platform/eclipse.platform.releng.aggregator#1531 * Performance: Add public API for Batch Reads in UI - closes #1614 During Batches: * cache Zip Files * enable JavaModelManager.temporaryCache Also: * uses Batch Reads during some core actions that benefit from it. * adds trace logging when caching is missing. #1614 * Javadoc format fixes (part 2) Contributes to eclipse-platform/eclipse.platform.releng.aggregator#1531. It's a pity that this takes multiple cycles but fixing one thing from the log uncovers the next. * ECJ 3.36.0 regression: The type 'E extends java.lang.Exception' is not a valid substitute for the type parameter 'E extends java.lang.@nonnull Exception' (#1708) fixes #1691 + also slightly updates NullAnnotationTests18 as NullAnnotationTests21 * Implement support for code completion inside embedded expression of (only) string templates (not text block templates) (#1712) * Implement support for code completion inside embedded expression of (only) string templates (not text block templates) * Fixes #1711 * Fixes #1641 (#1713) * Add new testcase #1701 (#1705) * Content assist does not propose overrides in records (#1718) * Fixes #1095 * JavaModelManager: lazy initialize TouchJob #1720 #1720 * Run the JavaCoreStandaloneTest in the build #1720 * Bogus error about return expression involving pattern matching (#1731) Fixes #1726 * Compiler fails to recognize an exhaustive switch (#1733) * Fixes #1725 * [21] Processed string templates falsely contain backslash characters (#1730) #1719 * 1641_enum_further_fixes (#1739) * Fix one too many pops arising from string concat invoke dynamic (#1740) * Fix one too many pops arising from string concat invoke dynamic * Fixes #1394 * Wrong placement of exception range closure results in AIOOB (#1744) Fixes #1686 * Improper warning - Potential null pointer access (#1469) Fixes #1461 Sets the flow info reach mode to FlowInfo.UNREACHABLE_BY_NULLANALYSIS after 'Object o = null;if (Objects.isNull(o)) return;', 'Object o = "";if (Objects.nonNull(o)) return; Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com> * Touch bundles affected by the changed ecj version See #1394 See eclipse-platform/eclipse.platform.releng.aggregator#1659 * Upload eventfile and unit test results * 2023-06->2023-09 Seems to have broke dependency graph management in our project (#1698) * Add test for reproducing #1654 * Fix to make that test pass --------- Co-authored-by: Stephan Herrmann <stephan.herrmann@berlin.de> * [memory] SoftReference for ResourceCompilationUnit.contents #1743 Ability to reduce memory during searches that find many files #1743 * deduplicate "eclipse" #1743 CharDeduplication was not designed to deduplicate tokens with length 7+ which could lead to high memory consumption. With this change tokens of all sizes can be deduplicated. #1743 A benchmark implemented in CharDeduplicationTest.main(String[]) shows the new deduplication is performed at similar speed (.21s instead of .16s) but deduplicates much more tokens (99% instead of 36%). * 1703.constant definitions (#1756) * Fixes [21] AIOOB at switchStatement TNode.addPattern (#1757) org.eclipse.jdt.internal.compiler.ast.SwitchStatement $TNode.addPattern --------- Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com> Co-authored-by: Jörg Kubitz <jkubitz-eclipse@gmx.de> Co-authored-by: Eric Milles <eric.milles@thomsonreuters.com> Co-authored-by: Александър Куртаков <akurtakov@gmail.com> Co-authored-by: Jay Arthanareeswaran <jarthana@in.ibm.com> Co-authored-by: Stephan Herrmann <stephan.herrmann@berlin.de> Co-authored-by: Lars Vogel <Lars.Vogel@vogella.com> Co-authored-by: Suby S Surendran <suby.surendran@ibm.com> Co-authored-by: Hannes Wellmann <wellmann.hannes1@gmx.net> Co-authored-by: Andrey Loskutov <loskutov@gmx.de> Co-authored-by: Gayan Perera <gayanper@gmail.com> Co-authored-by: Jörg Kubitz <51790620+jukzi@users.noreply.github.com> Co-authored-by: Srikanth Sankaran <131454720+srikanth-sankaran@users.noreply.github.com> Co-authored-by: Ed Merks <ed.merks@gmail.com> Co-authored-by: Snjeza <snjezana.peco@redhat.com> Co-authored-by: Christoph Läubrich <laeubi@laeubi-soft.de> Co-authored-by: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
eclipse-jdt · Dec 19, 2023 · 16a72dd · 16a72dd
1 parent 31fe64e
commit 16a72dd
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 0 deletions.
diff --git a/...se.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java b/...se.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java
@@ -122,6 +122,7 @@ public class SwitchStatement extends Expression {
 
 	class Node {
 		TypeBinding type;
+		boolean hasError = false;
 		public void traverse(NodeVisitor visitor) {
 			visitor.visit(this);
 			visitor.endVisit(this);
@@ -179,6 +180,10 @@ class TNode extends Node {
 		}
 
 		public void addPattern(RecordPattern rp, int i) {
+			if (rp.patterns.length <= i) {
+				this.hasError = true;
+				return;
+			}
 			TypeBinding childType = rp.patterns[i].resolvedType;
 			PatternNode child = null;
 			for (PatternNode c : this.children) {
@@ -336,6 +341,9 @@ class CoverageCheckerVisitor extends NodeVisitor {
 		public boolean covers = true;
 		@Override
 		public boolean visit(TNode node) {
+			if (node.hasError)
+				return false;
+
 			List<TypeBinding> availableTypes = new ArrayList<>();
 			if (node.children != null) {
 				for (Node child : node.children) {

diff --git a/...ore.compiler.batch/src/org/eclipse/jdt/internal/compiler/classfmt/ClassFileConstants.java b/...ore.compiler.batch/src/org/eclipse/jdt/internal/compiler/classfmt/ClassFileConstants.java
@@ -138,6 +138,7 @@ public interface ClassFileConstants {
 	int MAJOR_VERSION_19 = 63;
 	int MAJOR_VERSION_20 = 64;
 	int MAJOR_VERSION_21 = 65;
+	int MAJOR_VERSION_22 = 66;
 
 	int MAJOR_VERSION_0 = 44;
 	int MAJOR_LATEST_VERSION = MAJOR_VERSION_21;
@@ -172,6 +173,7 @@ public interface ClassFileConstants {
 	long JDK19 = ((long)ClassFileConstants.MAJOR_VERSION_19 << 16) + ClassFileConstants.MINOR_VERSION_0;
 	long JDK20 = ((long)ClassFileConstants.MAJOR_VERSION_20 << 16) + ClassFileConstants.MINOR_VERSION_0;
 	long JDK21 = ((long)ClassFileConstants.MAJOR_VERSION_21 << 16) + ClassFileConstants.MINOR_VERSION_0;
+	long JDK22 = ((long)ClassFileConstants.MAJOR_VERSION_22 << 16) + ClassFileConstants.MINOR_VERSION_0;
 
 	public static long getLatestJDKLevel() {
 		return ((long)ClassFileConstants.MAJOR_LATEST_VERSION << 16) + ClassFileConstants.MINOR_VERSION_0;

diff --git a/....tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/RecordPatternTest.java b/....tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/RecordPatternTest.java
@@ -3731,4 +3731,76 @@ public static void main(String argv[]) {
 					"""
 				});
 	}
+	public void testIssue1732_01() {
+		runNegativeTest(
+				new String[] {
+				"X.java",
+				"""
+				record R(int x, int y) {}
+
+				public class X {
+
+					public int foo(R r) {
+						return switch (r) {
+							case R() -> 0;
+						};
+					}
+				}
+				"""
+				},
+				"----------\n" +
+				"1. ERROR in X.java (at line 7)\n" +
+				"	case R() -> 0;\n" +
+				"	     ^^^\n" +
+				"Record pattern should match the signature of the record declaration\n" +
+				"----------\n");
+	}
+	public void testIssue1732_02() {
+		runNegativeTest(
+				new String[] {
+				"X.java",
+				"""
+				record R(int x, int y) {}
+
+				public class X {
+
+					public int foo(R r) {
+						return switch (r) {
+							case R(int x) -> 0;
+						};
+					}
+				}
+				"""
+				},
+				"----------\n" +
+				"1. ERROR in X.java (at line 7)\n" +
+				"	case R(int x) -> 0;\n" +
+				"	     ^^^^^^^^\n" +
+				"Record pattern should match the signature of the record declaration\n" +
+				"----------\n");
+	}
+	public void testIssue1732_03() {
+		runNegativeTest(
+				new String[] {
+				"X.java",
+				"""
+				record R(int x, int y) {}
+
+				public class X {
+
+					public int foo(R r) {
+						return switch (r) {
+							case R(int x, int y, int z) -> 0;
+						};
+					}
+				}
+				"""
+				},
+				"----------\n" +
+				"1. ERROR in X.java (at line 7)\n" +
+				"	case R(int x, int y, int z) -> 0;\n" +
+				"	     ^^^^^^^^^^^^^^^^^^^^^^\n" +
+				"Record pattern should match the signature of the record declaration\n" +
+				"----------\n");
+	}
 }
diff --git a/...pse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java b/...pse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java
@@ -53,6 +53,7 @@ public class AbstractCompilerTest extends TestCase {
 	public static final int F_19  = 0x10000;
 	public static final int F_20  = 0x20000;
 	public static final int F_21  = 0x40000;
+	public static final int F_22  = 0x80000;
 
 	public static final boolean RUN_JAVAC = CompilerOptions.ENABLED.equals(System.getProperty("run.javac"));
 	public static final boolean PERFORMANCE_ASSERTS = !CompilerOptions.DISABLED.equals(System.getProperty("jdt.performance.asserts"));