| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "src/v8.h" | 5 #include "src/v8.h" |
| 6 | 6 |
| 7 #include "src/bootstrapper.h" | 7 #include "src/bootstrapper.h" |
| 8 #include "src/debug.h" | 8 #include "src/debug.h" |
| 9 #include "src/scopeinfo.h" | 9 #include "src/scopeinfo.h" |
| 10 | 10 |
| 11 namespace v8 { | 11 namespace v8 { |
| 12 namespace internal { | 12 namespace internal { |
| 13 | 13 |
| 14 Context* Context::declaration_context() { | 14 Context* Context::declaration_context() { |
| 15 Context* current = this; | 15 Context* current = this; |
| 16 while (!current->IsFunctionContext() && !current->IsNativeContext()) { | 16 while (!current->IsFunctionContext() && |
| 17 !(current->IsGlobalContext() && |
| 18 current->previous()->IsNativeContext()) && |
| 19 !current->IsNativeContext()) { |
| 17 current = current->previous(); | 20 current = current->previous(); |
| 18 ASSERT(current->closure() == closure()); | 21 ASSERT(current->closure() == closure()); |
| 19 } | 22 } |
| 20 return current; | 23 return current; |
| 21 } | 24 } |
| 22 | 25 |
| 23 | 26 |
| 24 JSBuiltinsObject* Context::builtins() { | 27 JSBuiltinsObject* Context::builtins() { |
| 25 GlobalObject* object = global_object(); | 28 GlobalObject* object = global_object(); |
| 26 if (object->IsJSGlobalObject()) { | 29 if (object->IsJSGlobalObject()) { |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 bool Context::IsBootstrappingOrGlobalObject(Isolate* isolate, Object* object) { | 370 bool Context::IsBootstrappingOrGlobalObject(Isolate* isolate, Object* object) { |
| 368 // During bootstrapping we allow all objects to pass as global | 371 // During bootstrapping we allow all objects to pass as global |
| 369 // objects. This is necessary to fix circular dependencies. | 372 // objects. This is necessary to fix circular dependencies. |
| 370 return isolate->heap()->gc_state() != Heap::NOT_IN_GC || | 373 return isolate->heap()->gc_state() != Heap::NOT_IN_GC || |
| 371 isolate->bootstrapper()->IsActive() || | 374 isolate->bootstrapper()->IsActive() || |
| 372 object->IsGlobalObject(); | 375 object->IsGlobalObject(); |
| 373 } | 376 } |
| 374 #endif | 377 #endif |
| 375 | 378 |
| 376 } } // namespace v8::internal | 379 } } // namespace v8::internal |
| OLD | NEW |