[Isolates] Clean up some usages of the heap macro.

src/heap-inl.h

 // 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 460 matching lines @@
   bool old = allocation_allowed_;
   allocation_allowed_ = new_state;
   return old;
 }
 
 #endif
 
 
 void ExternalStringTable::AddString(String* string) {
   ASSERT(string->IsExternalString());
-  if (HEAP->InNewSpace(string)) {
+  if (heap_->InNewSpace(string)) {
     new_space_strings_.Add(string);
   } else {
     old_space_strings_.Add(string);
   }
 }
 
 
 void ExternalStringTable::Iterate(ObjectVisitor* v) {
   if (!new_space_strings_.is_empty()) {
     Object** start = &new_space_strings_[0];
     v->VisitPointers(start, start + new_space_strings_.length());
   }
   if (!old_space_strings_.is_empty()) {
     Object** start = &old_space_strings_[0];
     v->VisitPointers(start, start + old_space_strings_.length());
   }
 }
 
 
 // Verify() is inline to avoid ifdef-s around its calls in release
 // mode.
 void ExternalStringTable::Verify() {
 #ifdef DEBUG
   for (int i = 0; i < new_space_strings_.length(); ++i) {
-    ASSERT(HEAP->InNewSpace(new_space_strings_[i]));
+    ASSERT(heap_->InNewSpace(new_space_strings_[i]));
     ASSERT(new_space_strings_[i] != HEAP->raw_unchecked_null_value());
   }
   for (int i = 0; i < old_space_strings_.length(); ++i) {
-    ASSERT(!HEAP->InNewSpace(old_space_strings_[i]));
+    ASSERT(!heap_->InNewSpace(old_space_strings_[i]));
     ASSERT(old_space_strings_[i] != HEAP->raw_unchecked_null_value());
   }
 #endif
 }
 
 
 void ExternalStringTable::AddOldString(String* string) {
   ASSERT(string->IsExternalString());
-  ASSERT(!HEAP->InNewSpace(string));
+  ASSERT(!heap_->InNewSpace(string));
   old_space_strings_.Add(string);
 }
 
 
 void ExternalStringTable::ShrinkNewStrings(int position) {
   new_space_strings_.Rewind(position);
   Verify();
 }
 
 
 void Heap::ClearInstanceofCache() {
-  set_instanceof_cache_function(HEAP->the_hole_value());
+  set_instanceof_cache_function(the_hole_value());
 }
 
 
 Object* Heap::ToBoolean(bool condition) {
   return condition ? true_value() : false_value();
 }
 
 
 void Heap::CompletelyClearInstanceofCache() {
   set_instanceof_cache_map(the_hole_value());
@@ skipping 48 matching lines @@
 #ifdef DEBUG
   UpdateLiveObjectCount(obj);
 #endif
   obj->SetMark();
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_INL_H_