Merge commit '8b49cc20707f' from swift/release/6.0 into stable/20230725

Author: git apple-llvm automerger

lldb/source/Core/ValueObject.cpp

@@ -232,7 +232,7 @@ bool ValueObject::UpdateFormatsIfNeeded() {
     m_last_format_mgr_revision = DataVisualization::GetCurrentRevision();
     any_change = true;
 
-    SetValueFormat(DataVisualization::GetFormat(*this, eNoDynamicValues));
+    SetValueFormat(DataVisualization::GetFormat(*this, GetDynamicValueType()));
     SetSummaryFormat(
         DataVisualization::GetSummaryFormat(*this, GetDynamicValueType()));
 #if LLDB_ENABLE_PYTHON

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -955,12 +955,7 @@ std::optional<std::string> SwiftLanguageRuntimeImpl::GetEnumCaseName(
   if (eti->projectEnumValue(*GetMemoryReader(), addr, &case_index))
     return eti->getCases()[case_index].Name;
 
-  // FIXME: Enabling this fails TestSwiftNestedCEnums.py: The test
-  // nests a C-style enum inside of a payload-carrying enum and most
-  // likely we're not stripping off the outer enum's discriminator
-  // before reading the value of the inner one.
-  
-  // LogUnimplementedTypeKind(__FUNCTION__, type);
+  LogUnimplementedTypeKind(__FUNCTION__, type);
   return {};
 }