Kill off PreDeclaratorDC.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91772 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index ef61474..6119b13 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -350,7 +350,7 @@
: LangOpts(pp.getLangOptions()), PP(pp), Context(ctxt), Consumer(consumer),
Diags(PP.getDiagnostics()), SourceMgr(PP.getSourceManager()),
ExternalSource(0), CodeCompleter(CodeCompleter), CurContext(0),
- PreDeclaratorDC(0), CurBlock(0), PackContext(0), ParsingDeclDepth(0),
+ CurBlock(0), PackContext(0), ParsingDeclDepth(0),
IdResolver(pp.getLangOptions()), StdNamespace(0), StdBadAlloc(0),
GlobalNewDeleteDeclared(false),
CompleteTranslationUnit(CompleteTranslationUnit),
@@ -815,7 +815,7 @@
//===----------------------------------------------------------------------===//
DeclContext *Sema::getFunctionLevelDeclContext() {
- DeclContext *DC = PreDeclaratorDC ? PreDeclaratorDC : CurContext;
+ DeclContext *DC = CurContext;
while (isa<BlockDecl>(DC))
DC = DC->getParent();
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 28993c7..41081f2 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -192,10 +192,6 @@
/// CurContext - This is the current declaration context of parsing.
DeclContext *CurContext;
- /// PreDeclaratorDC - Keeps the declaration context before switching to the
- /// context of a declarator's nested-name-specifier.
- DeclContext *PreDeclaratorDC;
-
/// CurBlock - If inside of a block definition, this contains a pointer to
/// the active block object that represents it.
BlockSemaInfo *CurBlock;