Merge pull request #3206 from mehmet-karaman/removeObsolete_CompilerOption_assignments

Remove obsolete compiler option assignments

Author: cdietrich

org.eclipse.xtext.java/src/org/eclipse/xtext/java/resource/JavaDerivedStateComputer.java

@@ -286,9 +286,21 @@ protected CompilerOptions getCompilerOptions(JavaConfig javaConfig) {
 		compilerOptions.sourceLevel = sourceLevel;
 		compilerOptions.produceMethodParameters = true;
 		compilerOptions.produceReferenceInfo = true;
-		compilerOptions.originalSourceLevel = targetLevel;
 		compilerOptions.complianceLevel = sourceLevel;
-		compilerOptions.originalComplianceLevel = targetLevel;
+		if (ORIGINAL_SOURCE_LEVEL != null) {
+			try {
+				ORIGINAL_SOURCE_LEVEL.invoke(compilerOptions, targetLevel);
+			} catch (Throwable e) {
+				// ignore
+			}
+		}
+		if (ORIGINAL_COMPLIANCE_LEVEL != null) {
+			try {
+				ORIGINAL_COMPLIANCE_LEVEL.invoke(compilerOptions, targetLevel);
+			} catch (Throwable e) {
+				// ignore
+			}
+		}
 		if (INLINE_JSR_BYTECODE != null) {
 			try {
 				INLINE_JSR_BYTECODE.invoke(compilerOptions, true);
@@ -308,6 +320,24 @@ private static MethodHandle findInlineJsrBytecode() {
 		}
 	}
 
+	private final static MethodHandle ORIGINAL_SOURCE_LEVEL = findOriginalSourceLevel();
+	private static MethodHandle findOriginalSourceLevel() {
+		try {
+			return MethodHandles.lookup().findSetter(CompilerOptions.class, "originalSourceLevel", long.class);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	private final static MethodHandle ORIGINAL_COMPLIANCE_LEVEL = findOriginalComplianceLevel();
+	private static MethodHandle findOriginalComplianceLevel() {
+		try {
+			return MethodHandles.lookup().findSetter(CompilerOptions.class, "originalComplianceLevel", long.class);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+	
 	protected long toJdtVersion(JavaVersion version) {
 		return version.toJdtClassFileConstant();
 	}

org.eclipse.xtext.xbase.testing/src/org/eclipse/xtext/xbase/testing/InMemoryJavaCompiler.java

@@ -225,6 +225,24 @@ private static MethodHandle findInlineJsrBytecode() {
 		}
 	}
 
+	private final static MethodHandle ORIGINAL_SOURCE_LEVEL = findOriginalSourceLevel();
+	private static MethodHandle findOriginalSourceLevel() {
+		try {
+			return MethodHandles.lookup().findSetter(CompilerOptions.class, "originalSourceLevel", long.class);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	private final static MethodHandle ORIGINAL_COMPLIANCE_LEVEL = findOriginalComplianceLevel();
+	private static MethodHandle findOriginalComplianceLevel() {
+		try {
+			return MethodHandles.lookup().findSetter(CompilerOptions.class, "originalComplianceLevel", long.class);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
 	public InMemoryJavaCompiler(ClassLoader parent, CompilerOptions compilerOptions) {
 		this.nameEnv = new ClassLoaderBasedNameEnvironment(parent);
 		this.parentClassLoader = parent;
@@ -257,7 +275,13 @@ private long toClassFmt(JavaVersion version) {
 	 */
 	private void setSourceLevel(long jdkVersion) {
 		compilerOptions.sourceLevel = jdkVersion;
-		compilerOptions.originalSourceLevel = jdkVersion;
+		if (ORIGINAL_SOURCE_LEVEL != null) {
+			try {
+				ORIGINAL_SOURCE_LEVEL.invoke(compilerOptions, jdkVersion);
+			} catch (Throwable e) {
+				// ignore
+			}
+		}	
 	}
 
 	/**
@@ -266,7 +290,13 @@ private void setSourceLevel(long jdkVersion) {
 	 */
 	private void setComplianceLevel(long jdkVersion) {
 		compilerOptions.complianceLevel = jdkVersion;
-		compilerOptions.originalComplianceLevel = jdkVersion;
+		if (ORIGINAL_COMPLIANCE_LEVEL != null) {
+			try {
+				ORIGINAL_COMPLIANCE_LEVEL.invoke(compilerOptions, jdkVersion);
+			} catch (Throwable e) {
+				// ignore
+			}
+		}
 	}
 
 	public Result compile(JavaSource... sources) {