Fix typedef hiding DeclContext of parent in GetNamed

Author: sudo-panda

lib/Interpreter/CppInterOp.cpp

@@ -494,12 +494,28 @@ namespace Cpp {
     return GetScope(name.substr(start, end), curr_scope);
   }
 
+  static CXXRecordDecl *GetScopeFromType(QualType QT) {
+    if (auto *Type = QT.getTypePtrOrNull()) {
+      Type = Type->getPointeeOrArrayElementType();
+      Type = Type->getUnqualifiedDesugaredType();
+      return Type->getAsCXXRecordDecl();
+    }
+    return 0;
+  }
+
+  TCppScope_t GetScopeFromType(TCppType_t type) {
+    QualType QT = QualType::getFromOpaquePtr(type);
+    return (TCppScope_t)GetScopeFromType(QT);
+  }
+
   TCppScope_t GetNamed(const std::string &name,
                        TCppScope_t parent /*= nullptr*/)
   {
     clang::DeclContext *Within = 0;
     if (parent) {
       auto *D = (clang::Decl *)parent;
+      if (auto *TD = dyn_cast<TypedefNameDecl>(D))
+        D = GetScopeFromType(TD->getUnderlyingType());
       Within = llvm::dyn_cast<clang::DeclContext>(D);
     }
 
@@ -527,22 +543,6 @@ namespace Cpp {
             ParentDC)->getCanonicalDecl();
   }
 
-  namespace {
-  CXXRecordDecl *GetScopeFromType(QualType QT) {
-    if (auto *Type = QT.getTypePtrOrNull()) {
-      Type = Type->getPointeeOrArrayElementType();
-      Type = Type->getUnqualifiedDesugaredType();
-      return Type->getAsCXXRecordDecl();
-    }
-    return 0;
-  }
-  } // namespace
-
-  TCppScope_t GetScopeFromType(TCppType_t type) {
-    QualType QT = QualType::getFromOpaquePtr(type);
-    return (TCppScope_t)GetScopeFromType(QT);
-  }
-
   TCppIndex_t GetNumBases(TCppScope_t klass)
   {
     auto *D = (Decl *) klass;

unittests/CppInterOp/ScopeReflectionTest.cpp

@@ -397,6 +397,14 @@ TEST(ScopeReflectionTest, GetNamed) {
   EXPECT_EQ(Cpp::GetQualifiedName(Cpp::GetNamed("A", cl_C)), "N1::N2::C::A");
   EXPECT_EQ(Cpp::GetQualifiedName(Cpp::GetNamed("B", cl_C)), "N1::N2::C::B");
   EXPECT_EQ(Cpp::GetQualifiedName(Cpp::GetNamed("S", cl_C)), "N1::N2::C::S");
+
+  Interp->process("#include <string>");
+  Cpp::TCppScope_t std_ns = Cpp::GetNamed("std", nullptr);
+  Cpp::TCppScope_t std_string_class = Cpp::GetNamed("string", std_ns);
+  Cpp::TCppScope_t std_string_npos_var = Cpp::GetNamed("npos", std_string_class);
+  EXPECT_EQ(Cpp::GetQualifiedName(std_ns), "std");
+  EXPECT_EQ(Cpp::GetQualifiedName(std_string_class), "std::string");
+  EXPECT_EQ(Cpp::GetQualifiedName(std_string_npos_var), "std::basic_string<char>::npos");
 }
 
 TEST(ScopeReflectionTest, GetParentScope) {