Merge pull request #2350 from Thirumalai-Shaktivel/runtime_stacktrace_01

Author: Thirumalai-Shaktivel

src/bin/CMakeLists.txt

@@ -33,7 +33,7 @@ if (WITH_STACKTRACE AND APPLE AND CMAKE_CXX_COMPILER_ID MATCHES Clang)
         add_custom_command(
             TARGET lpython
             POST_BUILD
-            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dwarf_convert.py lpython.dSYM/raw.txt lpython.dSYM/lines.txt lpython.dSYM/lines.dat
+            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../libasr/dwarf_convert.py lpython.dSYM/raw.txt lpython.dSYM/lines.txt lpython.dSYM/lines.dat
         )
     endif()
 endif()

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())
@@ -1901,14 +1882,14 @@ int main(int argc, char *argv[])
 #else
                     cmd += "llvm-dwarfdump --debug-line " + basename + ".out > ";
 #endif
-                    cmd += basename + "_ldd.txt && (cd src/bin; ./dwarf_convert.py ../../"
+                    cmd += basename + "_ldd.txt && (cd src/libasr; ./dwarf_convert.py ../../"
                         + basename + "_ldd.txt ../../" + basename + "_lines.txt ../../"
                         + basename + "_lines.dat && ./dat_convert.py ../../"
                         + basename + "_lines.dat)";
                     int status = system(cmd.c_str());
                     if ( status != 0 ) {
                         std::cerr << "Error in creating the files used to generate "
-                            "the debug information. This might be caused because either"
+                            "the debug information. This might be caused because either "
                             "`llvm-dwarfdump` or `Python` are not available. "
                             "Please activate the CONDA environment and compile again.\n";
                         return status;

src/bin/dat_convert.py renamed to src/libasr/dat_convert.py

@@ -372,7 +372,7 @@ char** parse_fortran_format(char* format, int *count) {
         switch (tolower(format[index])) {
             case ',' :
                 break;
-            case '/' : 
+            case '/' :
                 format_values_2[format_values_count++] = "/";
                 break;
             case '"' :
@@ -2619,9 +2619,9 @@ LFORTRAN_API void print_stacktrace_addresses(char *filename, bool use_colors) {
     get_local_info_dwarfdump(&d);
 
 #ifdef HAVE_LFORTRAN_MACHO
-    for (int32_t i = d.local_pc_size-2; i >= 0; i--) {
+    for (int32_t i = d.local_pc_size-1; i >= 0; i--) {
 #else
-    for (int32_t i = d.local_pc_size-3; i >= 0; i--) {
+    for (int32_t i = d.local_pc_size-2; i >= 0; i--) {
 #endif
         uint64_t index = bisection(d.addresses, d.stack_size, d.local_pc[i]);
         if(use_colors) {

src/bin/dwarf_convert.py renamed to src/libasr/dwarf_convert.py

@@ -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

src/libasr/runtime/lfortran_intrinsics.c

@@ -8,6 +8,6 @@
     "stdout": null,
     "stdout_hash": null,
     "stderr": "run_dbg-test_assert_01-2f34744.stderr",
-    "stderr_hash": "5ded88da4106fc9a3cfbaad6f82cc820a79a6ef8cc1661ecfcb37924",
+    "stderr_hash": "4811af471c73572b285e9ea01c8689abdd3cb32c717b3cd4876d2669",
     "returncode": 1
 }

src/lpython/python_evaluator.cpp

@@ -1,3 +1,5 @@
+  File "tests/runtime_errors/test_assert_01.py", line 1
+    def test():
   File "tests/runtime_errors/test_assert_01.py", line 4
     test()
   File "tests/runtime_errors/test_assert_01.py", line 2

tests/reference/run_dbg-test_assert_01-2f34744.json

@@ -8,6 +8,6 @@
     "stdout": null,
     "stdout_hash": null,
     "stderr": "run_dbg-test_assert_02-c6de25a.stderr",
-    "stderr_hash": "ddba8a92bcfd5a30016735589da0dc56f2785e7636afcc0edeca4139",
+    "stderr_hash": "d5bfce55992e8d0630849442ee1f9b32864c64c328917c29fafc9424",
     "returncode": 1
 }

tests/reference/run_dbg-test_assert_01-2f34744.stderr

@@ -1,3 +1,5 @@
+  File "tests/runtime_errors/test_assert_02.py", line 1
+    def test():
   File "tests/runtime_errors/test_assert_02.py", line 4
     test()
   File "tests/runtime_errors/test_assert_02.py", line 2