Reviewers: Jakob,
Description:
Merged r11861 into 3.11 branch.
Fix crash bug in Hydrogen occurring with empty prototype chain.
BUG=115100
[email protected]
TEST=
Please review this at https://chromiumcodereview.appspot.com/10578036/
SVN Base: https://v8.googlecode.com/svn/branches/3.11
Affected files:
M src/hydrogen.cc
M src/version.cc
A test/mjsunit/regress/regress-115100.js
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
61488aff2aa935a69998e01c16804c355d719779..2c8a0f659c3a688fb1670c6164261c07c1d765d2
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -4698,7 +4698,7 @@ HInstruction*
HGraphBuilder::BuildStoreNamedField(HValue* object,
// If the property does not exist yet, we have to check that it wasn't
made
// readonly or turned into a setter by some meanwhile modifications on
the
// prototype chain.
- if (!lookup->IsProperty()) {
+ if (!lookup->IsProperty() && type->prototype()->IsJSReceiver()) {
Object* proto = type->prototype();
// First check that the prototype chain isn't affected already.
LookupResult proto_result(isolate());
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
e5efe47c0d9f092fc78fc06300b97fbb6a9b9a8d..4849c63b230e821e4d4d7ef851a135efebfc5990
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 11
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 8
+#define PATCH_LEVEL 9
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/regress/regress-115100.js
diff --git a/test/mjsunit/regress/regress-115100.js
b/test/mjsunit/regress/regress-115100.js
new file mode 100644
index
0000000000000000000000000000000000000000..c917446eff031ca1a8f1500a54f317eea407091c
--- /dev/null
+++ b/test/mjsunit/regress/regress-115100.js
@@ -0,0 +1,36 @@
+// Copyright 2012 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.
+
+// Flags: --allow-natives-syntax
+
+function foo(obj) { obj.prop = 0; }
+function mk() { return Object.create(null); }
+
+foo(mk());
+foo(mk());
+%OptimizeFunctionOnNextCall(foo);
+foo(mk());
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
