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

Unified Diff: src/contexts.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/contexts.h ('k') | src/contexts-inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/contexts.cc
diff --git a/src/contexts.cc b/src/contexts.cc
index 79167f6edf7a770a4a990d74f6cfd9e71c0acfa6..9da13fe9e8a00665090f207aa7c6d7066d234bb4 100644
--- a/src/contexts.cc
+++ b/src/contexts.cc
@@ -133,7 +133,7 @@ Context* Context::native_context() {
// The global object has a direct pointer to the native context. If the
// following DCHECK fails, the native context is probably being accessed
// indirectly during bootstrapping. This is unsupported.
- DCHECK(global_object()->IsGlobalObject());
+ DCHECK(global_object()->IsJSGlobalObject());
return global_object()->native_context();
}
@@ -573,8 +573,7 @@ bool Context::IsBootstrappingOrGlobalObject(Isolate* isolate, Object* object) {
// During bootstrapping we allow all objects to pass as global
// objects. This is necessary to fix circular dependencies.
return isolate->heap()->gc_state() != Heap::NOT_IN_GC ||
- isolate->bootstrapper()->IsActive() ||
- object->IsGlobalObject();
+ isolate->bootstrapper()->IsActive() || object->IsJSGlobalObject();
}
#endif
« no previous file with comments | « src/contexts.h ('k') | src/contexts-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698