Fix GetScope returning TypedefDecl of non scopes

Author: sudo-panda

include/clang/Interpreter/CppInterOp.h

@@ -224,8 +224,9 @@ namespace Cpp {
   /// underlying decl is not a class it returns the input unchanged.
   TCppScope_t GetUnderlyingScope(TCppScope_t scope);
 
-  /// Gets the namespace or class for the name passed as a parameter,
-  /// and if the parent is not passed, then global scope will be assumed.
+  /// Gets the namespace or class (by stripping typedefs) for the name 
+  /// passed as a parameter, and if the parent is not passed, 
+  /// then global scope will be assumed.
   TCppScope_t GetScope(const std::string &name, TCppScope_t parent = 0);
 
   /// When the namespace is known, then the parent doesn't need

lib/Interpreter/CppInterOp.cpp

@@ -502,11 +502,13 @@ namespace Cpp {
 
     auto *ND = (NamedDecl*)GetNamed(name, parent);
 
-    if (!(ND == (NamedDecl *)-1) &&
-        (llvm::isa_and_nonnull<NamespaceDecl>(ND) ||
-         llvm::isa_and_nonnull<RecordDecl>(ND) ||
-         llvm::isa_and_nonnull<ClassTemplateDecl>(ND) ||
-         llvm::isa_and_nonnull<TypedefDecl>(ND)))
+    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))
       return (TCppScope_t)(ND->getCanonicalDecl());
 
     return 0;