Added checking for overridden properties number in NamespaceComparator.

compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt

@@ -5,6 +5,6 @@ internal open class test.BaseClass : jet.Any {
     public final /*constructor*/ fun <init>(): test.BaseClass
 }
 internal open class test.Subclass : test.BaseClass {
-    internal open val shape: jet.String
+    internal open override /*1*/ val shape: jet.String
     public final /*constructor*/ fun <init>(): test.Subclass
 }

compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt

@@ -1,7 +1,7 @@
 namespace test
 
 internal open class test.Subclass : test.Trait {
-    internal open val shape: jet.String
+    internal open override /*1*/ val shape: jet.String
     public final /*constructor*/ fun <init>(): test.Subclass
 }
 internal abstract trait test.Trait : jet.Any {

compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt

@@ -5,6 +5,6 @@ internal open class test.BaseClass : jet.Any {
     public final /*constructor*/ fun <init>(): test.BaseClass
 }
 internal final class test.Subclass : test.BaseClass {
-    internal final val exactly: jet.Int
+    internal final override /*1*/ val exactly: jet.Int
     public final /*constructor*/ fun <init>(): test.Subclass
 }

compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt

@@ -4,6 +4,6 @@ internal abstract trait test.A : jet.Any {
     internal open var v: jet.String
 }
 internal final class test.B : test.A {
-    internal open var v: jet.String
+    internal open override /*1*/ var v: jet.String
     public final /*constructor*/ fun <init>(): test.B
 }

compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java

@@ -274,7 +274,7 @@ public class NamespaceComparator {
             }
 
             if (!fun.getOverriddenDescriptors().isEmpty()) {
-                sb.append("override /*" + fun.getOverriddenDescriptors().size() + "*/ ");
+                sb.append("override /*").append(fun.getOverriddenDescriptors().size()).append("*/ ");
             }
 
             if (fun instanceof ConstructorDescriptor) {
@@ -332,6 +332,10 @@ public class NamespaceComparator {
                 sb.append(" ");
             }
 
+            if (!prop.getOverriddenDescriptors().isEmpty()) {
+                sb.append("override /*").append(prop.getOverriddenDescriptors().size()).append("*/ ");
+            }
+
             if (prop.isVar()) {
                 sb.append("var ");
             }