Include module names in recursive error stacks (#22921)

davidriazati · facebook-github-bot · commit 79c4f83fbec5 · 2019-07-19T16:09:14.000-07:00
Summary: Following on to #22280, this adds module names so they're included in the call stacks of an error message (e.g. so it appears as `M.forward` instead of `forward`) ](https://our.intern.facebook.com/intern/diff/16287925/) Pull Request resolved: #22921 Pulled By: driazati Differential Revision: D16287925 fbshipit-source-id: 6f31d72caa87ba2dc527805d36f7d62eb94c0808
diff --git a/test/test_jit.py b/test/test_jit.py
@@ -13291,9 +13291,13 @@ def forward(self, x):
             checker = FileCheck()
             checker.check("Expected a value of type 'int'")
             checker.check("return d(\"hello\")")
+            checker.check("\'b")
             checker.check("return c(x)")
+            checker.check("Submodule.forward\'")
             checker.check("return b(x)")
+            checker.check("M.some_method\'")
             checker.check("return y + self.submodule(y)")
+            checker.check("M.forward\'")
             checker.check("return self.some_method(x)")
             checker.run(str(e))
 
diff --git a/torch/csrc/jit/script/compiler.cpp b/torch/csrc/jit/script/compiler.cpp
@@ -2972,7 +2972,12 @@ std::unique_ptr<Function> CompilationUnit::define(
   auto creator = [def, _resolver, self](Function& method) {
     // Store the function name so that it can be referenced if there is an error
     // while compiling this function
-    ErrorReport::CallStack::push_function(def.name().name());
+    if (self) {
+      // Include the fully qualified name if this is a method
+      ErrorReport::CallStack::push_function(method.qualname().qualifiedName());
+    } else {
+      ErrorReport::CallStack::push_function(method.qualname().name());
+    }
     to_ir(def, _resolver, self, method);
     // Compilation was successful, so remove the function def info
     ErrorReport::CallStack::pop_function();
