diff options
| author | Ilya Biryukov <ibiryukov@google.com> | 2018-05-30 12:50:48 +0000 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-05-31 07:44:04 +0000 |
| commit | 52ffed3d7bb3f69566fb40cc3251aaa6ed8e51c2 (patch) | |
| tree | 7478b44074e195ca6789fad5bb837ecbefef4a5b /lib/Sema | |
| parent | 12a3d091adc5a3a730904ade40a4eb74ffec7663 (diff) | |
[backported/clang-7][Sema] Don't skip function bodies with 'auto' without trailing return type
--------------------------------------------------------------------------
* https://reviews.llvm.org/D44480
--------------------------------------------------------------------------
Summary:
Skipping them was clearly not intentional. It's impossible to
guarantee correctness if the bodies are skipped.
Also adds a test case for r327504, now that it does not produce
invalid errors that made the test fail.
Reviewers: aaron.ballman, sammccall, rsmith
Reviewed By: rsmith
Subscribers: rayglover-ibm, rwols, cfe-commits
Differential Revision: https://reviews.llvm.org/D44480
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@333538 91177308-0d34-0410-b5e6-96231b3b80d8
Task-number: QTCREATORBUG-20515
Change-Id: I5d60a094a967dc0e1e401256a1d70093084909f5
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 7ca48c34e5..520f01a91b 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -12172,9 +12172,15 @@ bool Sema::canSkipFunctionBody(Decl *D) { // rest of the file. // We cannot skip the body of a function with an undeduced return type, // because any callers of that function need to know the type. - if (const FunctionDecl *FD = D->getAsFunction()) - if (FD->isConstexpr() || FD->getReturnType()->isUndeducedType()) + if (const FunctionDecl *FD = D->getAsFunction()) { + if (FD->isConstexpr()) return false; + // We can't simply call Type::isUndeducedType here, because inside template + // auto can be deduced to a dependent type, which is not considered + // "undeduced". + if (FD->getReturnType()->getContainedDeducedType()) + return false; + } return Consumer.shouldSkipFunctionBody(D); } |