From 85dcfac2b83ad0d7070bf765ddeae0cc46c0b4ff Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Wed, 29 Aug 2012 21:00:39 +0300 Subject: [PATCH] some unmotivated uses of typeMapper.getBindingContext() replace with use of local field --- .../src/org/jetbrains/jet/codegen/ExpressionCodegen.java | 2 +- .../org/jetbrains/jet/codegen/ImplementationBodyCodegen.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 1e87a5ab0a8..8d9b4062847 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -2114,7 +2114,7 @@ public class ExpressionCodegen extends JetVisitor implem public int indexOfLocal(JetReferenceExpression lhs) { final DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, lhs); - if (isVarCapturedInClosure(typeMapper.getBindingContext(), declarationDescriptor)) { + if (isVarCapturedInClosure(bindingContext, declarationDescriptor)) { return -1; } return lookupLocalIndex(declarationDescriptor); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index f460cef4e61..83d0e4cde4a 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -632,7 +632,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { if (hasThis0) { final Type type = typeMapper - .mapType(eclosingClassDescriptor(typeMapper.getBindingContext(), descriptor).getDefaultType(), MapTypeMode.VALUE); + .mapType(eclosingClassDescriptor(bindingContext, descriptor).getDefaultType(), MapTypeMode.VALUE); String interfaceDesc = type.getDescriptor(); iv.load(0, classType); iv.load(frameMap.getOuterThisIndex(), type); @@ -709,7 +709,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { if (CodegenBinding.hasThis0(bindingContext, superClassDescriptor)) { iv.load(1, OBJECT_TYPE); parameterTypes.add(typeMapper.mapType( - eclosingClassDescriptor(typeMapper.getBindingContext(), descriptor).getDefaultType(), MapTypeMode.VALUE)); + eclosingClassDescriptor(bindingContext, descriptor).getDefaultType(), MapTypeMode.VALUE)); } Method superCallMethod = new Method("", Type.VOID_TYPE, parameterTypes.toArray(new Type[parameterTypes.size()])); //noinspection ConstantConditions