Merged r12569 into trunk branch.

test/mjsunit/regress/regress-cnlt-enum-indices.js

Index: test/mjsunit/regress/regress-cnlt-enum-indices.js
diff --git a/test/mjsunit/regress/regress-cntl-descriptors-enum.js b/test/mjsunit/regress/regress-cnlt-enum-indices.js
similarity index 87%
copy from test/mjsunit/regress/regress-cntl-descriptors-enum.js
copy to test/mjsunit/regress/regress-cnlt-enum-indices.js
index ee72fafc8a7c67f2b1ab6cc22a734ef8033a5697..03582bbbe424b10487fab13a6473e9b62781845e 100644
--- a/test/mjsunit/regress/regress-cntl-descriptors-enum.js
+++ b/test/mjsunit/regress/regress-cnlt-enum-indices.js
@@ -27,20 +27,19 @@
 
 // Flags: --allow-natives-syntax --expose-gc
 
-DontEnum = 2;
-
 var o = {};
-%SetProperty(o, "a", 0, DontEnum);
-
 var o2 = {};
-%SetProperty(o2, "a", 0, DontEnum);
 
+o.a = 1;
+o2.a = 1;
+function f() { return 10; }
+// Adds a non-field enumerable property.
+Object.defineProperty(o, "b", { get: f, enumerable: true });
+Object.defineProperty(o2, "b", { get: f, enumerable: true });
 assertTrue(%HaveSameMap(o, o2));
+o.c = 2;
 
-o.y = 2;
+for (var x in o) { }
+o = null;
 
-for (var v in o) { print(v); }
-o = {};
 gc();
-
-for (var v in o2) { print(v); }