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

Minor. Replace 'filter' with 'any'

Browse Source
This commit is contained in:
Denis Zharkov
2016-02-24 19:59:16 +03:00
parent 226e690a86
commit 2f4b8dab25
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java
+5 -3
View File
@@ -19,6 +19,8 @@ package org.jetbrains.kotlin.codegen.optimization.boxing;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Collections2; import com.google.common.collect.Collections2;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer; import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer;
import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Opcodes;
@@ -109,15 +111,15 @@ public class RedundantBoxingMethodTransformer extends MethodTransformer {
final BoxedBasicValue firstBoxed = (BoxedBasicValue) boxed.iterator().next(); final BoxedBasicValue firstBoxed = (BoxedBasicValue) boxed.iterator().next();
if (!Collections2.filter(usedValues, new Predicate<BasicValue>() { if (CollectionsKt.any(usedValues, new Function1<BasicValue, Boolean>() {
@Override @Override
public boolean apply(BasicValue input) { public Boolean invoke(BasicValue input) {
return input == null || return input == null ||
!(input instanceof BoxedBasicValue) || !(input instanceof BoxedBasicValue) ||
!((BoxedBasicValue) input).isSafeToRemove() || !((BoxedBasicValue) input).isSafeToRemove() ||
!((BoxedBasicValue) input).getPrimitiveType().equals(firstBoxed.getPrimitiveType()); !((BoxedBasicValue) input).getPrimitiveType().equals(firstBoxed.getPrimitiveType());
} }
}).isEmpty()) { })) {
for (BasicValue value : usedValues) { for (BasicValue value : usedValues) {
if (value instanceof BoxedBasicValue && ((BoxedBasicValue) value).isSafeToRemove()) { if (value instanceof BoxedBasicValue && ((BoxedBasicValue) value).isSafeToRemove()) {
values.remove((BoxedBasicValue) value); values.remove((BoxedBasicValue) value);