Reviewers: Kevin Millikin, Mads Ager,
Description:
Fix --print-code-stubs during VM initialization
BUG=
TEST=
Please review this at http://codereview.chromium.org/6815007/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/assembler.cc
M src/disassembler.cc
Index: src/assembler.cc
diff --git a/src/assembler.cc b/src/assembler.cc
index
ff487720bc891e8d2d2b1981bb4f68362e8ac42e..ca30e19cb4d2d1544cb2d1778a80af7d1e997e14
100644
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -492,7 +492,8 @@ void RelocInfo::Print(FILE* out) {
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);
Index: src/disassembler.cc
diff --git a/src/disassembler.cc b/src/disassembler.cc
index
d142ef6af1623aab7d59ffa756c9433f1767730c..e757f9025305a9ad4e0e7852dd740701f3dd92f1
100644
--- a/src/disassembler.cc
+++ b/src/disassembler.cc
@@ -282,7 +282,8 @@ static int DecodeIt(FILE* f,
} 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
