Use source position table for unoptimized code.

src/objects.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/objects.h"
 
 #include <cmath>
 #include <iomanip>
 #include <sstream>
 
@@ skipping 20 matching lines @@
 #include "src/execution.h"
 #include "src/field-index-inl.h"
 #include "src/field-index.h"
 #include "src/field-type.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/ic/ic.h"
 #include "src/identity-map.h"
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/interpreter.h"
-#include "src/interpreter/source-position-table.h"
 #include "src/isolate-inl.h"
 #include "src/keys.h"
 #include "src/list.h"
 #include "src/log.h"
 #include "src/lookup.h"
 #include "src/macro-assembler.h"
 #include "src/messages.h"
 #include "src/objects-body-descriptors-inl.h"
 #include "src/property-descriptor.h"
 #include "src/prototype.h"
 #include "src/regexp/jsregexp.h"
 #include "src/safepoint-table.h"
+#include "src/source-position-table.h"
 #include "src/string-builder.h"
 #include "src/string-search.h"
 #include "src/string-stream.h"
 #include "src/utils.h"
 #include "src/zone.h"
 
 #ifdef ENABLE_DISASSEMBLER
 #include "src/disasm.h"
 #include "src/disassembler.h"
 #endif
@@ skipping 13412 matching lines @@
     }
   }
   Assembler::FlushICache(GetIsolate(), instruction_start(), instruction_size());
 }
 
 // Locate the source position which is closest to the code offset. This is
 // using the source position information embedded in the relocation info.
 // The position returned is relative to the beginning of the script where the
 // source for this function is found.
 int Code::SourcePosition(int code_offset) {
+  int position = RelocInfo::kNoPosition;  // Initially no position found.
   // Subtract one because the current PC is one instruction after the call site.
-  Address pc = instruction_start() + code_offset - 1;
-  int position = RelocInfo::kNoPosition;  // Initially no position found.
+  code_offset--;
   // Find the closest position attached to a pc lower or equal to the current.
   // Note that the pc of reloc infos grow monotonically.
-  for (RelocIterator it(this, RelocInfo::kPositionMask);
-       !it.done() && it.rinfo()->pc() <= pc; it.next()) {
-    position = static_cast<int>(it.rinfo()->data());
+  if (kind() == FUNCTION) {
+    for (SourcePositionTableIterator it(source_position_table());
+         !it.done() && it.code_offset() <= code_offset; it.Advance()) {
+      position = it.source_position();
+    }
+  } else {
+    Address pc = instruction_start() + code_offset;
+    for (RelocIterator it(this, RelocInfo::kPositionMask);
+         !it.done() && it.rinfo()->pc() <= pc; it.next()) {
+      position = static_cast<int>(it.rinfo()->data());
+    }
   }
   DCHECK(kind() == FUNCTION || (is_optimized_code() && is_turbofanned()) ||
          is_wasm_code() || position == RelocInfo::kNoPosition);
   return position;
 }
 
 
 // Same as Code::SourcePosition above except it only looks for statement
 // positions.
 int Code::SourceStatementPosition(int code_offset) {
   // First find the closest position.
   int position = SourcePosition(code_offset);
   // Now find the closest statement position before the position.
   int statement_position = 0;
-  for (RelocIterator it(this, RelocInfo::kPositionMask); !it.done();
-       it.next()) {
-    if (RelocInfo::IsStatementPosition(it.rinfo()->rmode())) {
-      int p = static_cast<int>(it.rinfo()->data());
-      if (statement_position < p && p <= position) {
-        statement_position = p;
+  if (kind() == FUNCTION) {
+    for (SourcePositionTableIterator it(source_position_table()); !it.done();
+         it.Advance()) {
+      if (it.is_statement()) {
+        int p = it.source_position();
+        if (statement_position < p && p <= position) {
+          statement_position = p;
+        }
+      }
+    }
+  } else {
+    for (RelocIterator it(this, RelocInfo::kPositionMask); !it.done();
+         it.next()) {
+      if (RelocInfo::IsStatementPosition(it.rinfo()->rmode())) {
+        int p = static_cast<int>(it.rinfo()->data());
+        if (statement_position < p && p <= position) {
+          statement_position = p;
+        }
       }
     }
   }
   return statement_position;
 }
 
 
 SafepointEntry Code::GetSafepointEntry(Address pc) {
   SafepointTable table(this);
   return table.FindEntry(pc);
@@ skipping 780 matching lines @@
   os << "RelocInfo (size = " << relocation_size() << ")\n";
   for (RelocIterator it(this); !it.done(); it.next()) {
     it.rinfo()->Print(GetIsolate(), os);
   }
   os << "\n";
 }
 #endif  // ENABLE_DISASSEMBLER
 
 int BytecodeArray::SourcePosition(int offset) {
   int last_position = 0;
-  for (interpreter::SourcePositionTableIterator iterator(
-           source_position_table());
-       !iterator.done() && iterator.bytecode_offset() <= offset;
+  for (SourcePositionTableIterator iterator(source_position_table());
+       !iterator.done() && iterator.code_offset() <= offset;
        iterator.Advance()) {
     last_position = iterator.source_position();
   }
   return last_position;
 }
 
 int BytecodeArray::SourceStatementPosition(int offset) {
   // First find the closest position.
   int position = SourcePosition(offset);
   // Now find the closest statement position before the position.
   int statement_position = 0;
-  for (interpreter::SourcePositionTableIterator it(source_position_table());
-       !it.done(); it.Advance()) {
+  for (SourcePositionTableIterator it(source_position_table()); !it.done();
+       it.Advance()) {
     if (it.is_statement()) {
       int p = it.source_position();
       if (statement_position < p && p <= position) {
         statement_position = p;
       }
     }
   }
   return statement_position;
 }
 
 void BytecodeArray::Disassemble(std::ostream& os) {
   os << "Parameter count " << parameter_count() << "\n";
   os << "Frame size " << frame_size() << "\n";
 
   const uint8_t* base_address = GetFirstBytecodeAddress();
-  interpreter::SourcePositionTableIterator source_positions(
-      source_position_table());
+  SourcePositionTableIterator source_positions(source_position_table());
 
   interpreter::BytecodeArrayIterator iterator(handle(this));
   while (!iterator.done()) {
     if (!source_positions.done() &&
-        iterator.current_offset() == source_positions.bytecode_offset()) {
+        iterator.current_offset() == source_positions.code_offset()) {
       os << std::setw(5) << source_positions.source_position();
       os << (source_positions.is_statement() ? " S> " : " E> ");
       source_positions.Advance();
     } else {
       os << "         ";
     }
     const uint8_t* current_address = base_address + iterator.current_offset();
     os << reinterpret_cast<const void*>(current_address) << " @ "
        << std::setw(4) << iterator.current_offset() << " : ";
     interpreter::Bytecodes::Decode(os, current_address, parameter_count());
@@ skipping 4490 matching lines @@
   } else {
     // Old-style generators.
     int offset = continuation();
     CHECK(0 <= offset && offset < function()->code()->instruction_size());
     return function()->code()->SourcePosition(offset);
   }
 }
 
 }  // namespace internal
 }  // namespace v8