code_gen_cleanup (#2636)

eclipse-jdt · Jun 28, 2024 · ead1489 · ead1489
1 parent 85fef6b
commit ead1489
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/...t.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java b/...t.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java
@@ -361,6 +361,7 @@ private void checkForPrimitives(BlockScope scope, TypeBinding checkedType, TypeB
 			|| route == PrimitiveConversionRoute.NARROWING_PRIMITVE_CONVERSION
 			|| route == PrimitiveConversionRoute.WIDENING_AND_NARROWING_PRIMITIVE_CONVERSION) {
 //				this.expression.computeConversion(scope, expressionType, checkedType);
+		addSecretExpressionValue(scope, expressionType);
 	} else if (route == PrimitiveConversionRoute.NO_CONVERSION_ROUTE) {
 		scope.problemReporter().notCompatibleTypesError(this, expressionType, checkedType);
 	} else {

diff --git a/...pse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java b/...pse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java
@@ -5507,15 +5507,16 @@ public void invokeExactConversionsSupport(int typeFromTo) {
 		default :
 			return; // should not occur
 	}
+	char[] declaringClass = ConstantPool.JAVA_LANG_RUNTIME_EXACTCONVERSIONSSUPPORT;
 	invoke(
 			Opcodes.OPC_invokestatic,
 			receiverAndArgsSize, // receiverAndArgsSize
 			returnTypeSize, // return type size
-			ConstantPool.ExactConversionsSupport,
+			declaringClass,
 			methodName,
 			signature,
 			typeID,
-			getPopularBinding(ConstantPool.ExactConversionsSupport));
+			TypeBinding.BOOLEAN);
 }
 
 public void invokeThrowableToString() {

diff --git a/...e.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java b/...e.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java
@@ -335,7 +335,7 @@ public class ConstantPool implements ClassFileConstants, TypeIds {
 
 	public static final char[] PROCESS = "process".toCharArray(); //$NON-NLS-1$
 
-	public static final char[] ExactConversionsSupport = "java/lang/runtime/ExactConversionsSupport".toCharArray(); //$NON-NLS-1$
+	public static final char[] JAVA_LANG_RUNTIME_EXACTCONVERSIONSSUPPORT = "java/lang/runtime/ExactConversionsSupport".toCharArray(); //$NON-NLS-1$
 	public static final char[] isIntToFloatExact = "isIntToFloatExact".toCharArray(); //$NON-NLS-1$
 	public static final char[] isIntToFloatExactSignature = "(I)Z".toCharArray(); //$NON-NLS-1$
 	public static final char[] isLongToFloatExact = "isLongToFloatExact".toCharArray(); //$NON-NLS-1$

diff --git a/...e.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java b/...e.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
@@ -254,7 +254,6 @@ public static Test suite() {
 //	 since_22.add(SuperAfterStatementsTest.class);
 	 since_22.add(UnnamedPatternsAndVariablesTest.class);
 	 since_22.add(UseOfUnderscoreJava22Test.class);
-	 since_22.add(SuperAfterStatementsTest.class);
 	 since_22.add(SwitchPatternTest21.class);
 
 	 ArrayList since_23 = new ArrayList();

diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/util/DOMASTUtil.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/util/DOMASTUtil.java
@@ -76,7 +76,7 @@ private static boolean isNodeTypeSupportedinAST(int apiLevel, boolean previewEna
 			case ASTNode.RECORD_PATTERN:
 				return apiLevel >= AST.JLS21;
 			case ASTNode.EitherOr_MultiPattern:
-				return apiLevel >= AST.JLS21 && previewEnabled;
+				return apiLevel >= AST.JLS22;
 		}
 		return false;
 	}

diff --git a/pom.xml b/pom.xml
@@ -91,6 +91,30 @@
           </execution>
           </executions>
         </plugin>
+        <plugin>
+        	<groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-p2-extras-plugin</artifactId>
+            <version>${tycho.version}</version>
+            <executions>
+            	<execution> <!-- Checks versions are properly bumped from one stream to the other -->
+                	<id>compare-attached-artifacts-with-release</id>
+                     <goals>
+                     	<goal>compare-version-with-baselines</goal>
+                     </goals>
+                     <configuration>
+                        <skip>${compare-version-with-baselines.skip}</skip>
+                        <baselines>
+                        	<baseline>${previous-release.baseline}</baseline>
+                        </baselines>
+                        <comparator>zip</comparator>
+                        <ignoredPatterns>
+                        	<pattern>META-INF/ECLIPSE_.RSA</pattern>
+                            <pattern>META-INF/ECLIPSE_.SF</pattern>
+                        </ignoredPatterns>
+                     </configuration>
+               	</execution>
+        	</executions>
+      	</plugin>
       </plugins>
     </pluginManagement>
   </build>