[InlineFunction] Fix bug with unifying resume instructions when inlin…

…ing a function that can spawn.
OpenCilk · Feb 17, 2021 · b1f9670 · b1f9670
1 parent 3baa4ce
commit b1f9670
Show file tree

Hide file tree

Showing 2 changed files with 7,796 additions and 1 deletion.
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp
@@ -2530,7 +2530,8 @@ llvm::InlineResult llvm::InlineFunction(CallSite CS, InlineFunctionInfo &IFI,
           Caller->getContext(), "eh.unified.resume.i", Caller);
       // Add a PHI node at the beginning of the block.
       IRBuilder<> Builder(UnifiedResume);
-      PHINode *PN = Builder.CreatePHI(Resumes[0]->getType(), Resumes.size());
+      PHINode *PN =
+          Builder.CreatePHI(Resume->getValue()->getType(), Resumes.size());
       for (ResumeInst *RI : Resumes) {
         // Insert incoming values to the PHI node.
         PN->addIncoming(RI->getValue(), RI->getParent());

diff --git a/llvm/test/Transforms/Tapir/inline-unify-resume.ll b/llvm/test/Transforms/Tapir/inline-unify-resume.ll