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

some unmotivated uses of typeMapper.getBindingContext() replace with use of local field

Browse Source
This commit is contained in:
Alex Tkachman
2012-08-29 21:00:39 +03:00
parent c834c4cf0f
commit 85dcfac2b8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+1 -1
View File
@@ -2114,7 +2114,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
public int indexOfLocal(JetReferenceExpression lhs) { public int indexOfLocal(JetReferenceExpression lhs) {
final DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, lhs); final DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, lhs);
if (isVarCapturedInClosure(typeMapper.getBindingContext(), declarationDescriptor)) { if (isVarCapturedInClosure(bindingContext, declarationDescriptor)) {
return -1; return -1;
} }
return lookupLocalIndex(declarationDescriptor); return lookupLocalIndex(declarationDescriptor);
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+2 -2
View File
@@ -632,7 +632,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
if (hasThis0) { if (hasThis0) {
final Type type = typeMapper final Type type = typeMapper
.mapType(eclosingClassDescriptor(typeMapper.getBindingContext(), descriptor).getDefaultType(), MapTypeMode.VALUE); .mapType(eclosingClassDescriptor(bindingContext, descriptor).getDefaultType(), MapTypeMode.VALUE);
String interfaceDesc = type.getDescriptor(); String interfaceDesc = type.getDescriptor();
iv.load(0, classType); iv.load(0, classType);
iv.load(frameMap.getOuterThisIndex(), type); iv.load(frameMap.getOuterThisIndex(), type);
@@ -709,7 +709,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
if (CodegenBinding.hasThis0(bindingContext, superClassDescriptor)) { if (CodegenBinding.hasThis0(bindingContext, superClassDescriptor)) {
iv.load(1, OBJECT_TYPE); iv.load(1, OBJECT_TYPE);
parameterTypes.add(typeMapper.mapType( parameterTypes.add(typeMapper.mapType(
eclosingClassDescriptor(typeMapper.getBindingContext(), descriptor).getDefaultType(), MapTypeMode.VALUE)); eclosingClassDescriptor(bindingContext, descriptor).getDefaultType(), MapTypeMode.VALUE));
} }
Method superCallMethod = new Method("<init>", Type.VOID_TYPE, parameterTypes.toArray(new Type[parameterTypes.size()])); Method superCallMethod = new Method("<init>", Type.VOID_TYPE, parameterTypes.toArray(new Type[parameterTypes.size()]));
//noinspection ConstantConditions //noinspection ConstantConditions