Replace text annotations with explicit file/line for debug info (#967)

Rather than storing debug info as text annotations, store explicit file and line information. This will make it easier to experiment with outputting other serializations or representations (e.g. source maps), and will allow outputting debug info for binaries as well.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
index 04bf74529..9a2edcb6b 100644
--- a/src/passes/Print.cpp
+++ b/src/passes/Print.cpp
@@ -49,10 +49,11 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
   void visit(Expression* curr) {
     if (currFunction) {
       // show an annotation, if there is one
-      auto& annotations = currFunction->annotations;
-      auto iter = annotations.find(curr);
-      if (iter != annotations.end()) {
-        o << ";; " << iter->second << '\n';
+      auto& debugLocations = currFunction->debugLocations;
+      auto iter = debugLocations.find(curr);
+      if (iter != debugLocations.end()) {
+        auto fileName = currModule->debugInfoFileNames[iter->second.fileIndex];
+        o << ";; " << fileName << ":" << iter->second.lineNumber << '\n';
         doIndent(o, indent);
       }
     }