fixup! make test bi-directional

Author: Michael137

lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py

@@ -6,28 +6,35 @@
 
 class TestCaseTypedefToOuterFwd(TestBase):
     """
-    We are stopped in main.o, which only sees a forward declaration
-    of FooImpl. We then try to get the FooImpl::Ref typedef (whose
-    definition is in lib.o). Make sure we correctly resolve this
-    typedef.
-    """
+    We a global variable whose type is forward declared. We then
+    try to get the Ref typedef (whose definition is in either main.o
+    or lib.o). Make sure we correctly resolve this typedef.
 
-    def test(self):
-        self.build()
-        (_, _, thread, _) = lldbutil.run_to_source_breakpoint(
-            self, "return", lldb.SBFileSpec("main.cpp")
-        )
+    We test this for two cases, where the definition lives
+    in main.o or lib.o.
+    """
 
-        foo = thread.frames[0].FindVariable("foo")
-        self.assertSuccess(foo.GetError(), "Found foo")
+    def check_global_var(self, target, name: str):
+        var = target.FindFirstGlobalVariable(name)
+        self.assertSuccess(var.GetError(), f"Found {name}")
 
-        foo_type = foo.GetType()
-        self.assertTrue(foo_type)
+        var_type = var.GetType()
+        self.assertTrue(var_type)
 
-        impl = foo_type.GetPointeeType()
+        impl = var_type.GetPointeeType()
         self.assertTrue(impl)
 
         ref = impl.FindDirectNestedType("Ref")
         self.assertTrue(ref)
 
-        self.assertEqual(ref.GetCanonicalType(), foo_type)
+        self.assertEqual(ref.GetCanonicalType(), var_type)
+
+    def test_definition_in_main(self):
+        self.build()
+        target = self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
+        self.check_global_var(target, "gLibExternalDef")
+
+    def test_definition_in_lib(self):
+        self.build()
+        target = self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
+        self.check_global_var(target, "gMainExternalDef")

lldb/test/API/lang/cpp/typedef-to-outer-fwd/lib.cpp

@@ -6,10 +6,5 @@ template <typename T> struct FooImpl {
   Ref Create() { return new FooImpl<T>(); }
 };
 
-Foo getString() {
-  FooImpl<char> impl;
-  Foo ret;
-  ret.impl = impl.Create();
-
-  return ret;
-}
+FooImpl<char> gLibLocalDef;
+BarImpl<char> *gLibExternalDef = nullptr;

lldb/test/API/lang/cpp/typedef-to-outer-fwd/lib.h

@@ -2,9 +2,6 @@
 #define LIB_H_IN
 
 template <typename T> struct FooImpl;
-
-struct Foo {
-  FooImpl<char> *impl = nullptr;
-};
+template <typename T> struct BarImpl;
 
 #endif // LIB_H_IN

lldb/test/API/lang/cpp/typedef-to-outer-fwd/main.cpp

@@ -1,8 +1,12 @@
 #include "lib.h"
 
-extern Foo getString();
+template <typename T> struct BarImpl {
+  using Ref = BarImpl<T> *;
 
-int main() {
-  FooImpl<char> *foo = getString().impl;
-  return 0;
-}
+  Ref Create() { return new BarImpl<T>(); }
+};
+
+BarImpl<char> gMainLocalDef;
+FooImpl<char> *gMainExternalDef = nullptr;
+
+int main() { return 0; }