Merge pull request #1 from kandersen/fir-assert-fix

[FIR] Fix FIR2IR Types on SetVariable Expressions
kandersen · Feb 14, 2020 · 35cfbbe · 35cfbbe
2 parents 1f844af + ed775e1
commit 35cfbbe
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
@@ -1029,7 +1029,7 @@ class Fir2IrVisitor(
                     }
                     is IrVariableSymbol -> {
                         IrSetVariableImpl(
-                            startOffset, endOffset, symbol.owner.type, symbol, variableAssignment.rValue.toIrExpression(), null
+                            startOffset, endOffset, irBuiltIns.unitType, symbol, variableAssignment.rValue.toIrExpression(), null
                         )
                     }
                     else -> generateErrorCallExpression(startOffset, endOffset, calleeReference)

diff --git a/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt
@@ -1,7 +1,6 @@
 // FIR inserts incorrect smart casts based on the cast in the
 // lambda. However, that cast can fail and the failure can be caught
 // by the inline function.
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/paramAssertionMessage.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/paramAssertionMessage.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: Test.java