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

KT-2712 Debugger should show value of receiver of extension functions

Browse Source 
#KT-2712 fixed
This commit is contained in:
Evgeny Gerashchenko
2012-10-01 21:02:28 +04:00
parent e4f2fdc5f2
commit 069ef8ef91
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+2 -2
View File
@@ -245,7 +245,7 @@ public class FunctionCodegen extends GenerationStateAware {
if (receiverParameter.exists()) { if (receiverParameter.exists()) {
Type type = state.getTypeMapper().mapType(receiverParameter.getType()); Type type = state.getTypeMapper().mapType(receiverParameter.getType());
// TODO: specify signature // TODO: specify signature
mv.visitLocalVariable("this$receiver", type.getDescriptor(), null, methodBegin, methodEnd, k); mv.visitLocalVariable(JvmAbi.RECEIVER_PARAMETER, type.getDescriptor(), null, methodBegin, methodEnd, k);
k += type.getSize(); k += type.getSize();
} }
@@ -370,7 +370,7 @@ public class FunctionCodegen extends GenerationStateAware {
if (receiverParameter.exists()) { if (receiverParameter.exists()) {
JetValueParameterAnnotationWriter av = JetValueParameterAnnotationWriter.visitParameterAnnotation(mv, start++); JetValueParameterAnnotationWriter av = JetValueParameterAnnotationWriter.visitParameterAnnotation(mv, start++);
av.writeName("this$receiver"); av.writeName(JvmAbi.RECEIVER_PARAMETER);
av.writeReceiver(); av.writeReceiver();
if (kotlinParameterTypes.get(0) != null) { if (kotlinParameterTypes.get(0) != null) {
av.writeType(kotlinParameterTypes.get(0).getKotlinSignature()); av.writeType(kotlinParameterTypes.get(0).getKotlinSignature());
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
+1
View File
@@ -32,6 +32,7 @@ public class JvmAbi {
public static final String CLASS_OBJECT_SUFFIX = "$" + CLASS_OBJECT_CLASS_NAME; public static final String CLASS_OBJECT_SUFFIX = "$" + CLASS_OBJECT_CLASS_NAME;
public static final String INSTANCE_FIELD = "$instance"; public static final String INSTANCE_FIELD = "$instance";
public static final String RECEIVER_PARAMETER = "$receiver";
public static final JvmClassName JETBRAINS_NOT_NULL_ANNOTATION = public static final JvmClassName JETBRAINS_NOT_NULL_ANNOTATION =
JvmClassName.byFqNameWithoutInnerClasses("org.jetbrains.annotations.NotNull"); JvmClassName.byFqNameWithoutInnerClasses("org.jetbrains.annotations.NotNull");
runtime/src/jet/runtime/typeinfo/JetMethod.java
+1 -1
View File
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/** /**
* Annotation for method * Annotation for method
* *
* The fact of receiver presence must be deducted from presence of 'this$receiver' parameter * The fact of receiver presence must be deducted from presence of '$receiver' parameter
* *
* @author alex.tkachman * @author alex.tkachman
* *