Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Unified Diff: src/execution.cc

Issue 1406113007: Merge GlobalObject with JSGlobalObject. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/debug/debug-scopes.cc ('k') | src/factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/execution.cc
diff --git a/src/execution.cc b/src/execution.cc
index 4b9417e967128a55e3ec0321a8967942208d8a66..ecf2d22f698f31f1893991a70c412479b5b70121 100644
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -58,7 +58,7 @@ MUST_USE_RESULT MaybeHandle<Object> Invoke(Isolate* isolate, bool is_construct,
Handle<Object> receiver, int argc,
Handle<Object> args[],
Handle<Object> new_target) {
- DCHECK(!receiver->IsGlobalObject());
+ DCHECK(!receiver->IsJSGlobalObject());
// Entering JavaScript.
VMState<JS> state(isolate);
@@ -131,9 +131,9 @@ MaybeHandle<Object> Execution::Call(Isolate* isolate, Handle<Object> callable,
// Convert calls on global objects to be calls on the global
// receiver instead to avoid having a 'this' pointer which refers
// directly to a global object.
- if (receiver->IsGlobalObject()) {
+ if (receiver->IsJSGlobalObject()) {
receiver =
- handle(Handle<GlobalObject>::cast(receiver)->global_proxy(), isolate);
+ handle(Handle<JSGlobalObject>::cast(receiver)->global_proxy(), isolate);
}
// api callbacks can be called directly.
@@ -152,7 +152,7 @@ MaybeHandle<Object> Execution::Call(Isolate* isolate, Handle<Object> callable,
isolate, receiver, Execution::ToObject(isolate, receiver), Object);
}
}
- DCHECK(function->context()->global_object()->IsGlobalObject());
+ DCHECK(function->context()->global_object()->IsJSGlobalObject());
auto value = Builtins::InvokeApiFunction(function, receiver, argc, argv);
bool has_exception = value.is_null();
DCHECK(has_exception == isolate->has_pending_exception());
« no previous file with comments | « src/debug/debug-scopes.cc ('k') | src/factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698