Merge commit '7b678fbd1304' from swift/release/6.0 into stable/20230725

Author: git apple-llvm automerger

lldb/bindings/python/python.swig

@@ -52,10 +52,6 @@ except ImportError:
     # Relative import should work if we are being loaded by Python.
     from . import $module"
 %enddef
-// These versions will not generate working python modules, so error out early.
-#if SWIG_VERSION >= 0x030009 && SWIG_VERSION < 0x030011
-#error Swig versions 3.0.9 and 3.0.10 are incompatible with lldb.
-#endif
 
 // The name of the module to be created.
 %module(docstring=DOCSTRING, moduleimport=MODULEIMPORT) lldb

lldb/cmake/modules/FindLuaAndSwig.cmake

@@ -15,7 +15,7 @@ else()
         LUA_INCLUDE_DIR)
     endif()
   else()
-    message(STATUS "SWIG 3 or later is required for Lua support in LLDB but could not be found")
+    message(STATUS "SWIG 4 or later is required for Lua support in LLDB but could not be found")
   endif()
 
 

lldb/cmake/modules/FindPythonAndSwig.cmake

@@ -40,7 +40,7 @@ else()
   if (LLDB_ENABLE_SWIG OR LLDB_USE_STATIC_BINDINGS)
     FindPython3()
   else()
-    message(STATUS "SWIG 3 or later is required for Python support in LLDB but could not be found")
+    message(STATUS "SWIG 4 or later is required for Python support in LLDB but could not be found")
   endif()
 
   get_property(MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)

lldb/cmake/modules/LLDBConfig.cmake

@@ -56,7 +56,7 @@ macro(add_optional_dependency variable description package found)
   message(STATUS "${description}: ${${variable}}")
 endmacro()
 
-add_optional_dependency(LLDB_ENABLE_SWIG "Enable SWIG to generate LLDB bindings" SWIG SWIG_FOUND VERSION 3)
+add_optional_dependency(LLDB_ENABLE_SWIG "Enable SWIG to generate LLDB bindings" SWIG SWIG_FOUND VERSION 4)
 
 # BEGIN SWIFT MOD
 if (LLDB_ENABLE_SWIG)

lldb/docs/resources/build.rst

@@ -34,7 +34,7 @@ If you want to run the test suite, you'll need to build LLDB with Python
 scripting support.
 
 * `Python <http://www.python.org/>`_
-* `SWIG <http://swig.org/>`_ 3 or later.
+* `SWIG <http://swig.org/>`_ 4 or later.
 
 Optional Dependencies
 *********************

lldb/packages/Python/lldbsuite/test/decorators.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
 # System modules
-from distutils.version import LooseVersion
 from functools import wraps
+from pkg_resources import packaging
 import ctypes
 import locale
 import os
@@ -68,10 +68,10 @@ def fn_neq(x, y):
         ">=": fn_geq,
         "<=": fn_leq,
     }
-    expected_str = ".".join([str(x) for x in expected])
-    actual_str = ".".join([str(x) for x in actual])
 
-    return op_lookup[comparison](LooseVersion(actual_str), LooseVersion(expected_str))
+    return op_lookup[comparison](
+        packaging.version.parse(actual), packaging.version.parse(expected)
+    )
 
 
 def _match_decorator_property(expected, actual):
