Partially Revert: Fix GetScope returning TypedefDecl of non scopes

Author: sudo-panda

lib/Interpreter/CppInterOp.cpp

@@ -502,18 +502,22 @@ namespace Cpp {
 
   TCppScope_t GetScope(const std::string &name, TCppScope_t parent)
   {
+    // FIXME: GetScope should be replaced by a general purpose lookup
+    // and filter function. The function should be like GetNamed but
+    // also take in a filter parameter which determines which results
+    // to pass back
     if (name == "")
         return GetGlobalScope();
 
     auto *ND = (NamedDecl*)GetNamed(name, parent);
 
-    ND = llvm::dyn_cast_or_null<NamedDecl>(GetUnderlyingScope(ND));
-
     if (!ND || ND == (NamedDecl *) -1)
       return 0;
 
-    if (llvm::isa<NamespaceDecl>(ND) || llvm::isa<RecordDecl>(ND) ||
-        llvm::isa<ClassTemplateDecl>(ND))
+    if (llvm::isa<NamespaceDecl>(ND)     ||
+        llvm::isa<RecordDecl>(ND)        ||
+        llvm::isa<ClassTemplateDecl>(ND) ||
+        llvm::isa<TypedefNameDecl>(ND))
       return (TCppScope_t)(ND->getCanonicalDecl());
 
     return 0;

unittests/CppInterOp/ScopeReflectionTest.cpp

@@ -369,17 +369,21 @@ TEST(ScopeReflectionTest, GetScope) {
                           enum E { A, B };
                         };
                         }
+
+                        typedef N::C T;
                        )";
 
   Cpp::CreateInterpreter();
   Interp->declare(code);
   Cpp::TCppScope_t tu = Cpp::GetScope("", 0);
   Cpp::TCppScope_t ns_N = Cpp::GetScope("N", 0);
   Cpp::TCppScope_t cl_C = Cpp::GetScope("C", ns_N);
+  Cpp::TCppScope_t td_T = Cpp::GetScope("T", 0);
 
   EXPECT_EQ(Cpp::GetQualifiedName(tu), "");
   EXPECT_EQ(Cpp::GetQualifiedName(ns_N), "N");
   EXPECT_EQ(Cpp::GetQualifiedName(cl_C), "N::C");
+  EXPECT_EQ(Cpp::GetQualifiedName(td_T), "T");
 }
 
 TEST(ScopeReflectionTest, GetScopefromCompleteName) {