Revision: 5356
Author: [email protected]
Date: Thu Aug 26 06:15:29 2010
Log: Bring r5350 and r5353 to the 2.3 branch.
Review URL: http://codereview.chromium.org/3137042
http://code.google.com/p/v8/source/detail?r=5356
Added:
/branches/2.3/test/mjsunit/regress/regress-842.js
Modified:
/branches/2.3/src/v8natives.js
/branches/2.3/src/version.cc
/branches/2.3/test/cctest/cctest.status
=======================================
--- /dev/null
+++ /branches/2.3/test/mjsunit/regress/regress-842.js Thu Aug 26 06:15:29
2010
@@ -0,0 +1,40 @@
+// Copyright 2010 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
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// 842 describes a scenario where Object.prototype or Array.prototype is
+// changed (a property is added) after which freeze and seal would fail
+// since that property would be listed when doing a "for (var key in
names)"
+
+Array.prototype.myfunc = function() {}
+
+var obj = { name: "n1" };
+
+try {
+ obj = Object.freeze(obj);
+} catch (e) {
+ assertUnreachable();
+}
=======================================
--- /branches/2.3/src/v8natives.js Mon Aug 9 02:47:21 2010
+++ /branches/2.3/src/v8natives.js Thu Aug 26 06:15:29 2010
@@ -743,8 +743,8 @@
throw MakeTypeError("obj_ctor_property_non_object", ["seal"]);
}
var names = ObjectGetOwnPropertyNames(obj);
- for (var key in names) {
- var name = names[key];
+ for (var i = 0; i < names.length; i++) {
+ var name = names[i];
var desc = GetOwnProperty(obj, name);
if (desc.isConfigurable()) desc.setConfigurable(false);
DefineOwnProperty(obj, name, desc, true);
@@ -759,8 +759,8 @@
throw MakeTypeError("obj_ctor_property_non_object", ["freeze"]);
}
var names = ObjectGetOwnPropertyNames(obj);
- for (var key in names) {
- var name = names[key];
+ for (var i = 0; i < names.length; i++) {
+ var name = names[i];
var desc = GetOwnProperty(obj, name);
if (IsDataDescriptor(desc)) desc.setWritable(false);
if (desc.isConfigurable()) desc.setConfigurable(false);
@@ -786,8 +786,8 @@
throw MakeTypeError("obj_ctor_property_non_object", ["isSealed"]);
}
var names = ObjectGetOwnPropertyNames(obj);
- for (var key in names) {
- var name = names[key];
+ for (var i = 0; i < names.length; i++) {
+ var name = names[i];
var desc = GetOwnProperty(obj, name);
if (desc.isConfigurable()) return false;
}
@@ -804,8 +804,8 @@
throw MakeTypeError("obj_ctor_property_non_object", ["isFrozen"]);
}
var names = ObjectGetOwnPropertyNames(obj);
- for (var key in names) {
- var name = names[key];
+ for (var i = 0; i < names.length; i++) {
+ var name = names[i];
var desc = GetOwnProperty(obj, name);
if (IsDataDescriptor(desc) && desc.isWritable()) return false;
if (desc.isConfigurable()) return false;
=======================================
--- /branches/2.3/src/version.cc Wed Aug 25 08:26:24 2010
+++ /branches/2.3/src/version.cc Thu Aug 26 06:15:29 2010
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 3
#define BUILD_NUMBER 11
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
=======================================
--- /branches/2.3/test/cctest/cctest.status Wed Aug 25 08:26:24 2010
+++ /branches/2.3/test/cctest/cctest.status Thu Aug 26 06:15:29 2010
@@ -35,6 +35,11 @@
# BUG(382): Weird test. Can't guarantee that it never times out.
test-api/ApplyInterruption: PASS || TIMEOUT
+# Bug (484): This test which we thought was originally corrected in r5236
+# is reappering. Disabled until bug in test is fixed. This only fails
+# when snapshot is on, so I am marking it PASS || FAIL
+test-heap-profiler/HeapSnapshotsDiff: PASS || FAIL
+
# These tests always fail. They are here to test test.py. If
# they don't fail then test.py has failed.
test-serialize/TestThatAlwaysFails: FAIL
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
