added alignment to coro_init, coro_size now returns size_t

Author: GorNishanov

include/llvm/IR/Intrinsics.td

@@ -587,10 +587,12 @@ def int_experimental_gc_relocate : Intrinsic<[llvm_any_ty],
 //===------------------------ Coroutine Intrinsics ---------------===//
 // These are documented in docs/Coroutines.rst
 
-def int_experimental_coro_init : Intrinsic<[llvm_ptr_ty], [llvm_ptr_ty, llvm_ptr_ty, llvm_ptr_ty], []>;
+def int_experimental_coro_init : Intrinsic<[llvm_ptr_ty], 
+ [llvm_ptr_ty, llvm_i32_ty, 
+ llvm_ptr_ty, llvm_ptr_ty], []>;
 def int_experimental_coro_fork : Intrinsic<[llvm_i1_ty], [], []>;
 def int_experimental_coro_frame : Intrinsic<[llvm_ptr_ty], [], []>;
-def int_experimental_coro_size : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>;
+def int_experimental_coro_size : Intrinsic<[llvm_anyint_ty], [], [IntrNoMem]>;
 
 def int_experimental_coro_resume_end : Intrinsic<[], [], []>;
 def int_experimental_coro_elide : Intrinsic<[llvm_ptr_ty], [], []>;

lib/Transforms/Coroutines/CoroSplit.cpp

@@ -494,23 +494,16 @@ struct CoroSplit4 : CoroutineCommon {
  }
 
  static AllocaInst* getPromiseAlloca(IntrinsicInst* CoroInit, CoroutineCommon* CC) {
- auto PromiseAlloca = CoroInit->getArgOperand(1);
+ auto PromiseAlloca = CoroInit->getArgOperand(2);
  if (isa<ConstantPointerNull>(PromiseAlloca))
  return nullptr;
 
  // replace the promise arg to coro.init with null
  // otherwise, we will end up with use before def once we replace
  // allocas with gep instructions relative to coroutine frame which is
  // the result of coro.init call
- CoroInit->setArgOperand(1, ConstantPointerNull::get(CC->bytePtrTy));
-
- if (auto BI = dyn_cast<BitCastInst>(PromiseAlloca)) {
- PromiseAlloca = BI->getOperand(0);
- }
- else if (auto GEP = dyn_cast<GetElementPtrInst>(PromiseAlloca)) {
- assert(GEP->hasAllZeroIndices() && "expecting GEP equivalent of BitCast");
- PromiseAlloca = GEP->getOperand(0);
- }
+ CoroInit->setArgOperand(2, ConstantPointerNull::get(CC->bytePtrTy));
+ PromiseAlloca = PromiseAlloca->stripPointerCasts();
  return cast<AllocaInst>(PromiseAlloca);
  }
 
@@ -634,8 +627,9 @@ struct CoroSplit4 : CoroutineCommon {
  }
  CD->FrameTy->setBody(typeArray);
 
- APInt size(32, DL.getTypeAllocSize(CD->FrameTy));
- ReplaceIntrinsicWith(*ThisFunction, Intrinsic::experimental_coro_size, ConstantInt::get(int32Ty, size));
+ ReplaceIntrinsicWithIntConstant(
+ *ThisFunction, Intrinsic::experimental_coro_size,
+ DL.getTypeAllocSize(CD->FrameTy));
  }
 
  SmallString<16> Scratch;

lib/Transforms/Coroutines/CoroutineCommon.cpp

@@ -170,12 +170,24 @@ void llvm::CoroutineCommon::MoveInReverseOrder(InstrSetVector const &Instrs,
  }
 }
 
-void CoroutineCommon::ReplaceIntrinsicWith(Function &func, Intrinsic::ID id, Value *framePtr) {
+void CoroutineCommon::ReplaceIntrinsicWithIntConstant(Function &func, Intrinsic::ID id, unsigned int Val) {
  for (auto it = inst_begin(func), end = inst_end(func); it != end;) {
  Instruction& I = *it++;
  if (IntrinsicInst* intrin = dyn_cast<IntrinsicInst>(&I))
  if (intrin->getIntrinsicID() == id) {
- intrin->replaceAllUsesWith(framePtr);
+ auto V = ConstantInt::get(intrin->getType(), Val);
+ intrin->replaceAllUsesWith(V);
+ intrin->eraseFromParent();
+ }
+ }
+}
+
+void CoroutineCommon::ReplaceIntrinsicWith(Function &func, Intrinsic::ID id, Value *V) {
+ for (auto it = inst_begin(func), end = inst_end(func); it != end;) {
+ Instruction& I = *it++;
+ if (IntrinsicInst* intrin = dyn_cast<IntrinsicInst>(&I))
+ if (intrin->getIntrinsicID() == id) {
+ intrin->replaceAllUsesWith(V);
  intrin->eraseFromParent();
  }
  }

lib/Transforms/Coroutines/CoroutineCommon.h

@@ -96,7 +96,8 @@ struct LLVM_LIBRARY_VISIBILITY CoroutineCommon {
  static void MoveInReverseOrder(InstrSetVector const &Instrs,
  Instruction *InsertBefore);
 
- static void ReplaceIntrinsicWith(Function &func, Intrinsic::ID id, Value *framePtr);
+ static void ReplaceIntrinsicWith(Function &F, Intrinsic::ID id, Value *framePtr);
+ static void ReplaceIntrinsicWithIntConstant(Function &F, Intrinsic::ID id, unsigned int Val);
 
  void ReplaceCoroDone(IntrinsicInst *intrin);