Merge pull request #16940 from RasmusWL/rasmuswl/BuiltinModuleExtract…

…able Python: Handle diagnostics writing for `BuiltinModuleExtractable`
github · Jul 12, 2024 · 1de2943 · 1de2943
2 parents 8a9f0bf + 354394d
commit 1de2943
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/python/extractor/semmle/logging.py b/python/extractor/semmle/logging.py
@@ -373,7 +373,8 @@ def syntax_error_message(exception, unit):
     return error
 
 def recursion_error_message(exception, unit):
-    l = Location(file=unit.path)
+    # if unit is a BuiltinModuleExtractable, there will be no path attribute
+    l = Location(file=unit.path) if hasattr(unit, "path") else None
     return (DiagnosticMessage(Source("py/diagnostics/recursion-error", "Recursion error in Python extractor"), Severity.ERROR)
             .with_location(l)
             .text(exception.args[0])
@@ -383,7 +384,8 @@ def recursion_error_message(exception, unit):
     )
 
 def internal_error_message(exception, unit):
-    l = Location(file=unit.path)
+    # if unit is a BuiltinModuleExtractable, there will be no path attribute
+    l = Location(file=unit.path) if hasattr(unit, "path") else None
     return (DiagnosticMessage(Source("py/diagnostics/internal-error", "Internal error in Python extractor"), Severity.ERROR)
             .with_location(l)
             .text("Internal error")

diff --git a/python/extractor/semmle/util.py b/python/extractor/semmle/util.py
@@ -10,7 +10,7 @@
 
 #Semantic version of extractor.
 #Update this if any changes are made
-VERSION = "6.1.1"
+VERSION = "6.1.2"
 
 PY_EXTENSIONS = ".py", ".pyw"
 

diff --git a/python/extractor/semmle/worker.py b/python/extractor/semmle/worker.py
@@ -274,16 +274,24 @@ def _extract_loop(proc_id, queue, trap_dir, archive, options, reply_queue, logge
                     # Syntax errors have already been handled in extractor.py
                     reply_queue.put(("FAILURE", unit, None))
                 except RecursionError as ex:
-                    error = recursion_error_message(ex, unit)
-                    diagnostics_writer.write(error)
                     logger.error("Failed to extract %s: %s", unit, ex)
                     logger.traceback(WARN)
+                    try:
+                        error = recursion_error_message(ex, unit)
+                        diagnostics_writer.write(error)
+                    except Exception as ex:
+                        logger.warning("Failed to write diagnostics: %s", ex)
+                        logger.traceback(WARN)
                     reply_queue.put(("FAILURE", unit, None))
                 except Exception as ex:
-                    error = internal_error_message(ex, unit)
-                    diagnostics_writer.write(error)
                     logger.error("Failed to extract %s: %s", unit, ex)
                     logger.traceback(WARN)
+                    try:
+                        error = internal_error_message(ex, unit)
+                        diagnostics_writer.write(error)
+                    except Exception as ex:
+                        logger.warning("Failed to write diagnostics: %s", ex)
+                        logger.traceback(WARN)
                     reply_queue.put(("FAILURE", unit, None))
                 else:
                     reply_queue.put(("SUCCESS", unit, None))