From 55498b7f6328ecf34f9e35ef67e9a062b70b1e5e Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 11 May 2017 16:13:36 +0300 Subject: [PATCH] Minor: move around some optimization-related classes --- .../CapturedVarsOptimizationMethodTransformer.kt | 6 +++++- .../codegen/optimization/OptimizationMethodVisitor.kt | 1 - .../{captured => common}/ReferenceTrackingInterpreter.kt | 3 +-- .../{captured => common}/TrackedReferenceValue.kt | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-) rename compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/{captured => }/CapturedVarsOptimizationMethodTransformer.kt (97%) rename compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/{captured => common}/ReferenceTrackingInterpreter.kt (97%) rename compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/{captured => common}/TrackedReferenceValue.kt (94%) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/CapturedVarsOptimizationMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/CapturedVarsOptimizationMethodTransformer.kt similarity index 97% rename from compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/CapturedVarsOptimizationMethodTransformer.kt rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/CapturedVarsOptimizationMethodTransformer.kt index 9988ea626d5..31318bc4e2b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/CapturedVarsOptimizationMethodTransformer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/CapturedVarsOptimizationMethodTransformer.kt @@ -14,9 +14,13 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.optimization.captured +package org.jetbrains.kotlin.codegen.optimization import org.jetbrains.kotlin.builtins.PrimitiveType +import org.jetbrains.kotlin.codegen.optimization.common.ProperTrackedReferenceValue +import org.jetbrains.kotlin.codegen.optimization.common.ReferenceTrackingInterpreter +import org.jetbrains.kotlin.codegen.optimization.common.ReferenceValueDescriptor +import org.jetbrains.kotlin.codegen.optimization.common.TrackedReferenceValue import org.jetbrains.kotlin.codegen.optimization.common.InsnSequence import org.jetbrains.kotlin.codegen.optimization.common.removeEmptyCatchBlocks import org.jetbrains.kotlin.codegen.optimization.common.removeUnusedLocalVariables diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.kt index 80c726b7813..5d52d292cf3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.kt @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.codegen.optimization import org.jetbrains.kotlin.codegen.TransformationMethodVisitor import org.jetbrains.kotlin.codegen.optimization.boxing.RedundantBoxingMethodTransformer import org.jetbrains.kotlin.codegen.optimization.boxing.RedundantCoercionToUnitTransformer -import org.jetbrains.kotlin.codegen.optimization.captured.CapturedVarsOptimizationMethodTransformer import org.jetbrains.kotlin.codegen.optimization.common.prepareForEmitting import org.jetbrains.kotlin.codegen.optimization.nullCheck.RedundantNullCheckMethodTransformer import org.jetbrains.kotlin.codegen.optimization.transformer.CompositeMethodTransformer diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/ReferenceTrackingInterpreter.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/ReferenceTrackingInterpreter.kt similarity index 97% rename from compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/ReferenceTrackingInterpreter.kt rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/ReferenceTrackingInterpreter.kt index a0e0a1807c1..27543bf2d5d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/ReferenceTrackingInterpreter.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/ReferenceTrackingInterpreter.kt @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.optimization.captured +package org.jetbrains.kotlin.codegen.optimization.common -import org.jetbrains.kotlin.codegen.optimization.common.OptimizationBasicInterpreter import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/TrackedReferenceValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/TrackedReferenceValue.kt similarity index 94% rename from compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/TrackedReferenceValue.kt rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/TrackedReferenceValue.kt index 0ff75117036..1b5ed39ff1a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/captured/TrackedReferenceValue.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/TrackedReferenceValue.kt @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.optimization.captured +package org.jetbrains.kotlin.codegen.optimization.common -import org.jetbrains.kotlin.codegen.optimization.common.StrictBasicValue import org.jetbrains.org.objectweb.asm.Type interface ReferenceValueDescriptor {