[interpreter] Fix stale DCHECK in tracing.

src/runtime/runtime-interpreter.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/runtime/runtime-utils.h"
 
 #include <iomanip>
 
 #include "src/arguments.h"
 #include "src/frames-inl.h"
@@ skipping 17 matching lines @@
 
 namespace {
 
 void AdvanceToOffsetForTracing(
     interpreter::BytecodeArrayIterator& bytecode_iterator, int offset) {
   while (bytecode_iterator.current_offset() +
              bytecode_iterator.current_bytecode_size() <=
          offset) {
     bytecode_iterator.Advance();
   }
-  DCHECK_EQ(offset, bytecode_iterator.current_offset());
+  DCHECK(bytecode_iterator.current_offset() == offset ||
+         ((bytecode_iterator.current_offset() + 1) == offset &&
+          bytecode_iterator.current_operand_scale() >
+              interpreter::OperandScale::kSingle));
 }
 
 void PrintRegisters(std::ostream& os, bool is_input,
                     interpreter::BytecodeArrayIterator& bytecode_iterator,
                     Handle<Object> accumulator) {
   static const int kRegFieldWidth = static_cast<int>(strlen("accumulator"));
   static const char* kInputColourCode = "\033[0;36m";
   static const char* kOutputColourCode = "\033[0;35m";
   static const char* kNormalColourCode = "\033[0;m";
   const char* kArrowDirection = is_input ? " -> " : " <- ";
@@ skipping 55 matching lines @@
   CONVERT_ARG_HANDLE_CHECKED(Object, accumulator, 2);
   OFStream os(stdout);
 
   int offset = bytecode_offset - BytecodeArray::kHeaderSize + kHeapObjectTag;
   interpreter::BytecodeArrayIterator bytecode_iterator(bytecode_array);
   AdvanceToOffsetForTracing(bytecode_iterator, offset);
   if (offset == bytecode_iterator.current_offset()) {
     // Print bytecode.
     const uint8_t* bytecode_address =
         reinterpret_cast<const uint8_t*>(*bytecode_array) + bytecode_offset;
-    Vector<char> buf = Vector<char>::New(50);
-    SNPrintF(buf, "%p", bytecode_address);
-    os << " -> " << buf.start() << " (" << bytecode_offset << ") : ";
+    os << " -> " << static_cast<const void*>(bytecode_address)
+       << " (" << bytecode_offset << ") : ";
     interpreter::Bytecodes::Decode(os, bytecode_address,
                                    bytecode_array->parameter_count());
     os << std::endl;
     // Print all input registers and accumulator.
     PrintRegisters(os, true, bytecode_iterator, accumulator);
 
     os << std::flush;
   }
   return isolate->heap()->undefined_value();
 }
@@ skipping 33 matching lines @@
 RUNTIME_FUNCTION(Runtime_InterpreterSetPendingMessage) {
   SealHandleScope shs(isolate);
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(Object, message, 0);
   isolate->thread_local_top()->pending_message_obj_ = *message;
   return isolate->heap()->undefined_value();
 }
 
 }  // namespace internal
 }  // namespace v8