Change the enumeration order for unsigned integer keys to always be...

src/handles.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 473 matching lines @@
       Handle<JSObject> current(JSObject::cast(*p));
 
       // Check access rights if required.
       if (current->IsAccessCheckNeeded() &&
         !Top::MayNamedAccess(*current, Heap::undefined_value(),
                              v8::ACCESS_KEYS)) {
         Top::ReportFailedAccessCheck(*current, v8::ACCESS_KEYS);
         break;
       }
 
-      // Compute the property keys.
-      content = UnionOfKeys(content, GetEnumPropertyKeys(current));
-
-      // Add the property keys from the interceptor.
-      if (current->HasNamedInterceptor()) {
-        v8::Handle<v8::Array> result =
-            GetKeysForNamedInterceptor(object, current);
-        if (!result.IsEmpty())
-          content = AddKeysFromJSArray(content, v8::Utils::OpenHandle(*result));
-      }
-
       // Compute the element keys.
       Handle<FixedArray> element_keys =
           Factory::NewFixedArray(current->NumberOfEnumElements());
       current->GetEnumElementKeys(*element_keys);
       content = UnionOfKeys(content, element_keys);
 
       // Add the element keys from the interceptor.
       if (current->HasIndexedInterceptor()) {
         v8::Handle<v8::Array> result =
             GetKeysForIndexedInterceptor(object, current);
         if (!result.IsEmpty())
           content = AddKeysFromJSArray(content, v8::Utils::OpenHandle(*result));
       }
+
+      // Compute the property keys.
+      content = UnionOfKeys(content, GetEnumPropertyKeys(current));
+
+      // Add the property keys from the interceptor.
+      if (current->HasNamedInterceptor()) {
+        v8::Handle<v8::Array> result =
+            GetKeysForNamedInterceptor(object, current);
+        if (!result.IsEmpty())
+          content = AddKeysFromJSArray(content, v8::Utils::OpenHandle(*result));
+      }
     }
   }
   return content;
 }
 
 
 Handle<JSArray> GetKeysFor(Handle<JSObject> object) {
   Counters::for_in.Increment();
   Handle<FixedArray> elements = GetKeysInFixedArrayFor(object);
   return Factory::NewJSArrayWithElements(elements);
@@ skipping 14 matching lines @@
     Handle<FixedArray> sort_array = Factory::NewFixedArray(num_enum);
     for (DescriptorReader r(object->map()->instance_descriptors());
          !r.eos();
          r.advance()) {
       if (r.IsProperty() && !r.IsDontEnum()) {
         (*storage)->set(index, r.GetKey());
         (*sort_array)->set(index, Smi::FromInt(r.GetDetails().index()));
         index++;
       }
     }
-    (*storage)->SortPairs(*sort_array);
+    (*storage)->SortPairs(*sort_array, sort_array->length());
     Handle<FixedArray> bridge_storage =
         Factory::NewFixedArray(DescriptorArray::kEnumCacheBridgeLength);
     DescriptorArray* desc = object->map()->instance_descriptors();
     desc->SetEnumCache(*bridge_storage, *storage);
     ASSERT(storage->length() == index);
     return storage;
   } else {
     int num_enum = object->NumberOfEnumProperties();
     Handle<FixedArray> storage = Factory::NewFixedArray(num_enum);
     Handle<FixedArray> sort_array = Factory::NewFixedArray(num_enum);
@@ skipping 116 matching lines @@
                Handle<Context> compile_context,
                Handle<Context> function_context) {
   Handle<FixedArray> arr = Factory::NewFixedArray(3);
   arr->set(0, Smi::FromInt(index));
   arr->set(1, *compile_context);  // Compile in this context
   arr->set(2, *function_context);  // Set function context to this
   fun->shared()->set_lazy_load_data(*arr);
 }
 
 } }  // namespace v8::internal