From 46e0fdc06754695bde23ef1f7c40e03ba8945c3f Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 4 Mar 2015 17:41:27 +0100 Subject: [PATCH] regression test for KT-3442 --- .../testData/codegen/boxWithStdlib/regressions/kt3442.kt | 6 ++++++ .../generated/BlackBoxWithStdlibCodegenTestGenerated.java | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 compiler/testData/codegen/boxWithStdlib/regressions/kt3442.kt diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt3442.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt3442.kt new file mode 100644 index 00000000000..55f3226b19f --- /dev/null +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt3442.kt @@ -0,0 +1,6 @@ +fun box(): String { + val m = hashMapOf() + m.put("b", null) + val oldValue = m.getOrPut("b", { "Foo" }) + return if (oldValue == null) "OK" else "fail: $oldValue" +} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 0a234871a95..5d95f8c08c5 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -2892,6 +2892,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode doTestWithStdlib(fileName); } + @TestMetadata("kt3442.kt") + public void testKt3442() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3442.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("kt4262.kt") public void testKt4262() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt");