Merge branch 'main' into unroll-fp-reductions

Author: juliannagele

cross-project-tests/debuginfo-tests/clang_llvm_roundtrip/simplified_template_names.test

@@ -1,4 +1,3 @@
-// XFAIL: system-darwin
 // RUN: %clang %target_itanium_abi_host_triple %p/Inputs/simplified_template_names.cpp -c -o - -gdwarf-4 -Xclang -gsimple-template-names=mangled -Xclang -debug-forward-template-params -std=c++20 -gtemplate-alias \
 // RUN:   | llvm-dwarfdump --verify -
 //

lldb/test/API/functionalities/breakpoint/hardware_breakpoints/simple_hw_breakpoints/TestSimpleHWBreakpoints.py

@@ -7,13 +7,7 @@
 
 
 class SimpleHWBreakpointTest(HardwareBreakpointTestBase):
-    def does_not_support_hw_breakpoints(self):
-        # FIXME: Use HardwareBreakpointTestBase.supports_hw_breakpoints
-        if super().supports_hw_breakpoints() is None:
-            return "Hardware breakpoints are unsupported"
-        return None
-
-    @skipTestIfFn(does_not_support_hw_breakpoints)
+    @skipTestIfFn(HardwareBreakpointTestBase.hw_breakpoints_unsupported)
     def test(self):
         """Test SBBreakpoint::SetIsHardware"""
         self.build()
@@ -35,16 +29,13 @@ def test(self):
         # breakpoint will be marked as a hardware breakpoint.
         self.assertTrue(break_on_me_bp.IsHardware())
 
-        if super().supports_hw_breakpoints():
-            self.assertSuccess(error)
-
-            # Continue to our Hardware breakpoint and verify that's the reason
-            # we're stopped.
-            process.Continue()
-            self.expect(
-                "thread list",
-                STOPPED_DUE_TO_BREAKPOINT,
-                substrs=["stopped", "stop reason = breakpoint"],
-            )
-        else:
-            self.assertFailure(error)
+        self.assertSuccess(error)
+
+        # Continue to our Hardware breakpoint and verify that's the reason
+        # we're stopped.
+        process.Continue()
+        self.expect(
+            "thread list",
+            STOPPED_DUE_TO_BREAKPOINT,
+            substrs=["stopped", "stop reason = breakpoint"],
+        )

llvm/include/llvm/DebugInfo/DWARF/DWARFTypePrinter.h

@@ -167,6 +167,23 @@ const char *toString(std::optional<DWARFFormValueType> F) {
   }
   return nullptr;
 }
+
+/// Resolve the DW_AT_type of \c D until we reach a DIE that is not a
+/// DW_TAG_typedef.
+template <typename DieType> DieType unwrapReferencedTypedefType(DieType D) {
+  auto TypeAttr = D.find(dwarf::DW_AT_type);
+  if (!TypeAttr)
+    return DieType();
+
+  auto Unwrapped = detail::resolveReferencedType(D, *TypeAttr);
+  if (!Unwrapped)
+    return DieType();
+
+  if (Unwrapped.getTag() == dwarf::DW_TAG_typedef)
+    return unwrapReferencedTypedefType(Unwrapped);
+
+  return Unwrapped;
+}
 } // namespace detail
 
 template <typename DieType>
@@ -588,10 +605,9 @@ bool DWARFTypePrinter<DieType>::appendTemplateParameters(DieType D,
     }
     if (C.getTag() != dwarf::DW_TAG_template_type_parameter)
       continue;
-    auto TypeAttr = C.find(dwarf::DW_AT_type);
     Sep();
-    appendQualifiedName(TypeAttr ? detail::resolveReferencedType(C, *TypeAttr)
-                                 : DieType());
+
+    appendQualifiedName(detail::unwrapReferencedTypedefType(C));
   }
   if (IsTemplate && *FirstParameter && FirstParameter == &FirstParameterValue) {
     OS << '<';