@@ -227,7 +227,9 @@ def fn(self):
             )
         )
         skip_for_py_version = (py_version is None) or _check_expected_version(
-            py_version[0], py_version[1], sys.version_info
+            py_version[0],
+            py_version[1],
+            "{}.{}".format(sys.version_info.major, sys.version_info.minor),
         )
         skip_for_macos_version = (macos_version is None) or (
             (platform.mac_ver()[0] != "")

lldb/packages/Python/lldbsuite/test/lldbutil.py

@@ -710,24 +710,24 @@ def check_breakpoint(
     test.assertTrue(bkpt.IsValid(), "Breakpoint is not valid.")
 
     if expected_locations is not None:
-        test.assertEquals(expected_locations, bkpt.GetNumLocations())
+        test.assertEqual(expected_locations, bkpt.GetNumLocations())
 
     if expected_resolved_count is not None:
-        test.assertEquals(expected_resolved_count, bkpt.GetNumResolvedLocations())
+        test.assertEqual(expected_resolved_count, bkpt.GetNumResolvedLocations())
     else:
         expected_resolved_count = bkpt.GetNumLocations()
         if location_id is None:
-            test.assertEquals(expected_resolved_count, bkpt.GetNumResolvedLocations())
+            test.assertEqual(expected_resolved_count, bkpt.GetNumResolvedLocations())
 
     if expected_hit_count is not None:
-        test.assertEquals(expected_hit_count, bkpt.GetHitCount())
+        test.assertEqual(expected_hit_count, bkpt.GetHitCount())
 
     if location_id is not None:
         loc_bkpt = bkpt.FindLocationByID(location_id)
         test.assertTrue(loc_bkpt.IsValid(), "Breakpoint location is not valid.")
-        test.assertEquals(loc_bkpt.IsResolved(), expected_location_resolved)
+        test.assertEqual(loc_bkpt.IsResolved(), expected_location_resolved)
         if expected_location_hit_count is not None:
-            test.assertEquals(expected_location_hit_count, loc_bkpt.GetHitCount())
+            test.assertEqual(expected_location_hit_count, loc_bkpt.GetHitCount())
 
 
 # ==================================================

lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py

@@ -246,13 +246,13 @@ def continue_to_exception_breakpoint(self, filter_label):
     def continue_to_exit(self, exitCode=0):
         self.dap_server.request_continue()
         stopped_events = self.dap_server.wait_for_stopped()
-        self.assertEquals(
+        self.assertEqual(
             len(stopped_events), 1, "stopped_events = {}".format(stopped_events)
         )
-        self.assertEquals(
+        self.assertEqual(
             stopped_events[0]["event"], "exited", "make sure program ran to completion"
         )
-        self.assertEquals(
+        self.assertEqual(
             stopped_events[0]["body"]["exitCode"],
             exitCode,
             "exitCode == %i" % (exitCode),

lldb/scripts/use_lldb_suite.py

@@ -16,10 +16,12 @@ def find_lldb_root():
             return lldb_root
 
 lldb_root = find_lldb_root()
-import imp
-fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
-try:
-    imp.load_module("use_lldb_suite_root", fp, pathname, desc)
-finally:
-    if fp:
-        fp.close()
+
+import importlib.machinery
+import importlib.util
+
+path = os.path.join(lldb_root, "use_lldb_suite_root.py")
+loader = importlib.machinery.SourceFileLoader("use_lldb_suite_root", path)
+spec = importlib.util.spec_from_loader("use_lldb_suite_root", loader=loader)
+module = importlib.util.module_from_spec(spec)
+loader.exec_module(module)

lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp

@@ -95,24 +95,28 @@ struct InitializePythonRAII {
   InitializePythonRAII() {
     InitializePythonHome();
 
+    // The table of built-in modules can only be extended before Python is
+    // initialized.
+    if (!Py_IsInitialized()) {
 #ifdef LLDB_USE_LIBEDIT_READLINE_COMPAT_MODULE
-    // Python's readline is incompatible with libedit being linked into lldb.
-    // Provide a patched version local to the embedded interpreter.
-    bool ReadlinePatched = false;
-    for (auto *p = PyImport_Inittab; p->name != nullptr; p++) {
-      if (strcmp(p->name, "readline") == 0) {
-        p->initfunc = initlldb_readline;
-        break;
+      // Python's readline is incompatible with libedit being linked into lldb.
+      // Provide a patched version local to the embedded interpreter.
+      bool ReadlinePatched = false;
+      for (auto *p = PyImport_Inittab; p->name != nullptr; p++) {
+        if (strcmp(p->name, "readline") == 0) {
+          p->initfunc = initlldb_readline;
+          break;
+        }
+      }
+      if (!ReadlinePatched) {
+        PyImport_AppendInittab("readline", initlldb_readline);
+        ReadlinePatched = true;
       }
-    }
-    if (!ReadlinePatched) {
-      PyImport_AppendInittab("readline", initlldb_readline);
-      ReadlinePatched = true;
-    }
 #endif
 
-    // Register _lldb as a built-in module.
-    PyImport_AppendInittab("_lldb", LLDBSwigPyInit);
+      // Register _lldb as a built-in module.
+      PyImport_AppendInittab("_lldb", LLDBSwigPyInit);
+    }
 
 // Python < 3.2 and Python >= 3.2 reversed the ordering requirements for
 // calling `Py_Initialize` and `PyEval_InitThreads`.  < 3.2 requires that you

lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py

@@ -48,7 +48,7 @@ def frame_disassemble_test(self):
         )
 
         # The hit count for the breakpoint should be 1.
-        self.assertEquals(breakpoint.GetHitCount(), 1)
+        self.assertEqual(breakpoint.GetHitCount(), 1)
 
         frame = threads[0].GetFrameAtIndex(0)
         disassembly = frame.Disassemble()

lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py

@@ -75,7 +75,7 @@ def call_function(self):
         value = frame.EvaluateExpression("call_me (%d)" % (num_sigchld), options)
         self.assertTrue(value.IsValid())
         self.assertSuccess(value.GetError())
-        self.assertEquals(value.GetValueAsSigned(-1), num_sigchld)
+        self.assertEqual(value.GetValueAsSigned(-1), num_sigchld)
 
         self.check_after_call(num_sigchld)
 
@@ -92,7 +92,7 @@ def call_function(self):
 
         self.assertTrue(value.IsValid())
         self.assertSuccess(value.GetError())
-        self.assertEquals(value.GetValueAsSigned(-1), num_sigchld)
+        self.assertEqual(value.GetValueAsSigned(-1), num_sigchld)
         self.check_after_call(num_sigchld)
 
         # Now set the signal to print but not stop and make sure that calling
@@ -103,7 +103,7 @@ def call_function(self):
 
         self.assertTrue(value.IsValid())
         self.assertSuccess(value.GetError())
-        self.assertEquals(value.GetValueAsSigned(-1), num_sigchld)
+        self.assertEqual(value.GetValueAsSigned(-1), num_sigchld)
         self.check_after_call(num_sigchld)
 
         # Now set this unwind on error to false, and make sure that we still
@@ -113,7 +113,7 @@ def call_function(self):
 
         self.assertTrue(value.IsValid())
         self.assertSuccess(value.GetError())
-        self.assertEquals(value.GetValueAsSigned(-1), num_sigchld)
+        self.assertEqual(value.GetValueAsSigned(-1), num_sigchld)
         self.check_after_call(num_sigchld)
 
         # Okay, now set UnwindOnError to true, and then make the signal behavior to stop

lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py

@@ -46,7 +46,7 @@ def call_function(self):
 
         value = frame.EvaluateExpression("[my_class callMeIThrow]", options)
         self.assertTrue(value.IsValid())
-        self.assertEquals(value.GetError().Success(), False)
+        self.assertEqual(value.GetError().Success(), False)
 
         self.check_after_call()
 
@@ -86,7 +86,7 @@ def call_function(self):
         value = frame.EvaluateExpression("[my_class iCatchMyself]", options)
         self.assertTrue(value.IsValid())
         self.assertSuccess(value.GetError())
-        self.assertEquals(value.GetValueAsUnsigned(), 57)
+        self.assertEqual(value.GetValueAsUnsigned(), 57)
         self.check_after_call()
         options.SetTrapExceptions(True)
 

lldb/test/API/commands/expression/completion/TestExprCompletion.py

@@ -310,7 +310,7 @@ def assume_no_completions(self, str_input, cursor_pos=None):
         for m in match_strings:
             available_completions.append(m)
 
-        self.assertEquals(
+        self.assertEqual(
             num_matches,
             0,
             "Got matches, but didn't expect any: " + str(available_completions),

lldb/test/API/commands/expression/fixits/TestFixIts.py

@@ -46,7 +46,7 @@ def test_with_target(self):
         value = frame.EvaluateExpression("my_pointer.first", options)
         self.assertTrue(value.IsValid())
         self.assertSuccess(value.GetError())
-        self.assertEquals(value.GetValueAsUnsigned(), 10)
+        self.assertEqual(value.GetValueAsUnsigned(), 10)
 
         # Try with one error in a top-level expression.
         # The Fix-It changes "ptr.m" to "ptr->m".
@@ -56,22 +56,22 @@ def test_with_target(self):
         # unknown error . If a parsing error would have happened we
         # would get a different error kind, so let's check the error
         # kind here.
-        self.assertEquals(value.GetError().GetCString(), "unknown error")
+        self.assertEqual(value.GetError().GetCString(), "unknown error")
 
         # Try with two errors:
         two_error_expression = "my_pointer.second->a"
         value = frame.EvaluateExpression(two_error_expression, options)
         self.assertTrue(value.IsValid())
         self.assertSuccess(value.GetError())
-        self.assertEquals(value.GetValueAsUnsigned(), 20)
+        self.assertEqual(value.GetValueAsUnsigned(), 20)
 
         # Try a Fix-It that is stored in the 'note:' diagnostic of an error.
         # The Fix-It here is adding parantheses around the ToStr parameters.
         fixit_in_note_expr = "#define ToStr(x) #x\nToStr(0 {, })"
         value = frame.EvaluateExpression(fixit_in_note_expr, options)
         self.assertTrue(value.IsValid())
         self.assertSuccess(value.GetError())
-        self.assertEquals(value.GetSummary(), '"(0 {, })"')
+        self.assertEqual(value.GetSummary(), '"(0 {, })"')
 
         # Now turn off the fixits, and the expression should fail:
         options.SetAutoApplyFixIts(False)
@@ -178,7 +178,7 @@ def test_with_multiple_retries(self):
         multiple_runs_options.SetRetriesWithFixIts(2)
         value = frame.EvaluateExpression(two_runs_expr, multiple_runs_options)
         # This error signals success for top level expressions.
-        self.assertEquals(value.GetError().GetCString(), "unknown error")
+        self.assertEqual(value.GetError().GetCString(), "unknown error")
 
         # Test that the code above compiles to the right thing.
         self.expect_expr("test_X(1)", result_type="int", result_value="123")

lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py

@@ -37,7 +37,7 @@ def test_save_jit_objects(self):
 
         self.cleanJITFiles()
         frame.EvaluateExpression("(void*)malloc(0x1)")
-        self.assertEquals(
+        self.assertEqual(
             self.countJITFiles(), 0, "No files emitted with save-jit-objects-dir empty"
         )
 

lldb/test/API/commands/expression/test/TestExprs.py

@@ -123,7 +123,7 @@ def test_evaluate_expression_python(self):
         )
 
         # We should be stopped on the breakpoint with a hit count of 1.
-        self.assertEquals(breakpoint.GetHitCount(), 1, BREAKPOINT_HIT_ONCE)
+        self.assertEqual(breakpoint.GetHitCount(), 1, BREAKPOINT_HIT_ONCE)
 
         #
         # Use Python API to evaluate expressions while stopped in a stack frame.
@@ -168,15 +168,15 @@ def test_evaluate_expression_python(self):
         self.expect(
             "expression -i true -- a_function_to_call()", substrs=["(int) $", " 1"]
         )
-        self.assertEquals(callee_break.GetHitCount(), 1)
+        self.assertEqual(callee_break.GetHitCount(), 1)
 
         # Now try ignoring breakpoints using the SB API's:
         options = lldb.SBExpressionOptions()
         options.SetIgnoreBreakpoints(True)
         value = frame.EvaluateExpression("a_function_to_call()", options)
         self.assertTrue(value.IsValid())
-        self.assertEquals(value.GetValueAsSigned(0), 2)
-        self.assertEquals(callee_break.GetHitCount(), 2)
+        self.assertEqual(value.GetValueAsSigned(0), 2)
+        self.assertEqual(callee_break.GetHitCount(), 2)
 
     # rdar://problem/8686536
     # CommandInterpreter::HandleCommand is stripping \'s from input for

lldb/test/API/commands/expression/timeout/TestCallWithTimeout.py

@@ -46,7 +46,7 @@ def test(self):
         return_value = interp.HandleCommand(
             "expr -t 100 -u true -- wait_a_while(1000000)", result
         )
-        self.assertEquals(return_value, lldb.eReturnStatusFailed)
+        self.assertEqual(return_value, lldb.eReturnStatusFailed)
 
         # Okay, now do it again with long enough time outs:
 
@@ -63,7 +63,7 @@ def test(self):
         return_value = interp.HandleCommand(
             "expr -t 1000000 -u true -- wait_a_while(1000)", result
         )
-        self.assertEquals(return_value, lldb.eReturnStatusSuccessFinishResult)
+        self.assertEqual(return_value, lldb.eReturnStatusSuccessFinishResult)
 
         # Finally set the one thread timeout and make sure that doesn't change
         # things much:

lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py

@@ -42,7 +42,7 @@ def test_conditional_bktp(self):
         main_frame = self.thread.GetFrameAtIndex(0)
         val = main_frame.EvaluateExpression("second_function(47)", options)
         self.assertSuccess(val.GetError(), "We did complete the execution.")
-        self.assertEquals(47, val.GetValueAsSigned())
+        self.assertEqual(47, val.GetValueAsSigned())
 
     @add_test_categories(["pyapi"])
     @expectedFlakeyNetBSD

lldb/test/API/commands/frame/language/TestGuessLanguage.py

@@ -59,7 +59,7 @@ def do_test(self):
         )
 
         # The hit count for the breakpoint should be 1.
-        self.assertEquals(breakpoint.GetHitCount(), 1)
+        self.assertEqual(breakpoint.GetHitCount(), 1)
 
         thread = threads[0]
 

lldb/test/API/commands/frame/var/TestFrameVar.py

@@ -52,7 +52,7 @@ def do_test(self):
         )
 
         # The hit count for the breakpoint should be 1.
-        self.assertEquals(breakpoint.GetHitCount(), 1)
+        self.assertEqual(breakpoint.GetHitCount(), 1)
 
         frame = threads[0].GetFrameAtIndex(0)
         command_result = lldb.SBCommandReturnObject()