[PATCH] D68192: Fix PR40710: Outlined Function has token parameter but isn't an intrinsic

[Aditya Kumar via Phabricator via llvm-commits]

hiraditya added a comment.

Essentially did this:

  diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
  index 952263c0b1f..49fa07a3648 100644
  --- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp
  +++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
  @@ -1336,13 +1336,13 @@ void CodeExtractor::calculateNewCallTerminatorWeights(
   
   Function *CodeExtractor::extractCodeRegion() {
     ValueSet inputs, outputs, SinkingCands, HoistingCands;
  -  findInputsOutputs(inputs, outputs, SinkingCands, true);
  +  findInputsOutputs(inputs, outputs, SinkingCands);
   
     if (!isEligible(inputs))
       return nullptr;
     // After sanity check, clear inputs as it will be recomputed
     // after CFG is prepared for splitting.
  -  inputs.clear();
  +  //inputs.clear();
   
     // Assumption: this is a single-entry code region, and the header is the first
     // block in the region.
  @@ -1439,7 +1439,7 @@ Function *CodeExtractor::extractCodeRegion() {
     assert(HoistingCands.empty() || CommonExit);
   
     // Find inputs to, outputs from the code region.
  -  findInputsOutputs(inputs, outputs, SinkingCands);
  +  //findInputsOutputs(inputs, outputs, SinkingCands);
   
     // Now sink all instructions which only have non-phi uses inside the region.

and got the failures:

Failing Tests (4):

  LLVM :: Transforms/HotColdSplit/duplicate-phi-preds-crash.ll
  LLVM :: Transforms/HotColdSplit/phi-with-distinct-outlined-values.ll
  LLVM :: Transforms/HotColdSplit/split-phis-in-exit-blocks.ll
  LLVM :: Transforms/HotColdSplit/succ-block-with-self-edge.ll


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68192/new/

https://reviews.llvm.org/D68192