azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for KT-16614: Report inability to inline 1.8 bytecode into 1.6 bytecode as an error, no as an exception

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-03-03 12:44:13 +01:00
parent 5e4459f41d
commit ff9fe85507
15 changed files with 255 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/repl/ReplCompilerJava8Test.kt
+7 -12
View File
@@ -83,13 +83,10 @@ class ReplCompilerJava8Test : TestCase() {
val configuration = makeConfiguration().apply {
put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.JVM_1_6)
}
try {
runTest(configuration)
Assert.fail("Should fail due to bytecode incompatibility check")
}
catch (e: CompilationException) {
Assert.assertTrue(e.message!!.contains("This compiler can only inline Java 1.6 bytecode (version 50)"))
}
val result = runTest(configuration)
Assert.assertTrue(result is ReplCompileResult.Error)
Assert.assertTrue((result as ReplCompileResult.Error).message.contains("error: cannot inline bytecode built with JVM target 1.8 into bytecode that is being built with JVM target 1.6"))
}
@Test
@@ -98,11 +95,9 @@ class ReplCompilerJava8Test : TestCase() {
val configuration = makeConfiguration()
System.setProperty(KOTLIN_REPL_JVM_TARGET_PROPERTY, "1.6")
try {
runTest(configuration)
Assert.fail("Should fail due to bytecode incompatibility check")
}
catch (e: CompilationException) {
Assert.assertTrue(e.message!!.contains("This compiler can only inline Java 1.6 bytecode (version 50)"))
val result = runTest(configuration)
Assert.assertTrue(result is ReplCompileResult.Error)
Assert.assertTrue((result as ReplCompileResult.Error).message.contains("error: cannot inline bytecode built with JVM target 1.8 into bytecode that is being built with JVM target 1.6"))
}
finally {
System.clearProperty(KOTLIN_REPL_JVM_TARGET_PROPERTY)