Revision: 20269
Author: [email protected]
Date: Wed Mar 26 10:32:37 2014 UTC
Log: Merged r20033, r20138 into 3.24 branch.
Fix TransitionElementsKindStub to handle non-JSArray objects correctly.
Fix missing access check in Runtime_SetPrototype.
BUG=352982,chromium:354123
[email protected]
LOG=N
Review URL: https://codereview.chromium.org/212623002
http://code.google.com/p/v8/source/detail?r=20269
Added:
/branches/3.24/test/mjsunit/regress/regress-352982.js
Modified:
/branches/3.24/src/arm/lithium-codegen-arm.cc
/branches/3.24/src/code-stubs-hydrogen.cc
/branches/3.24/src/code-stubs.h
/branches/3.24/src/ia32/lithium-codegen-ia32.cc
/branches/3.24/src/mips/lithium-codegen-mips.cc
/branches/3.24/src/runtime.cc
/branches/3.24/src/version.cc
/branches/3.24/src/x64/lithium-codegen-x64.cc
/branches/3.24/test/cctest/test-api.cc
=======================================
--- /dev/null
+++ /branches/3.24/test/mjsunit/regress/regress-352982.js Wed Mar 26
10:32:37 2014 UTC
@@ -0,0 +1,51 @@
+// Copyright 2014 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 --expose-gc
+
+function __f_4(i1) {
+ return __v_3[i1] * __v_3[0];
+}
+function __f_3(i1) {
+ __f_4(i1);
+ __f_4(i1 + 16);
+ __f_4(i1 + 32);
+ %OptimizeFunctionOnNextCall(__f_4);
+ var x = __f_4(i1 + 993);
+ return x;
+}
+function __f_5() {
+ __v_3[0] = +__v_3[0];
+ gc();
+ __f_3(0) | 0;
+ __v_3 = /\u23a1|x/;
+ return 0;
+}
+var __v_3 = new Float32Array(1000);
+__f_5();
+__f_5();
+__f_5();
=======================================
--- /branches/3.24/src/arm/lithium-codegen-arm.cc Wed Mar 19 12:50:00 2014
UTC
+++ /branches/3.24/src/arm/lithium-codegen-arm.cc Wed Mar 26 10:32:37 2014
UTC
@@ -4408,7 +4408,8 @@
this, Safepoint::kWithRegistersAndDoubles);
__ Move(r0, object_reg);
__ Move(r1, to_map);
- TransitionElementsKindStub stub(from_kind, to_kind);
+ bool is_js_array = from_map->instance_type() == JS_ARRAY_TYPE;
+ TransitionElementsKindStub stub(from_kind, to_kind, is_js_array);
__ CallStub(&stub);
RecordSafepointWithRegistersAndDoubles(
instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
=======================================
--- /branches/3.24/src/code-stubs-hydrogen.cc Wed Feb 5 03:04:56 2014 UTC
+++ /branches/3.24/src/code-stubs-hydrogen.cc Wed Mar 26 10:32:37 2014 UTC
@@ -618,7 +618,7 @@
GetParameter(1),
casted_stub()->from_kind(),
casted_stub()->to_kind(),
- true);
+ casted_stub()->is_js_array());
return GetParameter(0);
}
=======================================
--- /branches/3.24/src/code-stubs.h Sat Feb 1 08:54:43 2014 UTC
+++ /branches/3.24/src/code-stubs.h Wed Mar 26 10:32:37 2014 UTC
@@ -2009,9 +2009,11 @@
class TransitionElementsKindStub : public HydrogenCodeStub {
public:
TransitionElementsKindStub(ElementsKind from_kind,
- ElementsKind to_kind) {
+ ElementsKind to_kind,
+ bool is_js_array) {
bit_field_ = FromKindBits::encode(from_kind) |
- ToKindBits::encode(to_kind);
+ ToKindBits::encode(to_kind) |
+ IsJSArrayBits::encode(is_js_array);
}
ElementsKind from_kind() const {
@@ -2021,6 +2023,10 @@
ElementsKind to_kind() const {
return ToKindBits::decode(bit_field_);
}
+
+ bool is_js_array() const {
+ return IsJSArrayBits::decode(bit_field_);
+ }
virtual Handle<Code> GenerateCode(Isolate* isolate);
@@ -2031,6 +2037,7 @@
private:
class FromKindBits: public BitField<ElementsKind, 8, 8> {};
class ToKindBits: public BitField<ElementsKind, 0, 8> {};
+ class IsJSArrayBits: public BitField<bool, 16, 1> {};
uint32_t bit_field_;
Major MajorKey() { return TransitionElementsKind; }
=======================================
--- /branches/3.24/src/ia32/lithium-codegen-ia32.cc Wed Mar 19 12:50:00
2014 UTC
+++ /branches/3.24/src/ia32/lithium-codegen-ia32.cc Wed Mar 26 10:32:37
2014 UTC
@@ -4698,7 +4698,8 @@
__ mov(eax, object_reg);
}
__ mov(ebx, to_map);
- TransitionElementsKindStub stub(from_kind, to_kind);
+ bool is_js_array = from_map->instance_type() == JS_ARRAY_TYPE;
+ TransitionElementsKindStub stub(from_kind, to_kind, is_js_array);
__ CallStub(&stub);
RecordSafepointWithRegisters(
instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
=======================================
--- /branches/3.24/src/mips/lithium-codegen-mips.cc Wed Mar 19 12:50:00
2014 UTC
+++ /branches/3.24/src/mips/lithium-codegen-mips.cc Wed Mar 26 10:32:37
2014 UTC
@@ -4343,7 +4343,8 @@
this, Safepoint::kWithRegistersAndDoubles);
__ mov(a0, object_reg);
__ li(a1, Operand(to_map));
- TransitionElementsKindStub stub(from_kind, to_kind);
+ bool is_js_array = from_map->instance_type() == JS_ARRAY_TYPE;
+ TransitionElementsKindStub stub(from_kind, to_kind, is_js_array);
__ CallStub(&stub);
RecordSafepointWithRegistersAndDoubles(
instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
=======================================
--- /branches/3.24/src/runtime.cc Tue Mar 25 07:48:31 2014 UTC
+++ /branches/3.24/src/runtime.cc Wed Mar 26 10:32:37 2014 UTC
@@ -1683,6 +1683,14 @@
ASSERT(args.length() == 2);
CONVERT_ARG_HANDLE_CHECKED(JSObject, obj, 0);
CONVERT_ARG_HANDLE_CHECKED(Object, prototype, 1);
+ if (obj->IsAccessCheckNeeded() &&
+ !isolate->MayNamedAccessWrapper(obj,
+ isolate->factory()->proto_string(),
+ v8::ACCESS_SET)) {
+ isolate->ReportFailedAccessCheck(*obj, v8::ACCESS_SET);
+ RETURN_IF_SCHEDULED_EXCEPTION(isolate);
+ return isolate->heap()->undefined_value();
+ }
if (FLAG_harmony_observation && obj->map()->is_observed()) {
Handle<Object> old_value(
GetPrototypeSkipHiddenPrototypes(isolate, *obj), isolate);
=======================================
--- /branches/3.24/src/version.cc Tue Mar 25 07:48:31 2014 UTC
+++ /branches/3.24/src/version.cc Wed Mar 26 10:32:37 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 24
#define BUILD_NUMBER 35
-#define PATCH_LEVEL 19
+#define PATCH_LEVEL 20
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
=======================================
--- /branches/3.24/src/x64/lithium-codegen-x64.cc Wed Mar 19 12:50:00 2014
UTC
+++ /branches/3.24/src/x64/lithium-codegen-x64.cc Wed Mar 26 10:32:37 2014
UTC
@@ -4295,7 +4295,8 @@
__ movp(rax, object_reg);
}
__ Move(rbx, to_map);
- TransitionElementsKindStub stub(from_kind, to_kind);
+ bool is_js_array = from_map->instance_type() == JS_ARRAY_TYPE;
+ TransitionElementsKindStub stub(from_kind, to_kind, is_js_array);
__ CallStub(&stub);
RecordSafepointWithRegisters(
instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
=======================================
--- /branches/3.24/test/cctest/test-api.cc Mon Feb 10 09:01:23 2014 UTC
+++ /branches/3.24/test/cctest/test-api.cc Wed Mar 26 10:32:37 2014 UTC
@@ -21965,3 +21965,48 @@
checker.Run(true, false);
checker.Run(false, false);
}
+
+
+TEST(Regress354123) {
+ LocalContext current;
+ v8::Isolate* isolate = current->GetIsolate();
+ v8::HandleScope scope(isolate);
+
+ v8::Handle<v8::ObjectTemplate> templ = v8::ObjectTemplate::New(isolate);
+ templ->SetAccessCheckCallbacks(NamedAccessCounter, IndexedAccessCounter);
+ current->Global()->Set(v8_str("friend"), templ->NewInstance());
+
+ // Test access using __proto__ from the prototype chain.
+ named_access_count = 0;
+ CompileRun("friend.__proto__ = {};");
+ CHECK_EQ(2, named_access_count);
+ CompileRun("friend.__proto__;");
+ CHECK_EQ(4, named_access_count);
+
+ // Test access using __proto__ as a hijacked function (A).
+ named_access_count = 0;
+ CompileRun("var p = Object.prototype;"
+ "var f = Object.getOwnPropertyDescriptor(p, '__proto__').set;"
+ "f.call(friend, {});");
+ CHECK_EQ(1, named_access_count);
+ CompileRun("var p = Object.prototype;"
+ "var f = Object.getOwnPropertyDescriptor(p, '__proto__').get;"
+ "f.call(friend);");
+ CHECK_EQ(2, named_access_count);
+
+ // Test access using __proto__ as a hijacked function (B).
+ named_access_count = 0;
+ CompileRun("var f = Object.prototype.__lookupSetter__('__proto__');"
+ "f.call(friend, {});");
+ CHECK_EQ(1, named_access_count);
+ CompileRun("var f = Object.prototype.__lookupGetter__('__proto__');"
+ "f.call(friend);");
+ CHECK_EQ(2, named_access_count);
+
+ // Test access using Object.setPrototypeOf reflective method.
+ named_access_count = 0;
+ CompileRun("Object.setPrototypeOf(friend, {});");
+ CHECK_EQ(1, named_access_count);
+ CompileRun("Object.getPrototypeOf(friend);");
+ CHECK_EQ(2, named_access_count);
+}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
