From 1e5b250d018f64aa1c23f1a25f86aabcc2422fc2 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 25 Oct 2013 15:34:30 +0400 Subject: [PATCH] Remove redundant parameter --- .../binding/CodegenAnnotatingVisitor.java | 19 +++++++++---------- .../jet/codegen/binding/CodegenBinding.java | 5 ++--- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java index 03cc4bbfe28..7794f5f7caf 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java @@ -166,7 +166,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { assert classDescriptor != null; String name = peekFromStack(nameStack) + JvmAbi.CLASS_OBJECT_SUFFIX; - recordClosure(classObject, classDescriptor, name, false); + recordClosure(classObject, classDescriptor, name); classStack.push(classDescriptor); nameStack.push(name); @@ -186,7 +186,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { if (classDescriptor == null) return; String name = getName(classDescriptor); - recordClosure(declaration, classDescriptor, name, false); + recordClosure(declaration, classDescriptor, name); classStack.push(classDescriptor); nameStack.push(name); @@ -203,7 +203,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { if (classDescriptor == null) return; String name = getName(classDescriptor); - recordClosure(klass, classDescriptor, name, false); + recordClosure(klass, classDescriptor, name); classStack.push(classDescriptor); nameStack.push(name); @@ -228,7 +228,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { } String name = inventAnonymousClassName(expression.getObjectDeclaration()); - recordClosure(expression.getObjectDeclaration(), classDescriptor, name, false); + recordClosure(expression.getObjectDeclaration(), classDescriptor, name); classStack.push(classDescriptor); //noinspection ConstantConditions @@ -249,7 +249,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { String name = inventAnonymousClassName(expression); JetType superType = getSuperTypeForClosure(functionDescriptor, false); ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType); - recordClosure(functionLiteral, classDescriptor, name, true); + recordClosure(functionLiteral, classDescriptor, name); classStack.push(classDescriptor); nameStack.push(name); @@ -271,7 +271,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { String name = inventAnonymousClassName(expression); ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType); - recordClosure(expression, classDescriptor, name, true); + recordClosure(expression, classDescriptor, name); classStack.push(classDescriptor); nameStack.push(name); @@ -283,11 +283,10 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { private void recordClosure( @NotNull JetElement element, @NotNull ClassDescriptor classDescriptor, - @NotNull String name, - boolean functionLiteral + @NotNull String name ) { CodegenBinding.recordClosure(bindingTrace, element, classDescriptor, peekFromStack(classStack), - Type.getObjectType(name), functionLiteral); + Type.getObjectType(name)); } @Override @@ -323,7 +322,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { String name = inventAnonymousClassName(function); JetType superType = getSuperTypeForClosure(functionDescriptor, false); ClassDescriptor classDescriptor = recordClassForFunction(functionDescriptor, superType); - recordClosure(function, classDescriptor, name, true); + recordClosure(function, classDescriptor, name); classStack.push(classDescriptor); nameStack.push(name); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java index 0bf14bd5b7b..623a3bc7a23 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java @@ -155,7 +155,7 @@ public class CodegenBinding { null, false); - recordClosure(bindingTrace, null, classDescriptor, null, asmType, false); + recordClosure(bindingTrace, null, classDescriptor, null, asmType); bindingTrace.record(CLASS_FOR_SCRIPT, scriptDescriptor, classDescriptor); } @@ -199,8 +199,7 @@ public class CodegenBinding { @Nullable JetElement element, ClassDescriptor classDescriptor, @Nullable ClassDescriptor enclosing, - Type asmType, - boolean functionLiteral + Type asmType ) { JetDelegatorToSuperCall superCall = findSuperCall(bindingTrace.getBindingContext(), element);