From 84dbdf2ccbbb5b4fdad8febd16eda3a436898206 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Mon, 18 Jan 2016 14:40:41 +0300 Subject: [PATCH] Get rid of ValueParameterDescriptor in 'afterParameterPut' fun --- .../kotlin/codegen/CallBasedArgumentGenerator.java | 5 ++--- .../src/org/jetbrains/kotlin/codegen/CallGenerator.kt | 5 +---- .../src/org/jetbrains/kotlin/codegen/DefaultCallMask.kt | 2 +- .../org/jetbrains/kotlin/codegen/ExpressionCodegen.java | 2 +- .../org/jetbrains/kotlin/codegen/FunctionCodegen.java | 6 +++--- .../jetbrains/kotlin/codegen/inline/InlineCodegen.java | 9 +++------ 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java index 19e785cbf61..85f952b8511 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java @@ -75,10 +75,9 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator { @Override protected void generateDefault(int i, @NotNull DefaultValueArgument argument) { - ValueParameterDescriptor parameter = valueParameters.get(i); Type type = valueParameterTypes.get(i); pushDefaultValueOnStack(type, codegen.v); - callGenerator.afterParameterPut(type, null, parameter, i); + callGenerator.afterParameterPut(type, null, i); } @Override @@ -86,7 +85,7 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator { ValueParameterDescriptor parameter = valueParameters.get(i); Type type = valueParameterTypes.get(i); codegen.genVarargs(argument, parameter.getType()); - callGenerator.afterParameterPut(type, null, parameter, i); + callGenerator.afterParameterPut(type, null, i); } @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt index c851844a523..3024bbb0d27 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.kt @@ -46,7 +46,6 @@ abstract class CallGenerator { override fun afterParameterPut( type: Type, stackValue: StackValue?, - valueParameterDescriptor: ValueParameterDescriptor, parameterIndex: Int) { } @@ -70,7 +69,7 @@ abstract class CallGenerator { } override fun putValueIfNeeded( - valueParameterDescriptor: ValueParameterDescriptor?, parameterType: Type, value: StackValue) { + parameterType: Type, value: StackValue) { value.put(value.type, codegen.v) } @@ -113,7 +112,6 @@ abstract class CallGenerator { abstract fun afterParameterPut( type: Type, stackValue: StackValue?, - valueParameterDescriptor: ValueParameterDescriptor, parameterIndex: Int) abstract fun genValueAndPut( @@ -123,7 +121,6 @@ abstract class CallGenerator { parameterIndex: Int) abstract fun putValueIfNeeded( - valueParameterDescriptor: ValueParameterDescriptor?, parameterType: Type, value: StackValue) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallMask.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallMask.kt index c41d3928420..70eb98337c5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallMask.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallMask.kt @@ -53,7 +53,7 @@ class DefaultCallMask(val size: Int) { fun generateOnStackIfNeeded(callGenerator: CallGenerator): Boolean { val toInts = toInts() for (mask in toInts) { - callGenerator.putValueIfNeeded(null, Type.INT_TYPE, StackValue.constant(mask, Type.INT_TYPE)) + callGenerator.putValueIfNeeded(Type.INT_TYPE, StackValue.constant(mask, Type.INT_TYPE)) } return toInts.isNotEmpty(); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index ab249ed80eb..ac2db0800cb 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -2404,7 +2404,7 @@ public class ExpressionCodegen extends KtVisitor impleme List callableParameters = ((CallableMethod) callableMethod).getValueParameters(); for (JvmMethodParameterSignature parameter: callableParameters) { if (parameter.getKind() == JvmMethodParameterKind.CONSTRUCTOR_MARKER) { - callGenerator.putValueIfNeeded(null, parameter.getAsmType(), StackValue.constant(null, parameter.getAsmType())); + callGenerator.putValueIfNeeded(parameter.getAsmType(), StackValue.constant(null, parameter.getAsmType())); } } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 4642b9fe531..b821e0263ed 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -732,7 +732,7 @@ public class FunctionCodegen { iv.mark(loadArg); } - generator.putValueIfNeeded(parameterDescriptor, type, StackValue.local(parameterIndex, type)); + generator.putValueIfNeeded(type, StackValue.local(parameterIndex, type)); } CallableMethod method = state.getTypeMapper().mapToCallableMethod(functionDescriptor, false); @@ -781,14 +781,14 @@ public class FunctionCodegen { ) { int var = 0; if (!isStatic) { - callGenerator.putValueIfNeeded(null, ownerType, StackValue.local(var, ownerType)); + callGenerator.putValueIfNeeded(ownerType, StackValue.local(var, ownerType)); var += ownerType.getSize(); } for (JvmMethodParameterSignature parameterSignature : signature.getValueParameters()) { if (parameterSignature.getKind() != JvmMethodParameterKind.VALUE) { Type type = parameterSignature.getAsmType(); - callGenerator.putValueIfNeeded(null, type, StackValue.local(var, type)); + callGenerator.putValueIfNeeded(type, StackValue.local(var, type)); var += type.getSize(); } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index 2c7971b35e3..d44a26a2e48 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -437,7 +437,6 @@ public class InlineCodegen extends CallGenerator { public void afterParameterPut( @NotNull Type type, @Nullable StackValue stackValue, - @Nullable ValueParameterDescriptor valueParameterDescriptor, int parameterIndex ) { putArgumentOrCapturedToLocalVal(type, stackValue, -1, parameterIndex); @@ -664,21 +663,19 @@ public class InlineCodegen extends CallGenerator { } else { StackValue value = codegen.gen(argumentExpression); - putValueIfNeeded(valueParameterDescriptor, parameterType, value, valueParameterDescriptor.getIndex()); + putValueIfNeeded(parameterType, value, valueParameterDescriptor.getIndex()); } } @Override public void putValueIfNeeded( - @Nullable ValueParameterDescriptor valueParameterDescriptor, @NotNull Type parameterType, @NotNull StackValue value ) { - putValueIfNeeded(valueParameterDescriptor, parameterType, value, -1); + putValueIfNeeded(parameterType, value, -1); } private void putValueIfNeeded( - @Nullable ValueParameterDescriptor valueParameterDescriptor, @NotNull Type parameterType, @NotNull StackValue value, int index @@ -686,7 +683,7 @@ public class InlineCodegen extends CallGenerator { if (shouldPutValue(parameterType, value)) { value.put(parameterType, codegen.v); } - afterParameterPut(parameterType, value, valueParameterDescriptor, index); + afterParameterPut(parameterType, value, index); } @Override