Skip to content

V
V8
Commit e6c99b8c authored by machenbach's avatar machenbach Committed by Commit bot
Browse files
Options

Revert of Assume that ReportFailedAccessCheck always schedules an exception.... 

Revert of Assume that ReportFailedAccessCheck always schedules an exception. (patchset #1 id:1 of https://codereview.chromium.org/1420413002/ )

Reason for revert:
[Sheriff] Crashes in layout tests:
http://build.chromium.org/p/client.v8.fyi/builders/V8-Blink%20Linux%2064/builds/2539

#
# Fatal error in , line 0
# unreachable code
#

Original issue's description:
> Assume that ReportFailedAccessCheck always schedules an exception.
>
> R=verwaest@chromium.org
> BUG=
>
> Committed: https://crrev.com/effe76ad25c23bfd8be447930bd5d5126b1c9096
> Cr-Commit-Position: refs/heads/master@{#31560}

TBR=verwaest@chromium.org,neis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

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

Cr-Commit-Position: refs/heads/master@{#31571}
parent 8bcef0d7
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 15 deletions
src/builtins.cc
View file @ e6c99b8c
......@@ -1712,7 +1712,6 @@ MUST_USE_RESULT static MaybeHandle<Object> HandleApiCallHelper(
if (!isolate->MayAccess(handle(isolate->context()), js_receiver)) {
isolate->ReportFailedAccessCheck(js_receiver);
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
UNREACHABLE();
}
}
}
......
src/objects.cc
View file @ e6c99b8c
......@@ -1011,8 +1011,7 @@ MaybeHandle<Object> JSObject::GetPropertyWithFailedAccessCheck(
it->isolate()->ReportFailedAccessCheck(checked);
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(it->isolate(), Object);
UNREACHABLE();
return MaybeHandle<Object>();
return it->factory()->undefined_value();
}
......@@ -1031,8 +1030,7 @@ Maybe<PropertyAttributes> JSObject::GetPropertyAttributesWithFailedAccessCheck(
it->isolate()->ReportFailedAccessCheck(checked);
RETURN_VALUE_IF_SCHEDULED_EXCEPTION(it->isolate(),
Nothing<PropertyAttributes>());
UNREACHABLE();
return Nothing<PropertyAttributes>();
return Just(ABSENT);
}
......@@ -1061,6 +1059,8 @@ Maybe<bool> JSObject::SetPropertyWithFailedAccessCheck(
it->isolate()->ReportFailedAccessCheck(checked);
RETURN_VALUE_IF_SCHEDULED_EXCEPTION(it->isolate(), Nothing<bool>());
UNREACHABLE();
it->isolate()->Throw(
*it->isolate()->factory()->NewTypeError(MessageTemplate::kNoAccess));
return Nothing<bool>();
}
......@@ -4792,7 +4792,7 @@ MaybeHandle<Object> JSObject::DefineOwnPropertyIgnoreAttributes(
if (!it->HasAccess()) {
it->isolate()->ReportFailedAccessCheck(it->GetHolder<JSObject>());
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(it->isolate(), Object);
UNREACHABLE();
return value;
}
break;
......@@ -5821,7 +5821,7 @@ MaybeHandle<Object> JSReceiver::DeleteProperty(LookupIterator* it,
if (it->HasAccess()) break;
isolate->ReportFailedAccessCheck(it->GetHolder<JSObject>());
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
UNREACHABLE();
return it->factory()->false_value();
case LookupIterator::INTERCEPTOR: {
MaybeHandle<Object> maybe_result =
JSObject::DeletePropertyWithInterceptor(it);
......@@ -6782,6 +6782,8 @@ Maybe<bool> JSObject::PreventExtensions(Handle<JSObject> object,
isolate->ReportFailedAccessCheck(object);
RETURN_VALUE_IF_SCHEDULED_EXCEPTION(isolate, Nothing<bool>());
UNREACHABLE();
RETURN_FAILURE(isolate, should_throw,
NewTypeError(MessageTemplate::kNoAccess));
}
if (object->IsJSGlobalProxy()) {
......@@ -6877,6 +6879,8 @@ Maybe<bool> JSObject::PreventExtensionsWithTransition(
isolate->ReportFailedAccessCheck(object);
RETURN_VALUE_IF_SCHEDULED_EXCEPTION(isolate, Nothing<bool>());
UNREACHABLE();
RETURN_FAILURE(isolate, should_throw,
NewTypeError(MessageTemplate::kNoAccess));
}
if (object->IsJSGlobalProxy()) {
......@@ -7778,7 +7782,6 @@ MaybeHandle<FixedArray> JSReceiver::GetKeys(Handle<JSReceiver> object,
if (iter.IsAtEnd(PrototypeIterator::END_AT_NON_HIDDEN)) {
isolate->ReportFailedAccessCheck(current);
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, FixedArray);
UNREACHABLE();
}
break;
}
......@@ -7891,7 +7894,7 @@ MaybeHandle<Object> JSObject::DefineAccessor(LookupIterator* it,
if (!it->HasAccess()) {
isolate->ReportFailedAccessCheck(it->GetHolder<JSObject>());
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
UNREACHABLE();
return isolate->factory()->undefined_value();
}
it->Next();
}
......@@ -7956,7 +7959,7 @@ MaybeHandle<Object> JSObject::SetAccessor(Handle<JSObject> object,
if (!it.HasAccess()) {
isolate->ReportFailedAccessCheck(object);
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
UNREACHABLE();
return it.factory()->undefined_value();
}
it.Next();
}
......@@ -8003,7 +8006,7 @@ MaybeHandle<Object> JSObject::GetAccessor(Handle<JSObject> object,
if (it.HasAccess()) continue;
isolate->ReportFailedAccessCheck(it.GetHolder<JSObject>());
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
UNREACHABLE();
return isolate->factory()->undefined_value();
case LookupIterator::JSPROXY:
return isolate->factory()->undefined_value();
......
src/runtime/runtime-classes.cc
View file @ e6c99b8c
......@@ -272,7 +272,6 @@ static MaybeHandle<Object> LoadFromSuper(Isolate* isolate,
!isolate->MayAccess(handle(isolate->context()), home_object)) {
isolate->ReportFailedAccessCheck(home_object);
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
UNREACHABLE();
}
PrototypeIterator iter(isolate, home_object);
......@@ -298,7 +297,6 @@ static MaybeHandle<Object> LoadElementFromSuper(Isolate* isolate,
!isolate->MayAccess(handle(isolate->context()), home_object)) {
isolate->ReportFailedAccessCheck(home_object);
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
UNREACHABLE();
}
PrototypeIterator iter(isolate, home_object);
......@@ -376,7 +374,6 @@ static Object* StoreToSuper(Isolate* isolate, Handle<JSObject> home_object,
!isolate->MayAccess(handle(isolate->context()), home_object)) {
isolate->ReportFailedAccessCheck(home_object);
RETURN_FAILURE_IF_SCHEDULED_EXCEPTION(isolate);
UNREACHABLE();
}
PrototypeIterator iter(isolate, home_object);
......@@ -402,7 +399,6 @@ static Object* StoreElementToSuper(Isolate* isolate,
!isolate->MayAccess(handle(isolate->context()), home_object)) {
isolate->ReportFailedAccessCheck(home_object);
RETURN_FAILURE_IF_SCHEDULED_EXCEPTION(isolate);
UNREACHABLE();
}
PrototypeIterator iter(isolate, home_object);
......
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