r350282 - [libclang] CoroutineBody/Coreturn statements are UnexposedStmts and not Exprs

[Alex L via cfe-commits]

Oops, I committed wrong column number in the test due to reindentation.
Fixed in r350283.

~ Alex

On Wed, 2 Jan 2019 at 17:16, Alex Lorenz via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Author: arphaman
> Date: Wed Jan  2 17:13:33 2019
> New Revision: 350282
>
> URL: http://llvm.org/viewvc/llvm-project?rev=350282&view=rev
> Log:
> [libclang] CoroutineBody/Coreturn statements are UnexposedStmts and not
> Exprs
>
> This change ensures that the libclang CXCursor represents the CoroutineBody
> and the Coreturn statement using the appropriate CXCursor_UnexposedStmt
> kind
> instead of CXCursor_UnexposedExpr. The problem with CXCursor_UnexposedExpr
> is
> that the consumer functions assumed that CoroutineBody/Coreturn statements
> were valid expressions and performed an invalid downcast to Expr causing
> assertion failures or other crashes.
>
> rdar://40204290
>
> Added:
>     cfe/trunk/test/Index/coroutines.cpp
> Modified:
>     cfe/trunk/tools/libclang/CXCursor.cpp
>
> Added: cfe/trunk/test/Index/coroutines.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/coroutines.cpp?rev=350282&view=auto
>
> ==============================================================================
> --- cfe/trunk/test/Index/coroutines.cpp (added)
> +++ cfe/trunk/test/Index/coroutines.cpp Wed Jan  2 17:13:33 2019
> @@ -0,0 +1,24 @@
> +// RUN: c-index-test -test-load-source all -c %s -fsyntax-only -target
> x86_64-apple-darwin9 -fcoroutines-ts -std=c++1z -I%S/../SemaCXX/Inputs |
> FileCheck %s
> +#include "std-coroutine.h"
> +
> +using std::experimental::suspend_always;
> +using std::experimental::suspend_never;
> +
> +struct promise_void {
> +  void get_return_object();
> +  suspend_always initial_suspend();
> +  suspend_always final_suspend();
> +  void return_void();
> +  void unhandled_exception();
> +};
> +
> +template <>
> +struct std::experimental::coroutine_traits<void> { using promise_type =
> promise_void; };
> +
> +void CoroutineTestRet() {
> +  co_return;
> +}
> +// CHECK: [[@LINE-3]]:25: UnexposedStmt=
> +// CHECK-SAME: [[@LINE-4]]:25 - [[@LINE-2]]:2]
> +// CHECK: [[@LINE-4]]:5: UnexposedStmt=
> +// CHECK-SAME: [[@LINE-5]]:5 - [[@LINE-5]]:14]
>
> Modified: cfe/trunk/tools/libclang/CXCursor.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXCursor.cpp?rev=350282&r1=350281&r2=350282&view=diff
>
> ==============================================================================
> --- cfe/trunk/tools/libclang/CXCursor.cpp (original)
> +++ cfe/trunk/tools/libclang/CXCursor.cpp Wed Jan  2 17:13:33 2019
> @@ -241,16 +241,19 @@ CXCursor cxcursor::MakeCXCursor(const St
>    case Stmt::SEHLeaveStmtClass:
>      K = CXCursor_SEHLeaveStmt;
>      break;
> -
> +
> +  case Stmt::CoroutineBodyStmtClass:
> +  case Stmt::CoreturnStmtClass:
> +    K = CXCursor_UnexposedStmt;
> +    break;
> +
>    case Stmt::ArrayTypeTraitExprClass:
>    case Stmt::AsTypeExprClass:
>    case Stmt::AtomicExprClass:
>    case Stmt::BinaryConditionalOperatorClass:
>    case Stmt::TypeTraitExprClass:
> -  case Stmt::CoroutineBodyStmtClass:
>    case Stmt::CoawaitExprClass:
>    case Stmt::DependentCoawaitExprClass:
> -  case Stmt::CoreturnStmtClass:
>    case Stmt::CoyieldExprClass:
>    case Stmt::CXXBindTemporaryExprClass:
>    case Stmt::CXXDefaultArgExprClass:
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190102/1c4f0f6c/attachment-0001.html>