Merge pull request llvm#10583 from adrian-prantl/revert-visitor

Revert "[lldb] Factor out iteration over runtime types from GetChildC…

Author: adrian-prantl

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h

@@ -67,8 +67,6 @@ struct SuperClassType;
 using ThreadSafeReflectionContext = LockGuarded<ReflectionContextInterface>;
 
 class SwiftLanguageRuntime : public LanguageRuntime {
-  friend class SwiftRuntimeTypeVisitor;
-
 protected:
   SwiftLanguageRuntime(Process &process);
 

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

@@ -21,7 +21,7 @@ class TestSwiftUnknownReference(lldbtest.TestBase):
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
     def check_class(self, var_self):
-        lldbutil.check_variable(self, var_self, use_dynamic=True, num_children=2)
+        lldbutil.check_variable(self, var_self, num_children=2)
         m_base_string = var_self.GetChildMemberWithName("base_string")
         m_string = var_self.GetChildMemberWithName("string")
         lldbutil.check_variable(self, m_base_string, summary='"hello"')

lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/Makefile

@@ -20,9 +20,7 @@ class TestSwiftUnknownSelf(lldbtest.TestBase):
 
     def check_class(self, var_self, weak):
         self.expect("v self", substrs=["hello", "world"])
-        # FIXME: This is inconsistent. If self is Optional, an extra
-        #        indirection is needed.
-        lldbutil.check_variable(self, var_self, num_children=2 if weak else 1)
+        lldbutil.check_variable(self, var_self, num_children=2)
         m_base_string = var_self.GetChildMemberWithName("base_string")
         m_string = var_self.GetChildMemberWithName("string")
         # FIXME: This is inconsistent. If self is Optional, an extra

lldb/test/API/lang/swift/clangimporter/objc_protocol_fields/TestSwiftObjCProtocolFields.py

@@ -72,7 +72,7 @@ def test_swift_protocol_types(self):
         self.expect("expression --dynamic-type no-dynamic-values"
                     " --raw-output --show-types -- loc3dCB",
                     substrs=['PointUtils & Swift.AnyObject) $R',
-                             '(Builtin.UnknownObject) object = 0x',
+                             '(Builtin.RawPointer) object = 0x',
                              '(Builtin.RawPointer) wtable = 0x'])
 
         self.expect("expression -- loc3dCB",