Merged r14658 into trunk branch.

src/disassembler.cc

Index: src/disassembler.cc
diff --git a/src/disassembler.cc b/src/disassembler.cc
index bbb1fb8d8ee7b1d72226a951ab1645d2a7e90a8d..e41734babdbe008d5eead38d53a7f5390fd6be43 100644
--- a/src/disassembler.cc
+++ b/src/disassembler.cc
@@ -293,7 +293,14 @@ static int DecodeIt(Isolate* isolate,
                                                 addr,
                                                 Deoptimizer::LAZY);
           if (id == Deoptimizer::kNotDeoptimizationEntry) {
-            out.AddFormatted("    ;; %s", RelocInfo::RelocModeName(rmode));
+            id = Deoptimizer::GetDeoptimizationId(isolate,
+                                                  addr,
+                                                  Deoptimizer::SOFT);
+            if (id == Deoptimizer::kNotDeoptimizationEntry) {
+              out.AddFormatted("    ;; %s", RelocInfo::RelocModeName(rmode));
+            } else {
+              out.AddFormatted("    ;; soft deoptimization bailout %d", id);
+            }
           } else {
             out.AddFormatted("    ;; lazy deoptimization bailout %d", id);
           }