Cppyy bug

lib/Interpreter/CppInterOp.cpp

@@ -1212,12 +1212,20 @@ namespace Cpp {
     return 0;
   }
 
-  TCppType_t GetVariableType(TCppScope_t var)
-  {
-    auto D = (Decl *) var;
+  TCppType_t GetVariableType(TCppScope_t var) {
+    auto* D = static_cast<Decl*>(var);
 
     if (auto DD = llvm::dyn_cast_or_null<DeclaratorDecl>(D)) {
-      return DD->getType().getAsOpaquePtr();
+      QualType QT = DD->getType();
+
+      // Check if the type is a typedef type
+      if (QT->isTypedefNameType()) {
+        return QT.getAsOpaquePtr();
+      }
+
+      // Else, return the canonical type
+      QT = QT.getCanonicalType();
+      return QT.getAsOpaquePtr();
     }
 
     return 0;

unittests/CppInterOp/VariableReflectionTest.cpp

@@ -6,6 +6,7 @@
 #include "clang/Sema/Sema.h"
 
 #include "gtest/gtest.h"
+#include <string>
 
 #include <cstddef>
 
@@ -159,6 +160,39 @@ TEST(VariableReflectionTest, DatamembersWithAnonymousStructOrUnion) {
 #endif
 }
 
+TEST(VariableReflectionTest, GetTypeAsString) {
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
+
+  std::string code = R"(
+  namespace my_namespace {
+
+  struct Container {
+    int value;
+  };
+
+  struct Wrapper {
+    Container item;
+  };
+
+  }
+  )";
+
+  Cpp::CreateInterpreter();
+  EXPECT_EQ(Cpp::Declare(code.c_str()), 0);
+
+  Cpp::TCppScope_t wrapper =
+      Cpp::GetScopeFromCompleteName("my_namespace::Wrapper");
+  EXPECT_TRUE(wrapper);
+
+  std::vector<Cpp::TCppScope_t> datamembers;
+  Cpp::GetDatamembers(wrapper, datamembers);
+  EXPECT_EQ(datamembers.size(), 1);
+
+  EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetVariableType(datamembers[0])),
+            "my_namespace::Container");
+}
+
 TEST(VariableReflectionTest, LookupDatamember) {
   std::vector<Decl*> Decls;
   std::string code = R"(