Revision f230a1cf deps/v8/src/log.cc

View differences:

deps/v8/src/log.cc
212 212
                                      Code* code,
213 213
                                      SharedFunctionInfo* shared,
214 214
                                      CompilationInfo* info,
215
                                      Name* source, int line) {
215
                                      Name* source, int line, int column) {
216 216
  name_buffer_->Init(tag);
217 217
  name_buffer_->AppendBytes(ComputeMarker(code));
218 218
  name_buffer_->AppendString(shared->DebugName());
......
1232 1232
                             SharedFunctionInfo* shared,
1233 1233
                             CompilationInfo* info,
1234 1234
                             Name* source, int line, int column) {
1235
  PROFILER_LOG(CodeCreateEvent(tag, code, shared, info, source, line));
1235
  PROFILER_LOG(CodeCreateEvent(tag, code, shared, info, source, line, column));
1236 1236

  
1237 1237
  if (!is_logging_code_events()) return;
1238
  CALL_LISTENERS(CodeCreateEvent(tag, code, shared, info, source, line));
1238
  CALL_LISTENERS(CodeCreateEvent(tag, code, shared, info, source, line,
1239
                                 column));
1239 1240

  
1240 1241
  if (!FLAG_log_code || !log_->IsEnabled()) return;
1241 1242
  Log::MessageBuilder msg(log_);
......
1610 1611
    case Code::FUNCTION:
1611 1612
    case Code::OPTIMIZED_FUNCTION:
1612 1613
      return;  // We log this later using LogCompiledFunctions.
1613
    case Code::BINARY_OP_IC:   // fall through
1614
    case Code::BINARY_OP_IC: {
1615
      BinaryOpStub stub(code_object->extended_extra_ic_state());
1616
      description = stub.GetName().Detach();
1617
      tag = Logger::STUB_TAG;
1618
      break;
1619
    }
1614 1620
    case Code::COMPARE_IC:  // fall through
1615 1621
    case Code::COMPARE_NIL_IC:   // fall through
1616 1622
    case Code::TO_BOOLEAN_IC:  // fall through
......
1629 1635
      description = "A builtin from the snapshot";
1630 1636
      tag = Logger::BUILTIN_TAG;
1631 1637
      break;
1638
    case Code::HANDLER:
1639
      description = "An IC handler from the snapshot";
1640
      tag = Logger::HANDLER_TAG;
1641
      break;
1632 1642
    case Code::KEYED_LOAD_IC:
1633 1643
      description = "A keyed load IC from the snapshot";
1634 1644
      tag = Logger::KEYED_LOAD_IC_TAG;
......
1765 1775

  
1766 1776

  
1767 1777
static void AddIsolateIdIfNeeded(Isolate* isolate, StringStream* stream) {
1768
  if (isolate->IsDefaultIsolate()) return;
1778
  if (isolate->IsDefaultIsolate() || !FLAG_logfile_per_isolate) return;
1769 1779
  stream->Add("isolate-%p-", isolate);
1770 1780
}
1771 1781

  
1772 1782

  
1773 1783
static SmartArrayPointer<const char> PrepareLogFileName(
1774 1784
    Isolate* isolate, const char* file_name) {
1775
  if (strchr(file_name, '%') != NULL ||
1776
      !isolate->IsDefaultIsolate()) {
1785
  if (strchr(file_name, '%') != NULL || !isolate->IsDefaultIsolate()) {
1777 1786
    // If there's a '%' in the log file name we have to expand
1778 1787
    // placeholders.
1779 1788
    HeapStringAllocator allocator;

Also available in: Unified diff