diff options
| -rw-r--r-- | clang/lib/Sema/SemaCoroutine.cpp | 7 | ||||
| -rw-r--r-- | clang/test/SemaCXX/coroutine-source-location-crash.cpp | 33 |
2 files changed, 39 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaCoroutine.cpp b/clang/lib/Sema/SemaCoroutine.cpp index e4cb4cf059f..95758baff4a 100644 --- a/clang/lib/Sema/SemaCoroutine.cpp +++ b/clang/lib/Sema/SemaCoroutine.cpp @@ -708,9 +708,14 @@ ExprResult Sema::BuildResolvedCoawaitExpr(SourceLocation Loc, Expr *E, if (E->getValueKind() == VK_RValue) E = CreateMaterializeTemporaryExpr(E->getType(), E, true); + // The location of the `co_await` token cannot be used when constructing + // the member call expressions since it's before the location of `Expr`, which + // is used as the start of the member call expression. + SourceLocation CallLoc = E->getExprLoc(); + // Build the await_ready, await_suspend, await_resume calls. ReadySuspendResumeResult RSS = - buildCoawaitCalls(*this, Coroutine->CoroutinePromise, Loc, E); + buildCoawaitCalls(*this, Coroutine->CoroutinePromise, CallLoc, E); if (RSS.IsInvalid) return ExprError(); diff --git a/clang/test/SemaCXX/coroutine-source-location-crash.cpp b/clang/test/SemaCXX/coroutine-source-location-crash.cpp new file mode 100644 index 00000000000..04fb1d45c52 --- /dev/null +++ b/clang/test/SemaCXX/coroutine-source-location-crash.cpp @@ -0,0 +1,33 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin9 %s -std=c++14 -fcoroutines-ts \ +// RUN: -fsyntax-only -ast-dump | FileCheck %s +#include "Inputs/std-coroutine.h" + +using namespace std::experimental; + +struct A { + bool await_ready(); + void await_resume(); + template <typename F> + void await_suspend(F); +}; + +struct coro_t { + struct promise_type { + coro_t get_return_object(); + suspend_never initial_suspend(); + suspend_never final_suspend(); + void return_void(); + static void unhandled_exception(); + }; +}; + +// {{0x[0-9a-fA-F]+}} <line:[[@LINE+1]]:1, col:36> +// CHECK-LABEL: FunctionDecl {{.*}} f 'coro_t (int)' +coro_t f(int n) { + A a{}; + // CHECK: CoawaitExpr {{0x[0-9a-fA-F]+}} <col:3, col:12> + // CHECK-NEXT: DeclRefExpr {{0x[0-9a-fA-F]+}} <col:12> + // CHECK-NEXT: CXXMemberCallExpr {{0x[0-9a-fA-F]+}} <col:12> + // CHECK-NEXT: MemberExpr {{0x[0-9a-fA-F]+}} <col:12> + co_await a; +} |
