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

localVariableReferences.kt moved from reflection.jvm to runtime.jvm

Browse Source
This commit is contained in:
Mikhael Bogdanov
2016-05-11 14:58:53 +03:00
parent 93b342c936
commit 5e933b7acd
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java
+2 -3
View File
@@ -50,12 +50,11 @@ public class JvmRuntimeTypes {
LockBasedStorageManager.NO_LOCKS,
DefaultBuiltIns.getInstance());
PackageFragmentDescriptor kotlinJvmInternal = new MutablePackageFragmentDescriptor(module, new FqName("kotlin.jvm.internal"));
PackageFragmentDescriptor kotlinReflectJvmInternal = new MutablePackageFragmentDescriptor(module, new FqName("kotlin.reflect.jvm.internal"));
this.lambda = createClass(kotlinJvmInternal, "Lambda");
this.functionReference = createClass(kotlinJvmInternal, "FunctionReference");
this.localVariableReference = createClass(kotlinReflectJvmInternal, "LocalVariableReference");
this.mutableLocalVariableReference = createClass(kotlinReflectJvmInternal, "MutableLocalVariableReference");
this.localVariableReference = createClass(kotlinJvmInternal, "LocalVariableReference");
this.mutableLocalVariableReference = createClass(kotlinJvmInternal, "MutableLocalVariableReference");
this.propertyReferences = new ArrayList<ClassDescriptor>(3);
this.mutablePropertyReferences = new ArrayList<ClassDescriptor>(3);
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt
+6 -7
View File
@@ -86,12 +86,6 @@ class PropertyReferenceCodegen(
invokespecial(superAsmType.internalName, "<init>", "()V", false)
}
if (target !is LocalVariableDescriptor) {
generateMethod("property reference getOwner", ACC_PUBLIC, method("getOwner", K_DECLARATION_CONTAINER_TYPE)) {
ClosureCodegen.generateCallableReferenceDeclarationContainer(this, target, state)
}
}
generateMethod("property reference getName", ACC_PUBLIC, method("getName", JAVA_STRING_TYPE)) {
aconst(target.name.asString())
}
@@ -100,7 +94,12 @@ class PropertyReferenceCodegen(
aconst(getPropertyReferenceSignature(target as VariableDescriptorWithAccessors, state))
}
generateAccessors()
if (target !is LocalVariableDescriptor) {
generateMethod("property reference getOwner", ACC_PUBLIC, method("getOwner", K_DECLARATION_CONTAINER_TYPE)) {
ClosureCodegen.generateCallableReferenceDeclarationContainer(this, target, state)
}
generateAccessors()
}
}
private fun generateAccessors() {