From 68961004a5f86352609f5cbf8fef443e77a41bf8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 5 Dec 2013 20:44:35 +0400 Subject: [PATCH] Collect overridden descriptors for property accessors to LinkedHashSet --- .../lang/descriptors/impl/PropertyAccessorDescriptorImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java index 078a0a46b79..a300b6427e5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java @@ -129,9 +129,10 @@ public abstract class PropertyAccessorDescriptorImpl extends DeclarationDescript throw new UnsupportedOperationException("Accessors must be copied by the corresponding property"); } + @NotNull protected Set getOverriddenDescriptors(boolean isGetter) { Set overriddenProperties = getCorrespondingProperty().getOverriddenDescriptors(); - Set overriddenAccessors = Sets.newHashSet(); + Set overriddenAccessors = Sets.newLinkedHashSet(); // LinkedHashSet for determinism for (PropertyDescriptor overriddenProperty : overriddenProperties) { PropertyAccessorDescriptor accessorDescriptor = isGetter ? overriddenProperty.getGetter() : overriddenProperty.getSetter(); if (accessorDescriptor != null) {