2 files changed, 11 insertions, 5 deletions
diff --git a/backend/lib/CodeGen/MachineOptimizationPipeline.cpp b/backend/lib/CodeGen/MachineOptimizationPipeline.cpp
index e61dfdc..cbc4b1a 100644
--- a/backend/lib/CodeGen/MachineOptimizationPipeline.cpp
+++ b/backend/lib/CodeGen/MachineOptimizationPipeline.cpp
@@ -77,10 +77,10 @@ Expected<void> addPreRegisterAllocationOptimizationPipeline(
                                        TargetInfo.SchedulerOptions);
 }
 
-Expected<void>
-addPostRegisterAllocationPipeline(MachineFunctionPassManager &Pipeline,
-                                  const MachineOptimizationPipelineTargetInfo &TargetInfo,
-                                  MachineOptimizationPipelineOptions Options) {
+Expected<void> addPostRegisterAllocationPipeline(
+    MachineFunctionPassManager &Pipeline, const MachineOptimizationPipelineTargetInfo &TargetInfo,
+    MachineOptimizationPipelineOptions Options,
+    std::unique_ptr<MachineFunctionPass> PostRAPseudoExpansionTargetPass) {
   auto Added = addPass<MachineStackSlotColoringPass>(Pipeline);
   if (!Added)
     return std::unexpected(Added.error());
@@ -112,6 +112,11 @@ addPostRegisterAllocationPipeline(MachineFunctionPassManager &Pipeline,
   Added = addPass<ExpandPostRAPseudosPass>(Pipeline, TargetInfo.PseudoExpansion);
   if (!Added)
     return std::unexpected(Added.error());
+  if (PostRAPseudoExpansionTargetPass != nullptr) {
+    Added = Pipeline.addPass(std::move(PostRAPseudoExpansionTargetPass));
+    if (!Added)
+      return std::unexpected(Added.error());
+  }
   Added = addPass<PostRASchedulerPass>(Pipeline, TargetInfo.SchedulingModel,
                                        TargetInfo.SchedulerOptions);
   if (!Added)
diff --git a/backend/lib/CodeGen/MachinePseudoExpansion.cpp b/backend/lib/CodeGen/MachinePseudoExpansion.cpp
index 3d169cc..67a8ef8 100644
--- a/backend/lib/CodeGen/MachinePseudoExpansion.cpp
+++ b/backend/lib/CodeGen/MachinePseudoExpansion.cpp
@@ -328,7 +328,8 @@ expandImplementation(MachineFunction &Function, const TargetDescription &Target,
                             "pseudo expansion left an instruction owned by the completed phase");
     }
   }
-  if (Changed && Function.properties().has(MachineFunctionProperty::TracksLiveness)) {
+  if (Changed && Phase != MachinePseudoExpansionPhase::PostRA &&
+      Function.properties().has(MachineFunctionProperty::TracksLiveness)) {
     auto Rebuilt = rebuildMachineLiveness(Function, Target);
     if (!Rebuilt)
       return std::unexpected(Rebuilt.error());