diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-09-05 22:30:37 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-09-05 22:30:37 +0000 |
commit | 5786130f48520f80c14529cdbdf48968168b9a41 (patch) | |
tree | f8d0e94401536c0099d92491aa417828297c1913 /lib/Sema/SemaTemplateInstantiate.cpp | |
parent | b9640bc0c266e2c5d2ec36828dc1ac66ab903112 (diff) |
PR38627: Fix handling of exception specification adjustment for
destructors.
We previously tried to patch up the exception specification after
completing the class, which went wrong when the exception specification
was needed within the class body (in particular, by a friend
redeclaration of the destructor in a nested class). We now mark the
destructor as having a not-yet-computed exception specification
immediately after creating it.
This requires delaying various checks against the exception
specification (where we'd previously have just got the wrong exception
specification, and now find we have an exception specification that we
can't compute yet) when those checks fire while the class is being
defined.
This also exposed an issue that we were missing a CodeSynthesisContext
for computation of exception specifications (otherwise we'd fail to make
the module containing the definition of the class visible when computing
its members' exception specs). Adding that incidentally also gives us a
diagnostic quality improvement.
This has also exposed an pre-existing problem: making the exception
specification evaluation context a non-SFINAE context (as it should be)
results in a bootstrap failure; PR38850 filed for this.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@341499 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiate.cpp')
-rw-r--r-- | lib/Sema/SemaTemplateInstantiate.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp index 9a5879e675..5666cf04a2 100644 --- a/lib/Sema/SemaTemplateInstantiate.cpp +++ b/lib/Sema/SemaTemplateInstantiate.cpp @@ -199,6 +199,7 @@ bool Sema::CodeSynthesisContext::isInstantiationRecord() const { case DefaultTemplateArgumentChecking: case DeclaringSpecialMember: case DefiningSynthesizedFunction: + case ExceptionSpecEvaluation: return false; // This function should never be called when Kind's value is Memoization. @@ -621,6 +622,12 @@ void Sema::PrintInstantiationStack() { break; } + case CodeSynthesisContext::ExceptionSpecEvaluation: + Diags.Report(Active->PointOfInstantiation, + diag::note_evaluating_exception_spec_here) + << cast<FunctionDecl>(Active->Entity); + break; + case CodeSynthesisContext::ExceptionSpecInstantiation: Diags.Report(Active->PointOfInstantiation, diag::note_template_exception_spec_instantiation_here) @@ -695,6 +702,12 @@ Optional<TemplateDeductionInfo *> Sema::isSFINAEContext() const { // there is no SFINAE. return None; + case CodeSynthesisContext::ExceptionSpecEvaluation: + // FIXME: This should not be treated as a SFINAE context, because + // we will cache an incorrect exception specification. However, clang + // bootstrap relies this! See PR31692. + break; + case CodeSynthesisContext::Memoization: break; } |