From c2de89cb8c3bce2b1a4f3a596522dda9f83cb654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven=20Sch=C3=A4fer?= Date: Fri, 4 Oct 2019 11:36:17 +0200 Subject: [PATCH] Minor: Make String.valueOf bytecode tests more precise --- .../primitiveToStringNotOptimizable.kt | 7 ++++++- .../primitivesAsStringTemplates.kt | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/primitiveToStringNotOptimizable.kt b/compiler/testData/codegen/bytecodeText/stringOperations/primitiveToStringNotOptimizable.kt index a7d9d263dd1..56a5020b5c1 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/primitiveToStringNotOptimizable.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/primitiveToStringNotOptimizable.kt @@ -10,5 +10,10 @@ fun main(a: Boolean, b:Byte, c: Short, d: Int, e: Long, f: Float, g: Double, h: } /*Check that all "valueOf" are String ones and there is no boxing*/ +// 1 INVOKESTATIC java/lang/String.valueOf \(Z\) +// 3 INVOKESTATIC java/lang/String.valueOf \(I\) +// 1 INVOKESTATIC java/lang/String.valueOf \(C\) +// 1 INVOKESTATIC java/lang/String.valueOf \(J\) +// 1 INVOKESTATIC java/lang/String.valueOf \(F\) +// 1 INVOKESTATIC java/lang/String.valueOf \(D\) // 8 valueOf -// 8 INVOKESTATIC java/lang/String.valueOf diff --git a/compiler/testData/codegen/bytecodeText/stringOperations/primitivesAsStringTemplates.kt b/compiler/testData/codegen/bytecodeText/stringOperations/primitivesAsStringTemplates.kt index e637aaad231..ce1020cc05d 100644 --- a/compiler/testData/codegen/bytecodeText/stringOperations/primitivesAsStringTemplates.kt +++ b/compiler/testData/codegen/bytecodeText/stringOperations/primitivesAsStringTemplates.kt @@ -1,9 +1,18 @@ -fun test(b: Byte, s: Short, i: Int, l: Long) { +fun test(a: Boolean, b: Byte, c: Char, s: Short, i: Int, l: Long, f: Float, d: Double) { + "$a" "$b" + "$c" "$s" "$i" "$l" + "$f" + "$d" } -// 4 valueOf -// 4 INVOKESTATIC java/lang/String.valueOf \ No newline at end of file +// 1 INVOKESTATIC java/lang/String.valueOf \(Z\) +// 3 INVOKESTATIC java/lang/String.valueOf \(I\) +// 1 INVOKESTATIC java/lang/String.valueOf \(C\) +// 1 INVOKESTATIC java/lang/String.valueOf \(J\) +// 1 INVOKESTATIC java/lang/String.valueOf \(F\) +// 1 INVOKESTATIC java/lang/String.valueOf \(D\) +// 8 valueOf