Fix bogus assertions for tracing and verify.

src/hydrogen.cc

 // Copyright 2012 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 509 matching lines @@
 
   int visited_count_;
   ZoneList<HBasicBlock*> stack_;
   BitVector reachable_;
   HBasicBlock* dont_visit_;
 };
 
 
 void HGraph::Verify(bool do_full_verify) const {
   Heap::RelocationLock(isolate()->heap());
-  AllowDeferredHandleDereference allow_deferred_deref;
+  AllowHandleDereference ahd;

[Michael Starzinger, 2013/06/06 15:22:40]

Can we rename these scopes to "allow_deref" and "allow_deferred_deref" here and
for the other occurrences?

+  AllowDeferredHandleDereference adhd;
   for (int i = 0; i < blocks_.length(); i++) {
     HBasicBlock* block = blocks_.at(i);
 
     block->Verify();
 
     // Check that every block contains at least one node and that only the last
     // node is a control instruction.
     HInstruction* current = block->first();
     ASSERT(current != NULL && current->IsBlockEntry());
     while (current != NULL) {
@@ skipping 4016 matching lines @@
 
 
 void HGraph::MarkLive(HValue* ref, HValue* instr, ZoneList<HValue*>* worklist) {
   if (!instr->CheckFlag(HValue::kIsLive)) {
     instr->SetFlag(HValue::kIsLive);
     worklist->Add(instr, zone());
 
     if (FLAG_trace_dead_code_elimination) {
       HeapStringAllocator allocator;
       StringStream stream(&allocator);
-      AllowDeferredHandleDereference debug_output;
+      AllowHandleDereference ahd;
+      AllowDeferredHandleDereference adhd;
       if (ref != NULL) {
         ref->PrintTo(&stream);
       } else {
         stream.Add("root ");
       }
       stream.Add(" -> ");
       instr->PrintTo(&stream);
       PrintF("[MarkLive %s]\n", *stream.ToCString());
     }
   }
@@ skipping 6663 matching lines @@
     CodeStub::Major major_key = info->code_stub()->MajorKey();
     PrintStringProperty("name", CodeStub::MajorName(major_key, false));
     PrintStringProperty("method", "stub");
   }
   PrintLongProperty("date", static_cast<int64_t>(OS::TimeCurrentMillis()));
 }
 
 
 void HTracer::TraceLithium(const char* name, LChunk* chunk) {
   ASSERT(!FLAG_parallel_recompilation);
-  AllowDeferredHandleDereference debug_output;
+  AllowHandleDereference ahd;
+  AllowDeferredHandleDereference adhd;
   Trace(name, chunk->graph(), chunk);
 }
 
 
 void HTracer::TraceHydrogen(const char* name, HGraph* graph) {
   ASSERT(!FLAG_parallel_recompilation);
-  AllowDeferredHandleDereference debug_output;
+  AllowHandleDereference ahd;
+  AllowDeferredHandleDereference adhd;
   Trace(name, graph, NULL);
 }
 
 
 void HTracer::Trace(const char* name, HGraph* graph, LChunk* chunk) {
   Tag tag(this, "cfg");
   PrintStringProperty("name", name);
   const ZoneList<HBasicBlock*>* blocks = graph->blocks();
   for (int i = 0; i < blocks->length(); i++) {
     HBasicBlock* current = blocks->at(i);
@@ skipping 330 matching lines @@
     }
   }
 
 #ifdef DEBUG
   if (graph_ != NULL) graph_->Verify(false);  // No full verify.
   if (allocator_ != NULL) allocator_->Verify();
 #endif
 }
 
 } }  // namespace v8::internal