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

Remove redundant parameter

Browse Source
This commit is contained in:
Mikhael Bogdanov
2013-10-25 15:34:30 +04:00
parent c76c2d3dff
commit 1e5b250d01
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
+9 -10
View File
@@ -166,7 +166,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
assert classDescriptor != null; assert classDescriptor != null;
String name = peekFromStack(nameStack) + JvmAbi.CLASS_OBJECT_SUFFIX; String name = peekFromStack(nameStack) + JvmAbi.CLASS_OBJECT_SUFFIX;
recordClosure(classObject, classDescriptor, name, false); recordClosure(classObject, classDescriptor, name);
classStack.push(classDescriptor); classStack.push(classDescriptor);
nameStack.push(name); nameStack.push(name);
@@ -186,7 +186,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
if (classDescriptor == null) return; if (classDescriptor == null) return;
String name = getName(classDescriptor); String name = getName(classDescriptor);
recordClosure(declaration, classDescriptor, name, false); recordClosure(declaration, classDescriptor, name);
classStack.push(classDescriptor); classStack.push(classDescriptor);
nameStack.push(name); nameStack.push(name);
@@ -203,7 +203,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
if (classDescriptor == null) return; if (classDescriptor == null) return;
String name = getName(classDescriptor); String name = getName(classDescriptor);
recordClosure(klass, classDescriptor, name, false); recordClosure(klass, classDescriptor, name);
classStack.push(classDescriptor); classStack.push(classDescriptor);
nameStack.push(name); nameStack.push(name);
@@ -228,7 +228,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
} }
String name = inventAnonymousClassName(expression.getObjectDeclaration()); String name = inventAnonymousClassName(expression.getObjectDeclaration());
recordClosure(expression.getObjectDeclaration(), classDescriptor, name, false); recordClosure(expression.getObjectDeclaration(), classDescriptor, name);
classStack.push(classDescriptor); classStack.push(classDescriptor);
//noinspection ConstantConditions //noinspection ConstantConditions
@@ -249,7 +249,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
String name = inventAnonymousClassName(expression); String name = inventAnonymousClassName(expression);
JetType superType = getSuperTypeForClosure(functionDescriptor, false); JetType superType = getSuperTypeForClosure(functionDescriptor, false);
ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType); ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType);
recordClosure(functionLiteral, classDescriptor, name, true); recordClosure(functionLiteral, classDescriptor, name);
classStack.push(classDescriptor); classStack.push(classDescriptor);
nameStack.push(name); nameStack.push(name);
@@ -271,7 +271,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
String name = inventAnonymousClassName(expression); String name = inventAnonymousClassName(expression);
ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType); ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType);
recordClosure(expression, classDescriptor, name, true); recordClosure(expression, classDescriptor, name);
classStack.push(classDescriptor); classStack.push(classDescriptor);
nameStack.push(name); nameStack.push(name);
@@ -283,11 +283,10 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
private void recordClosure( private void recordClosure(
@NotNull JetElement element, @NotNull JetElement element,
@NotNull ClassDescriptor classDescriptor, @NotNull ClassDescriptor classDescriptor,
@NotNull String name, @NotNull String name
boolean functionLiteral
) { ) {
CodegenBinding.recordClosure(bindingTrace, element, classDescriptor, peekFromStack(classStack), CodegenBinding.recordClosure(bindingTrace, element, classDescriptor, peekFromStack(classStack),
Type.getObjectType(name), functionLiteral); Type.getObjectType(name));
} }
@Override @Override
@@ -323,7 +322,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
String name = inventAnonymousClassName(function); String name = inventAnonymousClassName(function);
JetType superType = getSuperTypeForClosure(functionDescriptor, false); JetType superType = getSuperTypeForClosure(functionDescriptor, false);
ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType); ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType);
recordClosure(function, classDescriptor, name, true); recordClosure(function, classDescriptor, name);
classStack.push(classDescriptor); classStack.push(classDescriptor);
nameStack.push(name); nameStack.push(name);
compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
+2 -3
View File
@@ -155,7 +155,7 @@ public class CodegenBinding {
null, null,
false); false);
recordClosure(bindingTrace, null, classDescriptor, null, asmType, false); recordClosure(bindingTrace, null, classDescriptor, null, asmType);
bindingTrace.record(CLASS_FOR_SCRIPT, scriptDescriptor, classDescriptor); bindingTrace.record(CLASS_FOR_SCRIPT, scriptDescriptor, classDescriptor);
} }
@@ -199,8 +199,7 @@ public class CodegenBinding {
@Nullable JetElement element, @Nullable JetElement element,
ClassDescriptor classDescriptor, ClassDescriptor classDescriptor,
@Nullable ClassDescriptor enclosing, @Nullable ClassDescriptor enclosing,
Type asmType, Type asmType
boolean functionLiteral
) { ) {
JetDelegatorToSuperCall superCall = findSuperCall(bindingTrace.getBindingContext(), element); JetDelegatorToSuperCall superCall = findSuperCall(bindingTrace.getBindingContext(), element);