Reviewers: ulan,
Description:
Merged r20033, r20138 into 3.23 branch.
Fix TransitionElementsKindStub to handle non-JSArray objects correctly.
Fix missing access check in Runtime_SetPrototype.
BUG=352982,chromium:354123
[email protected]
LOG=N
Please review this at https://codereview.chromium.org/212593003/
SVN Base: https://v8.googlecode.com/svn/branches/3.23
Affected files (+75, -20 lines):
M src/arm/lithium-codegen-arm.cc
M src/code-stubs-hydrogen.cc
M src/code-stubs.h
M src/ia32/lithium-codegen-ia32.cc
M src/mips/lithium-codegen-mips.cc
M src/runtime.cc
M src/version.cc
M src/x64/lithium-codegen-x64.cc
M test/cctest/test-api.cc
A + test/mjsunit/regress/regress-352982.js
Index: src/arm/lithium-codegen-arm.cc
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
index
0a3f043bc7619f647a5a06859497291a8b0e2295..fde0e418b9a7e531d3eb1688e70fec771bea09ac
100644
--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -4549,7 +4549,8 @@ void
LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
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);
Index: src/code-stubs-hydrogen.cc
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc
index
96cfc378476943483ab2f6dc862f3cf3389848f9..1e324277bad457b2601026c1f1eec2f4a38f16b8
100644
--- a/src/code-stubs-hydrogen.cc
+++ b/src/code-stubs-hydrogen.cc
@@ -659,7 +659,7 @@ HValue*
CodeStubGraphBuilder<TransitionElementsKindStub>::BuildCodeStub() {
GetParameter(1),
casted_stub()->from_kind(),
casted_stub()->to_kind(),
- true);
+ casted_stub()->is_js_array());
return GetParameter(0);
}
Index: src/code-stubs.h
diff --git a/src/code-stubs.h b/src/code-stubs.h
index
bedf295d2f9481913d041b9094951d7f4052b165..2ef254f29003604575e6ba68c449888ef769df2a
100644
--- a/src/code-stubs.h
+++ b/src/code-stubs.h
@@ -1866,9 +1866,11 @@ class KeyedStoreFastElementStub : public
HydrogenCodeStub {
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 {
@@ -1879,6 +1881,10 @@ class TransitionElementsKindStub : public
HydrogenCodeStub {
return ToKindBits::decode(bit_field_);
}
+ bool is_js_array() const {
+ return IsJSArrayBits::decode(bit_field_);
+ }
+
virtual Handle<Code> GenerateCode(Isolate* isolate);
virtual void InitializeInterfaceDescriptor(
@@ -1888,6 +1894,7 @@ class TransitionElementsKindStub : public
HydrogenCodeStub {
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; }
Index: src/ia32/lithium-codegen-ia32.cc
diff --git a/src/ia32/lithium-codegen-ia32.cc
b/src/ia32/lithium-codegen-ia32.cc
index
80369516dc8fb61670b2f426e5c83f1844a48211..450cdfc236a811e4c87d0c09aa43cec2668fbebf
100644
--- a/src/ia32/lithium-codegen-ia32.cc
+++ b/src/ia32/lithium-codegen-ia32.cc
@@ -4859,7 +4859,8 @@ void
LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
__ 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);
Index: src/mips/lithium-codegen-mips.cc
diff --git a/src/mips/lithium-codegen-mips.cc
b/src/mips/lithium-codegen-mips.cc
index
423ff9f505871a13dad184f2030ca57b6b5fe7df..0027eaee73ec4dd516f572be81c2c14399cab0cc
100644
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -4491,7 +4491,8 @@ void
LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
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);
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
8333380e83bbc4aa04fc0d548c0cc219a819e20e..3162163f35a12bbb5c72c6c7618fbb74aab3c99d
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -1668,6 +1668,14 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_SetPrototype)
{
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);
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
2d89ca8bd50fbf1c89f2ccbb2cceb8d8d68f0623..142fb9a27a5fe4e53187c2273ecf7d93a2efe65d
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 23
#define BUILD_NUMBER 17
-#define PATCH_LEVEL 28
+#define PATCH_LEVEL 29
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: src/x64/lithium-codegen-x64.cc
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
index
80024e78e17b10c4daf69ffe7355215050d1edff..3d4e31c797df7d68183a2d9b04c3f5173e6036ad
100644
--- a/src/x64/lithium-codegen-x64.cc
+++ b/src/x64/lithium-codegen-x64.cc
@@ -4387,7 +4387,8 @@ void
LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
__ movq(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);
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index
00cc8bccc294a6e139d7ed8b62a136e1e3798e27..29bb7335cba221d7de1a76c29168f907dfc0288f
100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -20903,3 +20903,30 @@ TEST(EscapeableHandleScope) {
}
}
}
+
+
+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.
+ 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);
+}
Index: test/mjsunit/regress/regress-352982.js
diff --git a/test/mjsunit/regress/regress-334708.js
b/test/mjsunit/regress/regress-352982.js
similarity index 79%
copy from test/mjsunit/regress/regress-334708.js
copy to test/mjsunit/regress/regress-352982.js
index
f0291bbdab61128baad9df89457d045b66644f1b..5d3ce1c67d2a42117de54b8a85ae981686698df7
100644
--- a/test/mjsunit/regress/regress-334708.js
+++ b/test/mjsunit/regress/regress-352982.js
@@ -25,18 +25,27 @@
// (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
+// Flags: --allow-natives-syntax --expose-gc
-function foo(x, y) {
- return Math.floor(x / y);
+function __f_4(i1) {
+ return __v_3[i1] * __v_3[0];
}
-
-function bar(x, y) {
- return foo(x + 1, y + 1);
+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;
}
-
-foo(16, "4");
-
-bar(64, 2);
-%OptimizeFunctionOnNextCall(bar);
-bar(64, 2);
+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();
--
--
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.
