[clang] [coroutine] Fix type of an ImplicitParamDecl used in generateAwaitSuspendWrapper (PR #87134)

Akira Hatanaka via cfe-commits cfe-commits at lists.llvm.org
Fri Mar 29 18:39:25 PDT 2024


https://github.com/ahatanak created https://github.com/llvm/llvm-project/pull/87134

Use the correct type for AwaiterDecl instead of using `void *`.

See the discussion here:
https://github.com/llvm/llvm-project/pull/79712#discussion_r1544153100

>From 0f3f51dfe8a63c76c7d006511a8f329526123f54 Mon Sep 17 00:00:00 2001
From: Akira Hatanaka <ahatanak at gmail.com>
Date: Fri, 29 Mar 2024 15:23:30 -0700
Subject: [PATCH] [coroutine] Fix type of an ImplicitParamDecl used in
 generateAwaitSuspendWrapper

Use the correct type for AwaiterDecl instead of using `void *`.

See the discussion here:
https://github.com/llvm/llvm-project/pull/79712#discussion_r1544153100
---
 clang/lib/CodeGen/CGCoroutine.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/clang/lib/CodeGen/CGCoroutine.cpp b/clang/lib/CodeGen/CGCoroutine.cpp
index 93ca711f716fce..dd005fdaa8f745 100644
--- a/clang/lib/CodeGen/CGCoroutine.cpp
+++ b/clang/lib/CodeGen/CGCoroutine.cpp
@@ -422,7 +422,9 @@ CodeGenFunction::generateAwaitSuspendWrapper(Twine const &CoroName,
 
   FunctionArgList args;
 
-  ImplicitParamDecl AwaiterDecl(C, C.VoidPtrTy, ImplicitParamKind::Other);
+  QualType AwaiterType = S.getOpaqueValue()->getType();
+  ImplicitParamDecl AwaiterDecl(C, C.getPointerType(AwaiterType),
+                                ImplicitParamKind::Other);
   ImplicitParamDecl FrameDecl(C, C.VoidPtrTy, ImplicitParamKind::Other);
   QualType ReturnTy = S.getSuspendExpr()->getType();
 
@@ -449,8 +451,7 @@ CodeGenFunction::generateAwaitSuspendWrapper(Twine const &CoroName,
 
   // FIXME: add TBAA metadata to the loads
   llvm::Value *AwaiterPtr = Builder.CreateLoad(GetAddrOfLocalVar(&AwaiterDecl));
-  auto AwaiterLValue =
-      MakeNaturalAlignAddrLValue(AwaiterPtr, AwaiterDecl.getType());
+  auto AwaiterLValue = MakeNaturalAlignAddrLValue(AwaiterPtr, AwaiterType);
 
   CurAwaitSuspendWrapper.FramePtr =
       Builder.CreateLoad(GetAddrOfLocalVar(&FrameDecl));



More information about the cfe-commits mailing list