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

Delete unused parameter in SamWrapperCodegen

Browse Source
This commit is contained in:
Alexander Udalov
2014-05-08 17:21:11 +04:00
parent 8041cac9dd
commit 271f2f562c
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/SamWrapperClasses.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class SamWrapperClasses {
new Factory<Type>() { new Factory<Type>() {
@Override @Override
public Type create() { public Type create() {
return new SamWrapperCodegen(state, samInterface, null).genWrapper(file); return new SamWrapperCodegen(state, samInterface).genWrapper(file);
} }
}); });
} }
compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java
+10 -12
View File
@@ -17,9 +17,9 @@
package org.jetbrains.jet.codegen; package org.jetbrains.jet.codegen;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.context.CodegenContext; import org.jetbrains.jet.codegen.context.CodegenContext;
import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.codegen.state.JetTypeMapper;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
@@ -41,17 +41,16 @@ import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass;
import static org.jetbrains.org.objectweb.asm.Opcodes.*; import static org.jetbrains.org.objectweb.asm.Opcodes.*;
public class SamWrapperCodegen extends ParentCodegenAwareImpl { public class SamWrapperCodegen {
private static final String FUNCTION_FIELD_NAME = "function"; private static final String FUNCTION_FIELD_NAME = "function";
@NotNull private final JavaClassDescriptor samInterface; private final GenerationState state;
private final JetTypeMapper typeMapper;
private final JavaClassDescriptor samInterface;
public SamWrapperCodegen( public SamWrapperCodegen(@NotNull GenerationState state, @NotNull JavaClassDescriptor samInterface) {
@NotNull GenerationState state, this.state = state;
@NotNull JavaClassDescriptor samInterface, this.typeMapper = state.getTypeMapper();
@Nullable MemberCodegen<?> parentCodegen
) {
super(state, parentCodegen);
this.samInterface = samInterface; this.samInterface = samInterface;
} }
@@ -79,7 +78,7 @@ public class SamWrapperCodegen extends ParentCodegenAwareImpl {
writeKotlinSyntheticClassAnnotation(cv, KotlinSyntheticClass.Kind.SAM_WRAPPER); writeKotlinSyntheticClassAnnotation(cv, KotlinSyntheticClass.Kind.SAM_WRAPPER);
// e.g. ASM type for Function2 // e.g. ASM type for Function2
Type functionAsmType = state.getTypeMapper().mapType(functionType); Type functionAsmType = typeMapper.mapType(functionType);
cv.newField(null, cv.newField(null,
ACC_SYNTHETIC | ACC_PRIVATE | ACC_FINAL, ACC_SYNTHETIC | ACC_PRIVATE | ACC_FINAL,
@@ -124,9 +123,8 @@ public class SamWrapperCodegen extends ParentCodegenAwareImpl {
SimpleFunctionDescriptor interfaceFunction, SimpleFunctionDescriptor interfaceFunction,
JetType functionJetType JetType functionJetType
) { ) {
// using static context to avoid creating ClassDescriptor and everything else // using static context to avoid creating ClassDescriptor and everything else
FunctionCodegen codegen = new FunctionCodegen(CodegenContext.STATIC, cv, state, getParentCodegen()); FunctionCodegen codegen = new FunctionCodegen(CodegenContext.STATIC, cv, state, null);
FunctionDescriptor invokeFunction = functionJetType.getMemberScope() FunctionDescriptor invokeFunction = functionJetType.getMemberScope()
.getFunctions(Name.identifier("invoke")).iterator().next().getOriginal(); .getFunctions(Name.identifier("invoke")).iterator().next().getOriginal();