Use source position table for unoptimized code.

test/cctest/interpreter/bytecode-expectations-printer.cc

 // Copyright 2016 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 "test/cctest/interpreter/bytecode-expectations-printer.h"
 
 #include <iomanip>
 #include <iostream>
 #include <vector>
 
 #include "include/libplatform/libplatform.h"
 #include "include/v8.h"
 
 #include "src/base/logging.h"
 #include "src/base/smart-pointers.h"
 #include "src/compiler.h"
 #include "src/runtime/runtime.h"
 
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecode-generator.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/interpreter/interpreter-intrinsics.h"
 #include "src/interpreter/interpreter.h"
-#include "src/interpreter/source-position-table.h"
+#include "src/source-position-table.h"
 
 namespace v8 {
 namespace internal {
 namespace interpreter {
 
 // static
 const char* const BytecodeExpectationsPrinter::kDefaultTopFunctionName =
     "__genbckexp_wrapper__";
 const char* const BytecodeExpectationsPrinter::kIndent = "  ";
 
@@ skipping 159 matching lines @@
     PrintBytecodeOperand(stream, bytecode_iterator, bytecode, op_index,
                          parameter_count);
   }
 }
 
 void BytecodeExpectationsPrinter::PrintSourcePosition(
     std::ostream& stream, SourcePositionTableIterator& source_iterator,
     int bytecode_offset) const {
   static const size_t kPositionWidth = 4;
   if (!source_iterator.done() &&
-      source_iterator.bytecode_offset() == bytecode_offset) {
+      source_iterator.code_offset() == bytecode_offset) {
     stream << "/* " << std::setw(kPositionWidth)
            << source_iterator.source_position();
     if (source_iterator.is_statement()) {
       stream << " S> */ ";
     } else {
       stream << " E> */ ";
     }
     source_iterator.Advance();
   } else {
     stream << "   " << std::setw(kPositionWidth) << ' ' << "       ";
@@ skipping 131 matching lines @@
 
   stream << "---\n";
   PrintCodeSnippet(stream, snippet);
   PrintBytecodeArray(stream, bytecode_array);
   stream << '\n';
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8