azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup Array.plus usages after bootstrap.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-19 14:06:04 +03:00
parent 41aed73ebd
commit 21ee2c1cfd
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt
+1 -1
View File
@@ -172,7 +172,7 @@ public class PropertyReferenceCodegen(
if (!target.isVar()) return 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 -> 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 // 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) value.store(StackValue.local(if (receiverType != null) 2 else 1, OBJECT_TYPE), this)
idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt
+1 -2
View File
@@ -25,8 +25,7 @@ private val KOTLIN_STDLIB_FILTER = "kotlin.*"
public fun addKotlinStdlibDebugFilterIfNeeded() { public fun addKotlinStdlibDebugFilterIfNeeded() {
if (!KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED) { if (!KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED) {
val settings = DebuggerSettings.getInstance()!! val settings = DebuggerSettings.getInstance()!!
// TODO: Remove toList().toTypedArray() after bootstrap val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER))
val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)).toList().toTypedArray()
settings.setSteppingFilters(newFilters) settings.setSteppingFilters(newFilters)