Temporary disable new intrinsics usage in ieee754 arithmetic

Mikhael Bogdanov · Mikhael Bogdanov · commit aa3f64bc93fd · 2017-02-02T16:31:49.000+01:00
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -3652,7 +3652,11 @@ private StackValue genEqualsForExpressionsPreferIEEE754Arithmetic(
         if (left754Type != null && right754Type != null && left754Type.type.equals(right754Type.type)) {
             //check nullability cause there is some optimizations in codegen for non-nullable case
             if (left754Type.isNullable || right754Type.isNullable) {
-                if (state.getLanguageVersionSettings().getLanguageVersion() != LanguageVersion.KOTLIN_1_0 &&
+                // Using Intrinsics.areEqual is preferable here, but will result in NoSuchMethodError at runtime if the runtime
+                // of version 1.0 is used and the user forgot to explicitly specify language version / API version.
+                // This should be enabled when/if we decide to drop support for "-language-version 1.0" / "-api-version 1.0"
+                //noinspection ConstantConditions, PointlessBooleanExpression
+                if (false && state.getLanguageVersionSettings().getLanguageVersion() != LanguageVersion.KOTLIN_1_0 &&
                     state.getLanguageVersionSettings().getApiVersion().compareTo(apiVersion1_1) >= 0) {
                     return StackValue.operation(Type.BOOLEAN_TYPE, new Function1<InstructionAdapter, Unit>() {
                         @Override
diff --git a/compiler/testData/codegen/bytecodeText/ieee754/nullableDoubleEquals.kt b/compiler/testData/codegen/bytecodeText/ieee754/nullableDoubleEquals.kt
@@ -24,7 +24,8 @@ fun box(): String {
     return "OK"
 }
 
-// 1 areEqual \(Ljava/lang/Double;Ljava/lang/Double;\)Z
-// 1 areEqual \(DLjava/lang/Double;\)Z
-// 1 areEqual \(Ljava/lang/Double;D\)Z
-// 3 areEqual
+/*
+ 1 areEqual \(Ljava/lang/Double;Ljava/lang/Double;\)Z
+ 1 areEqual \(DLjava/lang/Double;\)Z
+ 1 areEqual \(Ljava/lang/Double;D\)Z
+ 3 areEqual*/
diff --git a/compiler/testData/codegen/bytecodeText/ieee754/nullableDoubleNotEquals.kt b/compiler/testData/codegen/bytecodeText/ieee754/nullableDoubleNotEquals.kt
@@ -24,7 +24,8 @@ fun box(): String {
     return "OK"
 }
 
-// 1 areEqual \(Ljava/lang/Double;Ljava/lang/Double;\)Z
-// 1 areEqual \(DLjava/lang/Double;\)Z
-// 1 areEqual \(Ljava/lang/Double;D\)Z
-// 3 areEqual
+/*
+ 1 areEqual \(Ljava/lang/Double;Ljava/lang/Double;\)Z
+ 1 areEqual \(DLjava/lang/Double;\)Z
+ 1 areEqual \(Ljava/lang/Double;D\)Z
+ 3 areEqual*/
diff --git a/compiler/testData/codegen/bytecodeText/ieee754/nullableFloatEquals.kt b/compiler/testData/codegen/bytecodeText/ieee754/nullableFloatEquals.kt
@@ -24,7 +24,8 @@ fun box(): String {
     return "OK"
 }
 
-// 1 areEqual \(Ljava/lang/Float;Ljava/lang/Float;\)Z
-// 1 areEqual \(FLjava/lang/Float;\)Z
-// 1 areEqual \(Ljava/lang/Float;F\)Z
-// 3 areEqual
+/*
+ 1 areEqual \(Ljava/lang/Float;Ljava/lang/Float;\)Z
+ 1 areEqual \(FLjava/lang/Float;\)Z
+ 1 areEqual \(Ljava/lang/Float;F\)Z
+ 3 areEqual*/
diff --git a/compiler/testData/codegen/bytecodeText/ieee754/nullableFloatNotEquals.kt b/compiler/testData/codegen/bytecodeText/ieee754/nullableFloatNotEquals.kt
@@ -24,7 +24,8 @@ fun box(): String {
     return "OK"
 }
 
-// 1 areEqual \(Ljava/lang/Float;Ljava/lang/Float;\)Z
-// 1 areEqual \(FLjava/lang/Float;\)Z
-// 1 areEqual \(Ljava/lang/Float;F\)Z
-// 3 areEqual
+/*
+ 1 areEqual \(Ljava/lang/Float;Ljava/lang/Float;\)Z
+ 1 areEqual \(FLjava/lang/Float;\)Z
+ 1 areEqual \(Ljava/lang/Float;F\)Z
+ 3 areEqual*/
diff --git a/compiler/testData/codegen/bytecodeText/ieee754/smartCastsForDouble.kt b/compiler/testData/codegen/bytecodeText/ieee754/smartCastsForDouble.kt
@@ -17,7 +17,8 @@ fun box(): String {
     return "OK"
 }
 
-// 1 areEqual \(Ljava/lang/Double;Ljava/lang/Double;\)Z
-// 1 areEqual \(DLjava/lang/Double;\)Z
-// 1 areEqual \(Ljava/lang/Double;D\)Z
-// 3 areEqual
+/*
+ 1 areEqual \(Ljava/lang/Double;Ljava/lang/Double;\)Z
+ 1 areEqual \(DLjava/lang/Double;\)Z
+ 1 areEqual \(Ljava/lang/Double;D\)Z
+ 3 areEqual*/
diff --git a/compiler/testData/codegen/bytecodeText/ieee754/smartCastsForFloat.kt b/compiler/testData/codegen/bytecodeText/ieee754/smartCastsForFloat.kt
@@ -17,7 +17,8 @@ fun box(): String {
     return "OK"
 }
 
-// 1 areEqual \(Ljava/lang/Float;Ljava/lang/Float;\)Z
-// 1 areEqual \(FLjava/lang/Float;\)Z
-// 1 areEqual \(Ljava/lang/Float;F\)Z
-// 3 areEqual
+/*
+ 1 areEqual \(Ljava/lang/Float;Ljava/lang/Float;\)Z
+ 1 areEqual \(FLjava/lang/Float;\)Z
+ 1 areEqual \(Ljava/lang/Float;F\)Z
+ 3 areEqual*/
diff --git a/compiler/testData/codegen/bytecodeText/ieee754/when.kt b/compiler/testData/codegen/bytecodeText/ieee754/when.kt
@@ -27,5 +27,6 @@ fun box(): String {
     return "OK"
 }
 
-// 2 areEqual \(DLjava/lang/Double;\)Z
-// 2 areEqual
+/*
+ 2 areEqual \(DLjava/lang/Double;\)Z
+ 2 areEqual*/
diff --git a/compiler/testData/codegen/bytecodeText/ieee754/whenNullableSmartCast.kt b/compiler/testData/codegen/bytecodeText/ieee754/whenNullableSmartCast.kt
@@ -26,6 +26,7 @@ fun box(): String {
     return "OK"
 }
 
-// 2 areEqual \(Ljava/lang/Double;Ljava/lang/Double;\)Z
-// 2 areEqual \(Ljava/lang/Double;D\)Z
-// 4 areEqual
+/*
+ 2 areEqual \(Ljava/lang/Double;Ljava/lang/Double;\)Z
+ 2 areEqual \(Ljava/lang/Double;D\)Z
+ 4 areEqual*/

Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,6 @@ fun box(): String {`
`27`	`27`	`return "OK"`
`28`	`28`	`}`
`29`	`29`
`30`		`-// 2 areEqual \(DLjava/lang/Double;\)Z`
`31`		`-// 2 areEqual`
	`30`	`+/*`
	`31`	`+ 2 areEqual \(DLjava/lang/Double;\)Z`
	`32`	`+ 2 areEqual*/`