Revert "Use an artifical namespace so that member vars do not hide lo…

…cal vars." Summary: This reverts commit 8af14b5f9af68c31ac80945e5b5d56f0a14b38e4. Reverting as it breaks a few tests on Mac. Reviewers: spyffe Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D16895 llvm-svn: 259823
llvm · Feb 4, 2016 · 77b326f · 77b326f
1 parent 6ecf633
commit 77b326f
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 409 deletions.
diff --git a/lldb/include/lldb/Symbol/ClangASTContext.h b/lldb/include/lldb/Symbol/ClangASTContext.h
@@ -422,11 +422,6 @@ class ClangASTContext : public TypeSystem
     GetUniqueNamespaceDeclaration (const char *name,
                                    clang::DeclContext *decl_ctx);
 
-    static clang::NamespaceDecl *
-    GetUniqueNamespaceDeclaration (clang::ASTContext *ast,
-                                   const char *name,
-                                   clang::DeclContext *decl_ctx);
-
     //------------------------------------------------------------------
     // Function Types
     //------------------------------------------------------------------
@@ -570,9 +565,7 @@ class ClangASTContext : public TypeSystem
     //----------------------------------------------------------------------
 
     std::vector<CompilerDecl>
-    DeclContextFindDeclByName (void *opaque_decl_ctx,
-                               ConstString name,
-                               const bool ignore_using_decls) override;
+    DeclContextFindDeclByName (void *opaque_decl_ctx, ConstString name) override;
 
     bool
     DeclContextIsStructUnionOrClass (void *opaque_decl_ctx) override;

diff --git a/lldb/include/lldb/Symbol/CompilerDeclContext.h b/lldb/include/lldb/Symbol/CompilerDeclContext.h
@@ -66,7 +66,7 @@ class CompilerDeclContext
     IsClang () const;
 
     std::vector<CompilerDecl>
-    FindDeclByName (ConstString name, const bool ignore_using_decls);
+    FindDeclByName (ConstString name);
 
     //----------------------------------------------------------------------
     /// Checks if this decl context represents a method of a class.

diff --git a/lldb/include/lldb/Symbol/TypeSystem.h b/lldb/include/lldb/Symbol/TypeSystem.h
@@ -143,9 +143,7 @@ class TypeSystem : public PluginInterface
     //----------------------------------------------------------------------
 
     virtual std::vector<CompilerDecl>
-    DeclContextFindDeclByName (void *opaque_decl_ctx,
-                               ConstString name,
-                               const bool ignore_imported_decls);
+    DeclContextFindDeclByName (void *opaque_decl_ctx, ConstString name);
 
     virtual bool
     DeclContextIsStructUnionOrClass (void *opaque_decl_ctx) = 0;

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile
diff --git a/...te/test/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py b/...te/test/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/main.cpp