getFunctionLevelDeclContext needs to get the previous DeclContext if EnterDeclaratorContext has been called. Fixes PR4694. (Doug, please review)

llvm-svn: 78480

2 files changed, 12 insertions, 1 deletions

diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index 0259a3d18d5..b839e769691 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -310,7 +310,8 @@ void Sema::ActOnEndOfTranslationUnit() {
 //===----------------------------------------------------------------------===//
 
 DeclContext *Sema::getFunctionLevelDeclContext() {
-  DeclContext *DC = CurContext;
+  DeclContext *DC = PreDeclaratorDC ? PreDeclaratorDC : CurContext;
+  
   while (isa<BlockDecl>(DC))
     DC = DC->getParent();
   
diff --git a/clang/test/SemaCXX/attr-deprecated.cpp b/clang/test/SemaCXX/attr-deprecated.cpp
index a647d8124dd..99a249e10d9 100644
--- a/clang/test/SemaCXX/attr-deprecated.cpp
+++ b/clang/test/SemaCXX/attr-deprecated.cpp
@@ -2,6 +2,7 @@
 class A {
   void f() __attribute__((deprecated));
   void g(A* a);
+  void h(A* a) __attribute__((deprecated));
 
   int b __attribute__((deprecated));
 };
@@ -14,3 +15,12 @@ void A::g(A* a)
   (void)b; // expected-warning{{'b' is deprecated}}
   (void)a->b; // expected-warning{{'b' is deprecated}}
 }
+
+void A::h(A* a)
+{
+  f();
+  a->f();
+  
+  (void)b;
+  (void)a->b;
+}