Reviewers: Mads Ager,
Message:
Mads,
may you have a look?
Description:
Use [[DefineOwnProperty]] to put 'constructor' field on the protoype object.
That better follows ECMA-262 (see 13.2 Creating Function Objects) and allows
to ignore nasty JS accessors for 'constructor' property.
BUG=v8:1172
TEST=test/mjsunit/regress/regress-1172.js
Please review this at http://codereview.chromium.org/6531037/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/heap.cc
M src/runtime.cc
M test/mjsunit/mjsunit.js
A test/mjsunit/regress/regress-1172.js
Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index
f88ebda53d117dfd5b283b513f7743824f1d408c..87c0f549c2bbae5192b31c192486771c9019fee0
100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -2924,9 +2924,8 @@ MaybeObject*
Heap::AllocateFunctionPrototype(JSFunction* function) {
// constructor to the function.
Object* result;
{ MaybeObject* maybe_result =
- JSObject::cast(prototype)->SetProperty(constructor_symbol(),
- function,
- DONT_ENUM);
+ JSObject::cast(prototype)->SetLocalPropertyIgnoreAttributes(
+ constructor_symbol(), function, DONT_ENUM);
if (!maybe_result->ToObject(&result)) return maybe_result;
}
return prototype;
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
48ff69f5d273071e0615743e2b2760f2abb71e70..215dada014f36c965583dc23acaaa8f0fd445cb8
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -6927,6 +6927,7 @@ static MaybeObject* Runtime_NewObject(Arguments args)
{
bool first_allocation = !shared->live_objects_may_exist();
Handle<JSObject> result = Factory::NewJSObject(function);
+ RETURN_IF_EMPTY_HANDLE(result);
// Delay setting the stub if inobject slack tracking is in progress.
if (first_allocation && !shared->IsInobjectSlackTrackingInProgress()) {
TrySettingInlineConstructStub(function);
Index: test/mjsunit/mjsunit.js
diff --git a/test/mjsunit/mjsunit.js b/test/mjsunit/mjsunit.js
index
558282f52bb39126003503fac3aedeb94f27ecff..fe580f35005a42b4e404c3003092a17118ff3252
100644
--- a/test/mjsunit/mjsunit.js
+++ b/test/mjsunit/mjsunit.js
@@ -104,6 +104,13 @@ function deepEquals(a, b) {
}
+function assertSame(expected, found, name_opt) {
+ if (found !== expected) {
+ fail(expected, found, name_opt);
+ }
+}
+
+
function assertEquals(expected, found, name_opt) {
if (!deepEquals(found, expected)) {
fail(expected, found, name_opt);
Index: test/mjsunit/regress/regress-1172.js
diff --git a/test/mjsunit/regress/regress-1172.js
b/test/mjsunit/regress/regress-1172.js
new file mode 100644
index
0000000000000000000000000000000000000000..f5ef67b86ec99e3d67db53fcd6037a9970874086
--- /dev/null
+++ b/test/mjsunit/regress/regress-1172.js
@@ -0,0 +1,39 @@
+// Copyright 2011 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.
+
+// Check that 'constructor' property is forcefully installed on
+// function's prototype even in the presence of JS accessors.
+
+// Note: no setters would lead to runtime exception if we ever attempt
+// to use JS accessors to set 'constructor' property.
+Object.prototype.__defineGetter__('constructor', function() { throw 42; });
+
+function f() {}
+assertSame(f, f.prototype.constructor);
+
+var o = new f();
+assertSame(f, o.constructor);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
