Reviewers: Søren Gjesse,
Description:
Bring r5364,r5365 to 2.2 branch.
Please review this at http://codereview.chromium.org/3218005/show
SVN Base: http://v8.googlecode.com/svn/branches/2.2/
Affected files:
M src/objects.cc
A + test/mjsunit/regress/regress-851.js
### BEGIN SVN COPY METADATA
#$ svn cp -r 5364
branches/bleeding_edge/test/mjsunit/regress/regress-851.js
test/mjsunit/regress/regress-851.js ### WARNING: note non-trunk copy
### END SVN COPY METADATA
Index: src/objects.cc
===================================================================
--- src/objects.cc (revision 5366)
+++ src/objects.cc (working copy)
@@ -2584,7 +2584,8 @@
Object* JSObject::PreventExtensions() {
// If there are fast elements we normalize.
if (HasFastElements()) {
- NormalizeElements();
+ Object* ok = NormalizeElements();
+ if (ok->IsFailure()) return ok;
}
// Make sure that we never go back to fast case.
element_dictionary()->set_requires_slow_elements();
Index: test/mjsunit/regress/regress-851.js
===================================================================
--- test/mjsunit/regress/regress-851.js (revision 5366)
+++ test/mjsunit/regress/regress-851.js (working copy)
@@ -28,5 +28,5 @@
var i = 0;
for (var i = 0; i < 10000; i++) {
Object.freeze({});
- assertFalse(JSON.stringify({x: null}).match(/\0/));
+ assertNull(JSON.stringify({x: null}).match(/\0/));
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
