From 92ba298e685be3de9972cb0777a0f2d4787cb32f Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 26 Sep 2019 12:50:52 +0300 Subject: [PATCH] KT-14513 DELEGATED_PROPERTIES -> DELEGATED_PROPERTIES_WITH_METADATA --- .../src/org/jetbrains/kotlin/codegen/MemberCodegen.java | 2 +- .../src/org/jetbrains/kotlin/codegen/PropertyCodegen.java | 4 ++-- .../kotlin/codegen/binding/CodegenAnnotatingVisitor.java | 4 ++-- .../org/jetbrains/kotlin/codegen/binding/CodegenBinding.java | 4 ++-- .../org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 58d8cdb73ac..6d010fd7b46 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -627,7 +627,7 @@ public abstract class MemberCodegen delegatedProperties = bindingContext.get(CodegenBinding.DELEGATED_PROPERTIES, thisAsmType); + List delegatedProperties = bindingContext.get(CodegenBinding.DELEGATED_PROPERTIES_WITH_METADATA, thisAsmType); if (delegatedProperties == null || delegatedProperties.isEmpty()) return; v.newField(NO_ORIGIN, ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.DELEGATED_PROPERTIES_ARRAY_NAME, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index a6651f19172..51a1a6b5923 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -49,7 +49,7 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.getVisibilityForBackingField; import static org.jetbrains.kotlin.codegen.FunctionCodegen.processInterfaceMethod; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConstOrHasJvmFieldAnnotation; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface; -import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.DELEGATED_PROPERTIES; +import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.DELEGATED_PROPERTIES_WITH_METADATA; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.DELEGATED_PROPERTY_METADATA_OWNER; import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.*; import static org.jetbrains.kotlin.diagnostics.Errors.EXPECTED_FUNCTION_SOURCE_WITH_DEFAULT_ARGUMENTS_NOT_FOUND; @@ -572,7 +572,7 @@ public class PropertyCodegen { Type owner = bindingContext.get(DELEGATED_PROPERTY_METADATA_OWNER, descriptor); assert owner != null : "Delegated property owner not found: " + descriptor; - List allDelegatedProperties = bindingContext.get(DELEGATED_PROPERTIES, owner); + List allDelegatedProperties = bindingContext.get(DELEGATED_PROPERTIES_WITH_METADATA, owner); int index = allDelegatedProperties == null ? -1 : allDelegatedProperties.indexOf(descriptor); if (index < 0) { throw new AssertionError("Delegated property not found in " + owner + ": " + descriptor); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index cc2ba8b4eaa..cebc54d638a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -510,10 +510,10 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid { recordClosure(classDescriptor, name); Type containerType = getMetadataOwner(property); - List descriptors = bindingTrace.get(DELEGATED_PROPERTIES, containerType); + List descriptors = bindingTrace.get(DELEGATED_PROPERTIES_WITH_METADATA, containerType); if (descriptors == null) { descriptors = new ArrayList<>(1); - bindingTrace.record(DELEGATED_PROPERTIES, containerType, descriptors); + bindingTrace.record(DELEGATED_PROPERTIES_WITH_METADATA, containerType, descriptors); } descriptors.add(variableDescriptor); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java index a0de092e073..bc50cc161f0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -69,7 +69,7 @@ public class CodegenBinding { public static final WritableSlice PARAMETER_SYNONYM = Slices.createSimpleSlice(); - public static final WritableSlice> DELEGATED_PROPERTIES = + public static final WritableSlice> DELEGATED_PROPERTIES_WITH_METADATA = Slices.createSimpleSlice(); public static final WritableSlice DELEGATED_PROPERTY_METADATA_OWNER = Slices.createSimpleSlice(); @@ -87,7 +87,7 @@ public class CodegenBinding { @Nullable public static List getLocalDelegatedProperties(@NotNull BindingContext bindingContext, @NotNull Type owner) { - List properties = bindingContext.get(DELEGATED_PROPERTIES, owner); + List properties = bindingContext.get(DELEGATED_PROPERTIES_WITH_METADATA, owner); return properties == null ? null : CollectionsKt.filterIsInstance(properties, LocalVariableDescriptor.class); } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt index 3e3b42dc772..cda623491ac 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt @@ -142,7 +142,7 @@ open class ClassCodegen protected constructor( private fun generateKotlinMetadataAnnotation() { val localDelegatedProperties = (irClass.attributeOwnerId as? IrClass)?.let(context.localDelegatedProperties::get) if (localDelegatedProperties != null && localDelegatedProperties.isNotEmpty()) { - state.bindingTrace.record(CodegenBinding.DELEGATED_PROPERTIES, type, localDelegatedProperties.map { it.descriptor }) + state.bindingTrace.record(CodegenBinding.DELEGATED_PROPERTIES_WITH_METADATA, type, localDelegatedProperties.map { it.descriptor }) } when (val metadata = irClass.metadata) {