commit b24a7111b451e8b556824634e08bcf81fd36d255
author Serge Pavlov <sepavloff@gmail.com> Sun Aug 23 11:09:40 2015 +0000
committer Serge Pavlov <sepavloff@gmail.com> Sun Aug 23 11:09:40 2015 +0000
tree 64a6f2a9d92333cb48d0bc595a8fab7b847e51ee
parent 73c6a2448f24d13e16f34d46095ef7ad4bd1f145

Changes missed from r245810

llvm-svn: 245811

clang/lib/AST/DeclBase.cpp

diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index 00d7d32..c34126e 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -268,13 +268,13 @@
 
 bool Decl::isLexicallyWithinFunctionOrMethod() const {
   const DeclContext *LDC = getLexicalDeclContext();
-  do {
+  while (true) {
     if (LDC->isFunctionOrMethod())
       return true;
     if (!isa<TagDecl>(LDC))
       return false;
-    LDC = LDC->getParent();
-  } while (LDC);
+    LDC = LDC->getLexicalParent();
+  }
   return false;
 }