maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r347627 "[MS] Push fewer DeclContexts for delayed template parsing" 

It broke the Windows self-host:
http://lab.llvm.org:8011/builders/clang-x64-windows-msvc/builds/1799/steps/stage%202%20build/logs/stdio

I can build
lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MachinePostDominators.cpp.obj to
repro.

llvm-svn: 347630
This commit is contained in:
Reid Kleckner 2018-11-27 02:54:17 +00:00
parent 08d92e4a10
commit 0ef5843dcc
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Parse/ParseTemplate.cpp
View File

@ -1398,12 +1398,7 @@ void Parser::ParseLateTemplatedFuncDef(LateParsedTemplate &LPT) {
unsigned NumParamLists =
Actions.ActOnReenterTemplateScope(getCurScope(), cast<Decl>(*II));
CurTemplateDepthTracker.addDepth(NumParamLists);
// If we find a class in a class, we need to push the context of the
// outermost class to match up with how we would parse a regular C++ class
// inline method.
if (*II != FunD &&
!(isa<CXXRecordDecl>(*II) && isa<CXXRecordDecl>(Actions.CurContext) &&
Actions.CurContext == (*II)->getLexicalParent())) {
if (*II != FunD) {
TemplateParamScopeStack.push_back(new ParseScope(this, Scope::DeclScope));
Actions.PushDeclContext(Actions.getCurScope(), *II);
}

17
clang/test/Parser/DelayedTemplateParsing.cpp
View File

@ -181,20 +181,3 @@ static void h() {
}
}
struct PR38460 {
template <typename>
struct T {
static void foo() {
struct U {
void dummy() {
use_delayed_identifier();
}
};
}
};
};
void use_delayed_identifier();
void trigger_PR38460() {
PR38460::T<int>::foo();
}