[Sema] Avoid instantiating templates only when UncompilableErrorOccurred
and FatalErrorOccurred are both set. This fixes a crash that occurs when a warning promoted to a fatal error leaves the AST in an incomplete state, and then later CFG analysis is run on the incomplete AST. rdar://problem/28558923 Differential Revision: https://reviews.llvm.org/D26166 llvm-svn: 285923
This commit is contained in:
parent
212b93d816
commit
43556c14fe
|
@ -209,9 +209,11 @@ Sema::InstantiatingTemplate::InstantiatingTemplate(
|
|||
sema::TemplateDeductionInfo *DeductionInfo)
|
||||
: SemaRef(SemaRef), SavedInNonInstantiationSFINAEContext(
|
||||
SemaRef.InNonInstantiationSFINAEContext) {
|
||||
// Don't allow further instantiation if a fatal error has occcured. Any
|
||||
// diagnostics we might have raised will not be visible.
|
||||
if (SemaRef.Diags.hasFatalErrorOccurred()) {
|
||||
// Don't allow further instantiation if a fatal error and an uncompilable
|
||||
// error have occcured. Any diagnostics we might have raised will not be
|
||||
// visible, and we do not need to construct a correct AST.
|
||||
if (SemaRef.Diags.hasFatalErrorOccurred() &&
|
||||
SemaRef.Diags.hasUncompilableErrorOccurred()) {
|
||||
Invalid = true;
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++14 %s
|
||||
|
||||
#pragma clang diagnostic fatal "-Wall"
|
||||
#pragma clang diagnostic fatal "-Wold-style-cast"
|
||||
|
||||
template <class T> bool foo0(const long long *a, T* b) {
|
||||
return a == (const long long*)b; // expected-error {{use of old-style cast}}
|
||||
}
|
||||
|
||||
template<class T>
|
||||
struct S1 {
|
||||
};
|
||||
|
||||
template<class T>
|
||||
struct S2 : S1<T> {
|
||||
bool m1(const long long *a, T *b) const { return foo0(a, b); }
|
||||
};
|
||||
|
||||
bool foo1(const long long *a, int *b) {
|
||||
S2<int> s2;
|
||||
return s2.m1(a, b);
|
||||
}
|
Loading…
Reference in New Issue