Author: ibiryukov Date: Wed May 30 05:50:48 2018 New Revision: 333538 URL: http://llvm.org/viewvc/llvm-project?rev=333538&view=rev Log: [Sema] Don't skip function bodies with 'auto' without trailing return type
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 Added: cfe/trunk/test/CodeCompletion/crash-skipped-bodies-template-inst.cpp cfe/trunk/test/CodeCompletion/skip-auto-funcs.cpp Modified: cfe/trunk/lib/Sema/SemaDecl.cpp Modified: cfe/trunk/lib/Sema/SemaDecl.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=333538&r1=333537&r2=333538&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaDecl.cpp (original) +++ cfe/trunk/lib/Sema/SemaDecl.cpp Wed May 30 05:50:48 2018 @@ -12660,9 +12660,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); } Added: cfe/trunk/test/CodeCompletion/crash-skipped-bodies-template-inst.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/crash-skipped-bodies-template-inst.cpp?rev=333538&view=auto ============================================================================== --- cfe/trunk/test/CodeCompletion/crash-skipped-bodies-template-inst.cpp (added) +++ cfe/trunk/test/CodeCompletion/crash-skipped-bodies-template-inst.cpp Wed May 30 05:50:48 2018 @@ -0,0 +1,27 @@ +// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:24:5 %s -o - 2>&1 | FileCheck %s +template <class T> +auto make_func() { + struct impl { + impl* func() { + int x; + if (x = 10) {} + // Check that body of this function is actually skipped. + // CHECK-NOT: crash-skipped-bodies-template-inst.cpp:7:{{[0-9]+}}: warning: using the result of an assignment as a condition without parentheses + return this; + } + }; + + int x; + if (x = 10) {} + // Check that this function is not skipped. + // CHECK: crash-skipped-bodies-template-inst.cpp:15:9: warning: using the result of an assignment as a condition without parentheses + return impl(); +} + +void foo() { + []() { + make_func<int>(); + m + // CHECK: COMPLETION: make_func : [#auto#]make_func<<#class T#>>() + }; +} Added: cfe/trunk/test/CodeCompletion/skip-auto-funcs.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/skip-auto-funcs.cpp?rev=333538&view=auto ============================================================================== --- cfe/trunk/test/CodeCompletion/skip-auto-funcs.cpp (added) +++ cfe/trunk/test/CodeCompletion/skip-auto-funcs.cpp Wed May 30 05:50:48 2018 @@ -0,0 +1,43 @@ +// We run clang in completion mode to force skipping of function bodies and +// check if the function bodies were skipped by observing the warnings that +// clang produces. +// RUN: not %clang_cc1 -fsyntax-only -code-completion-at=%s:42:1 %s -o - 2>&1 | FileCheck %s +template <class T> +auto not_skipped() { + int x; + if (x = 10) {} + // Check that this function is not skipped. + // CHECK: 8:9: warning: using the result of an assignment as a condition without parentheses + return 1; +} + +template <class T> +auto lambda_not_skipped = []() { + int x; + if (x = 10) {} + // Check that this function is not skipped. + // CHECK: 17:9: warning: using the result of an assignment as a condition without parentheses + return 1; +} + +template <class T> +auto skipped() -> T { + int x; + if (x = 10) {} + // Check that this function is skipped. + // CHECK-NOT: 26:9: warning: using the result of an assignment as a condition without parentheses + return 1; +}; + +auto lambda_skipped = []() -> int { + int x; + if (x = 10) {} + // This could potentially be skipped, but it isn't at the moment. + // CHECK: 34:9: warning: using the result of an assignment as a condition without parentheses + return 1; +}; + +int test() { + int complete_in_this_function; + // CHECK: COMPLETION: complete_in_this_function +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
