Fixed order of containing and original in property descriptors.

compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyDescriptor.java

@@ -43,7 +43,7 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl {
             @NotNull DeclarationDescriptor containingDeclaration,
             int index
     ) {
-        super(null, containingDeclaration, Annotations.EMPTY, Modality.FINAL, Visibilities.LOCAL,
+        super(containingDeclaration, null, Annotations.EMPTY, Modality.FINAL, Visibilities.LOCAL,
               original.isVar(), Name.identifier(original.getName() + "$b$" + index),
               Kind.DECLARATION);
 

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java

@@ -137,8 +137,8 @@ public class DescriptorDeserializer {
         final int flags = proto.getFlags();
 
         DeserializedPropertyDescriptor property = new DeserializedPropertyDescriptor(
-                null,
                 containingDeclaration,
+                null,
                 getAnnotations(proto, flags, AnnotatedCallableKind.PROPERTY),
                 modality(Flags.MODALITY.get(flags)),
                 visibility(Flags.VISIBILITY.get(flags)),

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt

@@ -28,8 +28,8 @@ import org.jetbrains.jet.descriptors.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind
 
 public class DeserializedPropertyDescriptor(
-        original: PropertyDescriptor?,
         containingDeclaration: DeclarationDescriptor,
+        original: PropertyDescriptor?,
         annotations: Annotations,
         modality: Modality,
         visibility: Visibility,
@@ -39,7 +39,7 @@ public class DeserializedPropertyDescriptor(
         override public val proto: ProtoBuf.Callable,
         override public val nameResolver: NameResolver
 ) : DeserializedCallableMemberDescriptor,
-    PropertyDescriptorImpl(original, containingDeclaration, annotations, modality, visibility, isVar, name, kind) {
+    PropertyDescriptorImpl(containingDeclaration, original, annotations, modality, visibility, isVar, name, kind) {
 
     override fun createSubstitutedCopy(
             newOwner: DeclarationDescriptor,
@@ -49,6 +49,6 @@ public class DeserializedPropertyDescriptor(
             kind: Kind
     ): PropertyDescriptorImpl {
         return DeserializedPropertyDescriptor(
-                original, newOwner, getAnnotations(), newModality, newVisibility, isVar(), getName(), kind, proto, nameResolver)
+                newOwner, original, getAnnotations(), newModality, newVisibility, isVar(), getName(), kind, proto, nameResolver)
     }
 }

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java

@@ -32,6 +32,6 @@ public class JavaPropertyDescriptor extends PropertyDescriptorImpl implements Ja
             boolean isVar,
             @NotNull Name name
     ) {
-        super(null, containingDeclaration, annotations, Modality.FINAL, visibility, isVar, name, Kind.DECLARATION);
+        super(containingDeclaration, null, annotations, Modality.FINAL, visibility, isVar, name, Kind.DECLARATION);
     }
 }

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java

@@ -53,8 +53,8 @@ public class PropertyDescriptorImpl extends VariableDescriptorImpl implements Pr
     private boolean setterProjectedOut;
 
     protected PropertyDescriptorImpl(
-            @Nullable PropertyDescriptor original,
             @NotNull DeclarationDescriptor containingDeclaration,
+            @Nullable PropertyDescriptor original,
             @NotNull Annotations annotations,
             @NotNull Modality modality,
             @NotNull Visibility visibility,
@@ -79,7 +79,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorImpl implements Pr
             @NotNull Name name,
             @NotNull Kind kind
     ) {
-        return new PropertyDescriptorImpl(null, containingDeclaration, annotations, modality, visibility, isVar, name, kind);
+        return new PropertyDescriptorImpl(containingDeclaration, null, annotations, modality, visibility, isVar, name, kind);
     }
 
     public void setType(
@@ -290,8 +290,8 @@ public class PropertyDescriptorImpl extends VariableDescriptorImpl implements Pr
             @Nullable PropertyDescriptor original,
             @NotNull Kind kind
     ) {
-        return new PropertyDescriptorImpl(original, newOwner,
-                getAnnotations(), newModality, newVisibility, isVar(), getName(), kind);
+        return new PropertyDescriptorImpl(newOwner, original,
+                                          getAnnotations(), newModality, newVisibility, isVar(), getName(), kind);
     }
 
     @NotNull