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

Minor: Get rid of some magic constants

Browse Source
This commit is contained in:
Yan Zhulanow
2018-06-01 16:50:05 +03:00
parent b1ab2ead61
commit b5f9149702
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java
+2 -2
View File
@@ -55,7 +55,7 @@ public interface LocalLookup {
Type type = sharedVarType != null ? sharedVarType : localType;
KotlinType kotlinType = sharedVarType != null ? null : localKotlinType;
String fieldName = "$" + vd.getName();
String fieldName = AsmUtil.getCapturedFieldName(vd.getName().asString());
StackValue.Local thiz = StackValue.LOCAL_0;
StackValue.StackValueWithSimpleReceiver innerValue;
@@ -113,7 +113,7 @@ public interface LocalLookup {
int localClassIndexStart = simpleName.lastIndexOf('$');
String localFunSuffix = localClassIndexStart >= 0 ? simpleName.substring(localClassIndexStart) : "";
String fieldName = "$" + vd.getName() + localFunSuffix;
String fieldName = AsmUtil.getCapturedFieldName(vd.getName().asString()) + localFunSuffix;
StackValue.StackValueWithSimpleReceiver innerValue = StackValue.field(
localType, null, classType, fieldName, false, StackValue.LOCAL_0, vd
);
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
+3 -3
View File
@@ -340,12 +340,12 @@ class MethodInliner(
// 'This' in outer context corresponds to outer instance in current
visitFieldInsn(
Opcodes.GETSTATIC, owner,
CAPTURED_FIELD_FOLD_PREFIX + AsmUtil.CAPTURED_THIS_FIELD, capturedParamDesc.type.descriptor
FieldRemapper.foldName(AsmUtil.CAPTURED_THIS_FIELD), capturedParamDesc.type.descriptor
)
} else {
visitFieldInsn(
Opcodes.GETSTATIC, capturedParamDesc.containingLambdaName,
CAPTURED_FIELD_FOLD_PREFIX + capturedParamDesc.fieldName, capturedParamDesc.type.descriptor
FieldRemapper.foldName(capturedParamDesc.fieldName), capturedParamDesc.type.descriptor
)
}
}
@@ -1084,7 +1084,7 @@ class MethodInliner(
private fun getCapturedFieldAccessChain(aload0: VarInsnNode): List<AbstractInsnNode> {
val lambdaAccessChain = mutableListOf<AbstractInsnNode>(aload0).apply {
addAll(InsnSequence(aload0.next, null).filter { it.isMeaningful }.takeWhile { insnNode ->
insnNode is FieldInsnNode && "this$0" == insnNode.name
insnNode is FieldInsnNode && AsmUtil.CAPTURED_THIS_FIELD == insnNode.name
}.toList())
}