Merge pull request llvm#9948 from adrian-prantl/flavor

Address review feedback
augusto2112 · Feb 6, 2025 · 2bef1d1 · 2bef1d1
2 parents 9c34ca1 + 3a5c6f8
commit 2bef1d1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp
@@ -1498,8 +1498,9 @@ llvm::Expected<CompilerType> SwiftLanguageRuntime::GetChildCompilerTypeAtIndex(
     if (!dem_array_type || dem_array_type->getNumChildren() != 2)
       return llvm::createStringError("Expected fixed array, but found: " +
                                      type.GetMangledTypeName().GetString());
-    return ts->RemangleAsType(dem, dem_array_type->getChild(1),
-                              ts->GetManglingFlavor());
+    auto flavor = SwiftLanguageRuntime::GetManglingFlavor(
+        type.GetMangledTypeName().GetStringRef());
+    return ts->RemangleAsType(dem, dem_array_type->getChild(1), flavor);
   }
   if (llvm::dyn_cast_or_null<swift::reflection::BuiltinTypeInfo>(ti)) {
     // Clang enums have an artificial rawValue property. We could