Refactor file:line:col to be less ugly (#22177)

James Reed · facebook-github-bot · commit 671782d88a84 · 2019-07-01T21:14:28.000-07:00
Summary: Pull Request resolved: #22177 ghimport-source-id: e35f068 Test Plan: Imported from OSS Differential Revision: D15981424 Pulled By: jamesr66a fbshipit-source-id: b7748c5cfd4f8ea594314cb601a2b8045173700a
diff --git a/torch/csrc/jit/ir.cpp b/torch/csrc/jit/ir.cpp
@@ -251,14 +251,13 @@ std::ostream& Node::print(
   }
 
   // In debug print, append file:line:col as a comment after each node
-  if (print_source_locations && source_range_ &&
-      source_range_->source()->filename()) {
-    const auto& range = sourceRange();
-    const auto& source = range.source();
-    auto lineno = source->lineno_for_offset(range.start());
-    auto col_offset = (int)range.start() - (int)source->offset_for_line(lineno);
-    out << " # " << source->filename().value() << ":"
-        << source->lineno_to_source_lineno(lineno) << ":" << col_offset;
+  if (print_source_locations) {
+    if (auto file_line_col = sourceRange().file_line_col()) {
+      std::string filename;
+      size_t line, col;
+      std::tie(filename, line, col) = *file_line_col;
+      out << " # " << filename << ":" << line << ":" << col;
+    }
   }
 
   out << "\n";
diff --git a/torch/csrc/jit/source_range.cpp b/torch/csrc/jit/source_range.cpp
@@ -42,13 +42,11 @@ C10_EXPORT void SourceRange::highlight(std::ostream& out) const {
   }
   AT_ASSERT(end_highlight == str.size() || str[end_highlight] == '\n');
 
-  if (source_->filename()) {
-    auto lineno = source_->lineno_for_offset(start());
-    auto col_offset = (int)start() -
-        (int)source_->offset_for_line(lineno);
-    out << "at " << *source_->filename() << ":"
-        << source_->lineno_to_source_lineno(lineno) << ":" << col_offset
-        << "\n";
+  if (auto flc = file_line_col()) {
+    std::string filename;
+    size_t line, col;
+    std::tie(filename, line, col) = *flc;
+    out << "at " << filename << ":" << line << ":" << col << "\n";
   }
   out << str.substr(begin_highlight, end_line - begin_highlight) << "\n";
   out << std::string(start() - begin_line, ' ');
diff --git a/torch/csrc/jit/source_range.h b/torch/csrc/jit/source_range.h
@@ -117,6 +117,20 @@ struct CAFFE2_API SourceRange {
     return ss.str();
   }
 
+  c10::optional<std::tuple<std::string, size_t, size_t>> file_line_col() const {
+    if (!source_ || !source()->filename()) {
+      return c10::nullopt;
+    }
+
+    auto lineno = source_->lineno_for_offset(start_);
+    auto col_offset = (int)start_ - (int)source_->offset_for_line(lineno);
+    // TODO: c10::optional<>::value returns an rvalue ref so can't use it here??
+    return std::make_tuple<std::string, size_t, size_t>(
+        source_->filename().value_or(""),
+        source_->lineno_to_source_lineno(lineno),
+        (size_t)col_offset);
+  }
+
  private:
   std::shared_ptr<Source> source_;
   size_t start_;
