Merge pull request #10392 from adrian-prantl/147905814

[lldb] SwiftLanguageRuntime: Support Clang typedef-to-enums.

Author: adrian-prantl

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

@@ -695,6 +695,15 @@ void LogUnimplementedTypeKind(const char *function, CompilerType type) {
 #endif
 }
 
+CompilerType GetCanonicalClangType(CompilerType type) {
+  for (unsigned i = 0; i < 32; ++i) {
+    if (!type.IsTypedefType())
+      return type;
+    type = type.GetTypedefedType();
+  }
+  return type;
+}
+
 } // namespace
 
 llvm::Expected<uint32_t>
@@ -721,6 +730,7 @@ SwiftLanguageRuntime::GetNumChildren(CompilerType type,
     if (!clang_type)
       ts.IsImportedType(type.GetOpaqueQualType(), &clang_type);
     if (clang_type) {
+      clang_type = GetCanonicalClangType(clang_type);
       bool is_signed;
       if (clang_type.IsEnumerationType(is_signed))
         return 1;
@@ -1150,11 +1160,12 @@ SwiftLanguageRuntime::GetIndexOfChildMemberWithName(
     }
   }
   case TypeInfoKind::Builtin: {
-    // Clang enums have an artificial rawValue property.
     CompilerType clang_type;
     if (ts.IsImportedType(type.GetOpaqueQualType(), &clang_type)) {
+      clang_type = GetCanonicalClangType(clang_type);
       bool is_signed;
-      if (clang_type.IsEnumerationType(is_signed) && name == "rawValue") {
+      if (clang_type.IsEnumerationType(is_signed)) {
+        // Clang enums have an artificial rawValue property.
         child_indexes.push_back(0);
         return {SwiftLanguageRuntime::eFound, {1}};
       }

lldb/test/API/lang/swift/enum_objc/TestSwiftEnumObjC.py

@@ -1,10 +1,19 @@
-import lldbsuite.test.lldbinline as lldbinline
+import lldb
 from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbtest as lldbtest
+import lldbsuite.test.lldbutil as lldbutil
 
-lldbinline.MakeInlineTest(
-    __file__,
-    globals(),
-    decorators=[
-        expectedFailureAll(oslist=["linux"], bugnumber="rdar://83444822"),
-        swiftTest
-    ])
+class TestSwiftDWARFImporterC(lldbtest.TestBase):
+
+    @swiftTest
+    @expectedFailureAll(oslist=["linux"], bugnumber="rdar://83444822")
+    def test(self):
+        self.build()
+        target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
+            self, 'break here', lldb.SBFileSpec('main.swift'))
+        self.expect('frame var -d run-target -- ascending', substrs=['OrderedAscending'])
+        self.expect('frame var -d run-target -- descending', substrs=['OrderedDescending'])
+        self.expect('frame var -d run-target -- same', substrs=['OrderedSame'])
+        self.expect('expr -d run-target -- ascending', substrs=['OrderedAscending'])
+        self.expect('expr -d run-target -- descending', substrs=['OrderedDescending'])
+        self.expect('expr -d run-target -- same', substrs=['OrderedSame'])

lldb/test/API/lang/swift/enum_objc/main.swift

@@ -1,17 +1,10 @@
 import Enum 
 
-func test()
-{
-    let ascending = getReturn(-1)
-    let descending = getReturn(1)
-    let same = getReturn(0)
-    return //%self.expect('frame var -d run-target -- ascending', substrs=['OrderedAscending'])
-           //%self.expect('frame var -d run-target -- descending', substrs=['OrderedDescending'])
-           //%self.expect('frame var -d run-target -- same', substrs=['OrderedSame'])
-           //%self.expect('expr -d run-target -- ascending', substrs=['OrderedAscending'])
-           //%self.expect('expr -d run-target -- descending', substrs=['OrderedDescending'])
-           //%self.expect('expr -d run-target -- same', substrs=['OrderedSame'])
+func test() {
+  let ascending = getReturn(-1)
+  let descending = getReturn(1)
+  let same = getReturn(0)
+  print("break here")
 }
 
-_ = test()
-print("this is needed to load the stdlib")
+test()