Remove CompilerOptions.OPTION_InlineJsr & inlineJsrBytecode

Fixes eclipse-jdt#2759
zelenyhleb · Sep 5, 2024 · 7b15979 · 7b15979
1 parent 788b82c
commit 7b15979
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/...e.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java b/...e.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
@@ -125,8 +125,6 @@ public class CompilerOptions {
 	public static final String OPTION_TaskTags = "org.eclipse.jdt.core.compiler.taskTags"; //$NON-NLS-1$
 	public static final String OPTION_TaskPriorities = "org.eclipse.jdt.core.compiler.taskPriorities"; //$NON-NLS-1$
 	public static final String OPTION_TaskCaseSensitive = "org.eclipse.jdt.core.compiler.taskCaseSensitive"; //$NON-NLS-1$
-	@Deprecated(forRemoval = true)
-	public static final String OPTION_InlineJsr = "org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode"; //$NON-NLS-1$
 	public static final String OPTION_ShareCommonFinallyBlocks = "org.eclipse.jdt.core.compiler.codegen.shareCommonFinallyBlocks"; //$NON-NLS-1$
 	public static final String OPTION_ReportNullReference = "org.eclipse.jdt.core.compiler.problem.nullReference"; //$NON-NLS-1$
 	public static final String OPTION_ReportPotentialNullReference = "org.eclipse.jdt.core.compiler.problem.potentialNullReference"; //$NON-NLS-1$
@@ -505,9 +503,6 @@ public class CompilerOptions {
 	public int reportMissingJavadocCommentsVisibility;
 	/** Specify if need to flag missing javadoc comment for overriding method */
 	public boolean reportMissingJavadocCommentsOverriding;
-	@Deprecated
-	/** Indicate whether the JSR bytecode should be inlined to avoid its presence in classfile */
-	public boolean inlineJsrBytecode;
 	/** Indicate whether common escaping finally blocks should be shared */
 	public boolean shareCommonFinallyBlocks;
 	/** Indicate if @SuppressWarning annotations are activated */
@@ -1641,8 +1636,7 @@ protected void resetDefaults() {
 		this.reportMissingJavadocCommentsVisibility = ClassFileConstants.AccPublic;
 		this.reportMissingJavadocCommentsOverriding = false;
 
-		// JSR bytecode inlining and sharing
-		this.inlineJsrBytecode = true;
+		// JSR bytecode and sharing
 		this.shareCommonFinallyBlocks = false;
 
 		// javadoc comment support
@@ -1791,7 +1785,6 @@ public void set(Map<String, String> optionsMap) {
 				}
 				this.targetJDK = level;
 			}
-			this.inlineJsrBytecode = true; // forced from 1.5 mode on
 		}
 		if ((optionValue = optionsMap.get(OPTION_Encoding)) != null) {
 			this.defaultEncoding = null;

diff --git a/...e.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TryStatementTest.java b/...e.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TryStatementTest.java
@@ -25,7 +25,6 @@
 import org.eclipse.jdt.core.tests.util.Util;
 import org.eclipse.jdt.core.util.ClassFileBytesDisassembler;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-import org.junit.Assert;
 
 import junit.framework.Test;
 
@@ -49,13 +48,6 @@ protected Map getCompilerOptions() {
 	compilerOptions.put(CompilerOptions.OPTION_ShareCommonFinallyBlocks, CompilerOptions.ENABLED);
 	return compilerOptions;
 }
-@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		@SuppressWarnings("deprecation")
-		boolean inlineJsrBytecode = new CompilerOptions(getCompilerOptions()).inlineJsrBytecode;
-		Assert.assertTrue("inlineJsrBytecode should always be true!", inlineJsrBytecode);
-	}
 
 public void test001() {
 	this.runConformTest(new String[] {