From f000d208a689e88a8314633c861de1f000c6f45a Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 19 Mar 2014 15:50:38 +0400 Subject: [PATCH] Removed generateLocalVarTable method --- .../src/org/jetbrains/jet/codegen/FunctionCodegen.java | 6 ++---- .../jetbrains/jet/codegen/FunctionGenerationStrategy.java | 4 ---- .../org/jetbrains/jet/codegen/inline/InlineCodegen.java | 7 +------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 5e99154bfe6..35ce4dc400e 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -293,10 +293,8 @@ public class FunctionCodegen extends ParentCodegenAwareImpl { Label methodEnd = new Label(); mv.visitLabel(methodEnd); - if (strategy.generateLocalVarTable()) { - Type thisType = getThisTypeForFunction(functionDescriptor, context, typeMapper); - generateLocalVariableTable(mv, signature, functionDescriptor, thisType, methodBegin, methodEnd, context.getContextKind()); - } + Type thisType = getThisTypeForFunction(functionDescriptor, context, typeMapper); + generateLocalVariableTable(mv, signature, functionDescriptor, thisType, methodBegin, methodEnd, context.getContextKind()); } private static void generateLocalVariableTable( diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java index 0f70e6473ca..5e1a70079d9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java @@ -50,10 +50,6 @@ public abstract class FunctionGenerationStrategy { return frameMap; } - public boolean generateLocalVarTable() { - return true; - } - public static class FunctionDefault extends CodegenBased { private final JetDeclarationWithBody declaration; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java index fc56d4e3bf2..8d65f3f5071 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java @@ -240,12 +240,7 @@ public class InlineCodegen implements ParentCodegenAware, CallGenerator { MethodVisitor adapter = InlineCodegenUtil.wrapWithMaxLocalCalc(methodNode); - FunctionCodegen.generateMethodBody(adapter, descriptor, context, jvmMethodSignature, new FunctionGenerationStrategy.FunctionDefault(state, descriptor, declaration) { - @Override - public boolean generateLocalVarTable() { - return false; - } - }, codegen.getParentCodegen()); + FunctionCodegen.generateMethodBody(adapter, descriptor, context, jvmMethodSignature, new FunctionGenerationStrategy.FunctionDefault(state, descriptor, declaration), codegen.getParentCodegen()); adapter.visitMaxs(-1, -1); return methodNode;