Refactor: Throw an error instead of warning in Runtime Stacktrace han…

…dling
lcompilers · Sep 29, 2023 · 10a3044 · 10a3044
1 parent 05025b0
commit 10a3044
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 31 deletions.
diff --git a/src/bin/lpython.cpp b/src/bin/lpython.cpp
@@ -736,17 +736,6 @@ int emit_llvm(const std::string &infile,
     LCompilers::PythonCompiler fe(compiler_options);
     LCompilers::Result<std::unique_ptr<LCompilers::LLVMModule>>
         res = fe.get_llvm3(*asr, pass_manager, diagnostics, infile);
-    if (compiler_options.emit_debug_info) {
-        if (!compiler_options.emit_debug_line_column) {
-            diagnostics.add(LCompilers::diag::Diagnostic(
-                "The `emit_debug_line_column` is not enabled; please use the "
-                "`--debug-with-line-column` option to get the correct "
-                "location information",
-                LCompilers::diag::Level::Warning,
-                LCompilers::diag::Stage::Semantic, {})
-            );
-        }
-    }
     std::cerr << diagnostics.render(lm, compiler_options);
     if (!res.ok) {
         LCOMPILERS_ASSERT(diagnostics.has_error())
@@ -819,6 +808,18 @@ int compile_python_to_object_file(
     diagnostics.diagnostics.clear();
 
     // ASR -> LLVM
+    if (compiler_options.emit_debug_info) {
+#ifndef HAVE_RUNTIME_STACKTRACE
+        diagnostics.add(LCompilers::diag::Diagnostic(
+            "The `runtime stacktrace` is not enabled. To get the stacktraces, "
+            "re-build LPython with `-DWITH_RUNTIME_STACKTRACE=yes`",
+            LCompilers::diag::Level::Error,
+            LCompilers::diag::Stage::Semantic, {})
+        );
+        std::cerr << diagnostics.render(lm, compiler_options);
+        return 1;
+#endif
+    }
     LCompilers::PythonCompiler fe(compiler_options);
     LCompilers::LLVMEvaluator e(compiler_options.target);
     std::unique_ptr<LCompilers::LLVMModule> m;
@@ -828,26 +829,6 @@ int compile_python_to_object_file(
     auto asr_to_llvm_end = std::chrono::high_resolution_clock::now();
     times.push_back(std::make_pair("ASR to LLVM", std::chrono::duration<double, std::milli>(asr_to_llvm_end - asr_to_llvm_start).count()));
 
-    if (compiler_options.emit_debug_info) {
-#ifdef HAVE_RUNTIME_STACKTRACE
-        if (!compiler_options.emit_debug_line_column) {
-            diagnostics.add(LCompilers::diag::Diagnostic(
-                "The `emit_debug_line_column` is not enabled; please use the "
-                "`--debug-with-line-column` option to get the correct "
-                "location information",
-                LCompilers::diag::Level::Warning,
-                LCompilers::diag::Stage::Semantic, {})
-            );
-        }
-#else
-    diagnostics.add(LCompilers::diag::Diagnostic(
-        "The `runtime stacktrace` is not enabled. To get the stacktraces, "
-        "re-build LPython with `-DWITH_RUNTIME_STACKTRACE=yes`",
-        LCompilers::diag::Level::Warning,
-        LCompilers::diag::Stage::Semantic, {})
-    );
-#endif
-    }
     std::cerr << diagnostics.render(lm, compiler_options);
     if (!res.ok) {
         LCOMPILERS_ASSERT(diagnostics.has_error())

diff --git a/src/lpython/python_evaluator.cpp b/src/lpython/python_evaluator.cpp
@@ -50,6 +50,19 @@ Result<std::unique_ptr<LLVMModule>> PythonCompiler::get_llvm3(
     eval_count++;
     run_fn = "__lfortran_evaluate_" + std::to_string(eval_count);
 
+    if (compiler_options.emit_debug_info) {
+        if (!compiler_options.emit_debug_line_column) {
+            diagnostics.add(LCompilers::diag::Diagnostic(
+                "The `emit_debug_line_column` is not enabled; please use the "
+                "`--debug-with-line-column` option to get the correct "
+                "location information",
+                LCompilers::diag::Level::Error,
+                LCompilers::diag::Stage::Semantic, {})
+            );
+            Error err;
+            return err;
+        }
+    }
     // ASR -> LLVM
     std::unique_ptr<LCompilers::LLVMModule> m;
     Result<std::unique_ptr<LCompilers::LLVMModule>> res