[AST][Coroutine] Fix CoyieldExpr missing end loc

Coroutine co_yield/co_await/co_return are implemented by a serious of
synthesized CXXMemberExpr which have no lexical right-side parenthesis.

This fix uses the end loc of inner expr as the hypothetical RParenLoc of
CXXMemberExpr. For tools this might be an issue since the RParen token doesn't
exist (but has a valid location).

For future improvement, we might:
1. mark those inner (generated) exprs as implict (tools have chances to skip
   these nodes) (by @aaron.ballman)
2. borrow the idea from InitListExpr, there are two forms, one is for semantic,
   the other one is for syntactic, having these two split can make everything
   easier (by @hokein)

Fixes https://github.com/llvm/llvm-project/issues/64483

Reviewed By: aaron.ballman, hokein

Differential Revision: https://reviews.llvm.org/D157296
This commit is contained in:
dingfei 2023-08-10 08:02:32 +08:00
parent ec129c28af
commit 8d60e10ce4
3 changed files with 54 additions and 4 deletions

View File

@ -318,7 +318,8 @@ static ExprResult buildMemberCall(Sema &S, Expr *Base, SourceLocation Loc,
return ExprError();
}
return S.BuildCallExpr(nullptr, Result.get(), Loc, Args, Loc, nullptr);
auto EndLoc = Args.empty() ? Loc : Args.back()->getEndLoc();
return S.BuildCallExpr(nullptr, Result.get(), Loc, Args, EndLoc, nullptr);
}
// See if return type is coroutine-handle and if so, invoke builtin coro-resume

View File

@ -55,9 +55,9 @@ template <typename Promise> struct coroutine_handle : coroutine_handle<> {
};
struct suspend_always {
bool await_ready() { return false; }
void await_suspend(coroutine_handle<>) {}
void await_resume() {}
bool await_ready() noexcept { return false; }
void await_suspend(coroutine_handle<>) noexcept {}
void await_resume() noexcept {}
};
struct suspend_never {

View File

@ -0,0 +1,49 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin9 %s -std=c++20 \
// RUN: -fsyntax-only -ast-dump | FileCheck %s
#include "Inputs/std-coroutine.h"
using namespace std;
struct Chat {
struct promise_type {
std::suspend_always initial_suspend() { return {}; }
Chat get_return_object() {
return std::coroutine_handle<promise_type>::from_promise(*this);
}
std::suspend_always yield_value(int m) { return {}; }
std::suspend_always final_suspend() noexcept { return {}; }
std::suspend_always return_value(int) { return {}; }
void unhandled_exception() {}
auto await_transform(int s) {
struct awaiter {
promise_type *promise;
bool await_ready() { return true; }
int await_resume() { return promise->message; }
void await_suspend(std::coroutine_handle<>) {}
};
return awaiter{this};
}
int message;
};
Chat(std::coroutine_handle<promise_type> promise);
std::coroutine_handle<promise_type> handle;
};
Chat f(int s) {
// CHECK: CoyieldExpr {{.*}} <col:3, col:12>
// CHECK-NEXT: CXXMemberCallExpr {{.*}} <col:3, col:12> {{.*}}
// CHECK-NEXT: MemberExpr {{.*}} <col:3> {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} <col:3> {{.*}}
// CHECK-NEXT: ImplicitCastExpr {{.*}} <col:12> {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} <col:12> {{.*}}
co_yield s;
// CHECK: CoreturnStmt {{.*}} <line:{{.*}}:3, col:13>
co_return s;
// CHECK: CoawaitExpr {{.*}} <col:3, col:12> 'int'
co_await s;
}