Revision: 7539
Author:   [email protected]
Date:     Thu Apr  7 04:29:40 2011
Log:      Fix --print-code-stubs during VM initialization

BUG=
TEST=

Review URL: http://codereview.chromium.org/6815007
http://code.google.com/p/v8/source/detail?r=7539

Modified:
 /branches/bleeding_edge/src/assembler.cc
 /branches/bleeding_edge/src/disassembler.cc

=======================================
--- /branches/bleeding_edge/src/assembler.cc    Wed Mar 30 07:17:39 2011
+++ /branches/bleeding_edge/src/assembler.cc    Thu Apr  7 04:29:40 2011
@@ -492,7 +492,8 @@
            target_address());
   } else if (IsPosition(rmode_)) {
     PrintF(out, "  (%" V8_PTR_PREFIX "d)", data());
-  } else if (rmode_ == RelocInfo::RUNTIME_ENTRY) {
+  } else if (rmode_ == RelocInfo::RUNTIME_ENTRY &&
+             Isolate::Current()->deoptimizer_data() != NULL) {
     // Depotimization bailouts are stored as runtime entries.
     int id = Deoptimizer::GetDeoptimizationId(
         target_address(), Deoptimizer::EAGER);
=======================================
--- /branches/bleeding_edge/src/disassembler.cc Fri Mar 18 13:35:07 2011
+++ /branches/bleeding_edge/src/disassembler.cc Thu Apr  7 04:29:40 2011
@@ -282,7 +282,8 @@
         } else {
           out.AddFormatted(" %s", Code::Kind2String(kind));
         }
-      } else if (rmode == RelocInfo::RUNTIME_ENTRY) {
+      } else if (rmode == RelocInfo::RUNTIME_ENTRY &&
+                 Isolate::Current()->deoptimizer_data() != NULL) {
         // A runtime entry reloinfo might be a deoptimization bailout.
         Address addr = relocinfo.target_address();
int id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::EAGER);

--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to