Only do the code-duplication fix.

Author: JonPsson1

llvm/include/llvm/CodeGen/MachineFrameInfo.h

@@ -638,7 +638,7 @@ class MachineFrameInfo {
   bool hasTailCall() const { return HasTailCall; }
   void setHasTailCall(bool V = true) { HasTailCall = V; }
 
-  /// Computes the maximum size of a callframe.
+  /// Computes the maximum size of a callframe and the AdjustsStack property.
   /// This only works for targets defining
   /// TargetInstrInfo::getCallFrameSetupOpcode(), getCallFrameDestroyOpcode(),
   /// and getFrameSize().

llvm/lib/CodeGen/MachineFrameInfo.cpp

@@ -202,6 +202,11 @@ void MachineFrameInfo::computeMaxCallFrameSize(
         AdjustsStack = true;
         if (FrameSDOps != nullptr)
           FrameSDOps->push_back(&MI);
+      } else if (MI.isInlineAsm()) {
+        // Some inline asm's need a stack frame, as indicated by operand 1.
+        unsigned ExtraInfo = MI.getOperand(InlineAsm::MIOp_ExtraInfo).getImm();
+        if (ExtraInfo & InlineAsm::Extra_IsAlignStack)
+          AdjustsStack = true;
       }
     }
   }

llvm/lib/CodeGen/PrologEpilogInserter.cpp

@@ -228,8 +228,9 @@ bool PEI::runOnMachineFunction(MachineFunction &MF) {
   FrameIndexVirtualScavenging = TRI->requiresFrameIndexScavenging(MF);
   ORE = &getAnalysis<MachineOptimizationRemarkEmitterPass>().getORE();
 
-  // Calculate the MaxCallFrameSize value for the function's frame
-  // information. Also eliminates call frame pseudo instructions.
+  // Calculate the MaxCallFrameSize and AdjustsStack variables for the
+  // function's frame information. Also eliminates call frame pseudo
+  // instructions.
   calculateCallFrameInfo(MF);
 
   // Determine placement of CSR spill/restore code and prolog/epilog code:
@@ -349,8 +350,9 @@ bool PEI::runOnMachineFunction(MachineFunction &MF) {
   return true;
 }
 
-/// Calculate the MaxCallFrameSize variables for the function's frame
-/// information and eliminate call frame pseudo instructions.
+/// Calculate the MaxCallFrameSize and AdjustsStack
+/// variables for the function's frame information and eliminate call frame
+/// pseudo instructions.
 void PEI::calculateCallFrameInfo(MachineFunction &MF) {
   const TargetInstrInfo &TII = *MF.getSubtarget().getInstrInfo();
   const TargetFrameLowering *TFI = MF.getSubtarget().getFrameLowering();
@@ -366,13 +368,13 @@ void PEI::calculateCallFrameInfo(MachineFunction &MF) {
     return;
 
   // (Re-)Compute the MaxCallFrameSize with some sanity checks.
-  bool WasComputed = MFI.isMaxCallFrameSizeComputed();
+  bool CFSComputedIn = MFI.isMaxCallFrameSizeComputed();
   unsigned MaxCFSIn = MFI.getMaxCallFrameSize();
   bool AdjStackIn = MFI.adjustsStack();
   std::vector<MachineBasicBlock::iterator> FrameSDOps;
   MFI.computeMaxCallFrameSize(MF, &FrameSDOps);
-  assert(!WasComputed || (MaxCFSIn >= MFI.getMaxCallFrameSize() &&
-                          !(!AdjStackIn && MFI.adjustsStack())));
+  assert(!CFSComputedIn || (MaxCFSIn >= MFI.getMaxCallFrameSize() &&
+                            !(!AdjStackIn && MFI.adjustsStack())));
 
   if (TFI->canSimplifyCallFramePseudos(MF)) {
     // If call frames are not being included as part of the stack frame, and

llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

@@ -670,12 +670,12 @@ bool SelectionDAGISel::runOnMachineFunction(MachineFunction &mf) {
 
     for (const auto &MI : MBB) {
       const MCInstrDesc &MCID = TII->get(MI.getOpcode());
-      if ((MCID.isCall() && !MCID.isReturn()) || MI.isStackAligningInlineAsm())
+      if ((MCID.isCall() && !MCID.isReturn()) ||
+          MI.isStackAligningInlineAsm()) {
         MFI.setHasCalls(true);
+      }
       if (MI.isInlineAsm()) {
         MF->setHasInlineAsm(true);
-        if (MI.isStackAligningInlineAsm())
-          MFI.setAdjustsStack(true);
       }
     }
   }