[Isolates] Use ::GetHeap() more often....

src/contexts.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 58 matching lines @@
   return global_context()->global_proxy_object();
 }
 
 void Context::set_global_proxy(JSObject* object) {
   global_context()->set_global_proxy_object(object);
 }
 
 
 Handle<Object> Context::Lookup(Handle<String> name, ContextLookupFlags flags,
                                int* index_, PropertyAttributes* attributes) {
+  Heap* heap = GetHeap();
   Handle<Context> context(this);
 
   bool follow_context_chain = (flags & FOLLOW_CONTEXT_CHAIN) != 0;
   *index_ = -1;
   *attributes = ABSENT;
 
   if (FLAG_trace_contexts) {
     PrintF("Context::Lookup(");
     name->ShortPrint();
     PrintF(")\n");
@@ skipping 59 matching lines @@
           case Variable::TEMPORARY: UNREACHABLE(); break;
         }
         return context;
       }
 
       // check parameter locals in context
       int param_index = scope_info->ParameterIndex(*name);
       if (param_index >= 0) {
         // slot found.
         int index =
-            scope_info->ContextSlotIndex(HEAP->arguments_shadow_symbol(), NULL);
+            scope_info->ContextSlotIndex(heap->arguments_shadow_symbol(), NULL);
         ASSERT(index >= 0);  // arguments must exist and be in the heap context
         Handle<JSObject> arguments(JSObject::cast(context->get(index)));
-        ASSERT(arguments->HasLocalProperty(HEAP->length_symbol()));
+        ASSERT(arguments->HasLocalProperty(heap->length_symbol()));
         if (FLAG_trace_contexts) {
           PrintF("=> found parameter %d in arguments object\n", param_index);
         }
         *index_ = param_index;
         *attributes = NONE;
         return arguments;
       }
 
       // check intermediate context (holding only the function name variable)
       if (follow_context_chain) {
@@ skipping 76 matching lines @@
 
 bool Context::IsBootstrappingOrGlobalObject(Object* object) {
   // During bootstrapping we allow all objects to pass as global
   // objects. This is necessary to fix circular dependencies.
   return Isolate::Current()->bootstrapper()->IsActive() ||
       object->IsGlobalObject();
 }
 #endif
 
 } }  // namespace v8::internal