Commit a311c26d authored by yangguo@chromium.org's avatar yangguo@chromium.org

Expect requiring access check on objects with hidden properties.

R=ulan@chromium.org

Review URL: https://codereview.chromium.org/563723002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23860 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent a2add48b
...@@ -4714,12 +4714,8 @@ Object* JSObject::GetHiddenPropertiesHashTable() { ...@@ -4714,12 +4714,8 @@ Object* JSObject::GetHiddenPropertiesHashTable() {
Isolate* isolate = GetIsolate(); Isolate* isolate = GetIsolate();
LookupIterator it(handle(this), isolate->factory()->hidden_string(), LookupIterator it(handle(this), isolate->factory()->hidden_string(),
LookupIterator::OWN_SKIP_INTERCEPTOR); LookupIterator::OWN_SKIP_INTERCEPTOR);
CHECK_NE(LookupIterator::ACCESS_CHECK, it.state()); // Access check is always skipped for the hidden string anyways.
if (it.state() == LookupIterator::DATA) { return *GetDataProperty(&it);
return *it.GetDataValue();
}
DCHECK(!it.IsFound());
return GetHeap()->undefined_value();
} }
} }
......
...@@ -23016,3 +23016,22 @@ TEST(Regress411877) { ...@@ -23016,3 +23016,22 @@ TEST(Regress411877) {
context->Global()->Set(v8_str("o"), object_template->NewInstance()); context->Global()->Set(v8_str("o"), object_template->NewInstance());
CompileRun("Object.getOwnPropertyNames(o)"); CompileRun("Object.getOwnPropertyNames(o)");
} }
TEST(GetHiddenPropertyTableAfterAccessCheck) {
v8::Isolate* isolate = CcTest::isolate();
v8::HandleScope handle_scope(isolate);
v8::Handle<v8::ObjectTemplate> object_template =
v8::ObjectTemplate::New(isolate);
object_template->SetAccessCheckCallbacks(NamedAccessCounter,
IndexedAccessCounter);
v8::Handle<Context> context = Context::New(isolate);
v8::Context::Scope context_scope(context);
v8::Handle<v8::Object> obj = object_template->NewInstance();
obj->Set(v8_str("key"), v8_str("value"));
obj->Delete(v8_str("key"));
obj->SetHiddenValue(v8_str("hidden key 2"), v8_str("hidden value 2"));
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment