From 21ee2c1cfd7a2d4e08223d4730984581fa01a8ae Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sun, 19 Jul 2015 14:06:04 +0300 Subject: [PATCH] Cleanup Array.plus usages after bootstrap. --- .../org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt | 2 +- .../kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt index 7191e796cc4..940897fd9a5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt @@ -172,7 +172,7 @@ public class PropertyReferenceCodegen( if (!target.isVar()) return - val setterParameters = (getterParameters + arrayOf(OBJECT_TYPE)).toList().toTypedArray() + val setterParameters = (getterParameters + arrayOf(OBJECT_TYPE)) generateAccessor(method("set", Type.VOID_TYPE, *setterParameters)) { value -> // Hard-coded 1 or 2 is safe here because there's only java/lang/Object in the signature, no double/long parameters value.store(StackValue.local(if (receiverType != null) 2 else 1, OBJECT_TYPE), this) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt index 32b725b7929..69d4b94a0e7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt @@ -25,8 +25,7 @@ private val KOTLIN_STDLIB_FILTER = "kotlin.*" public fun addKotlinStdlibDebugFilterIfNeeded() { if (!KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED) { val settings = DebuggerSettings.getInstance()!! - // TODO: Remove toList().toTypedArray() after bootstrap - val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)).toList().toTypedArray() + val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)) settings.setSteppingFilters(newFilters)