Change some code slighly in AArch64InstrInfo.cpp to work around a gcc optimizer problem. dotnet/android#1182.

vargaz · vargaz · commit bdb3a116dbf4 · 2018-01-18T12:54:46.000-05:00
diff --git a/lib/Target/AArch64/AArch64InstrInfo.cpp b/lib/Target/AArch64/AArch64InstrInfo.cpp
@@ -1703,51 +1703,61 @@ void AArch64InstrInfo::storeRegToStackSlot(
     else if (AArch64::DDRegClass.hasSubClassEq(RC)) {
       assert(Subtarget.hasNEON() &&
              "Unexpected register store without NEON");
-      Opc = AArch64::ST1Twov1d, Offset = false;
+      Opc = AArch64::ST1Twov1d;
+	  Offset = false;
     }
     break;
   case 24:
     if (AArch64::DDDRegClass.hasSubClassEq(RC)) {
       assert(Subtarget.hasNEON() &&
              "Unexpected register store without NEON");
-      Opc = AArch64::ST1Threev1d, Offset = false;
+      Opc = AArch64::ST1Threev1d;
+	  Offset = false;
     }
     break;
   case 32:
     if (AArch64::DDDDRegClass.hasSubClassEq(RC)) {
       assert(Subtarget.hasNEON() &&
              "Unexpected register store without NEON");
-      Opc = AArch64::ST1Fourv1d, Offset = false;
+      Opc = AArch64::ST1Fourv1d;
+	  Offset = false;
     } else if (AArch64::QQRegClass.hasSubClassEq(RC)) {
       assert(Subtarget.hasNEON() &&
              "Unexpected register store without NEON");
-      Opc = AArch64::ST1Twov2d, Offset = false;
+      Opc = AArch64::ST1Twov2d;
+	  Offset = false;
     }
     break;
   case 48:
     if (AArch64::QQQRegClass.hasSubClassEq(RC)) {
       assert(Subtarget.hasNEON() &&
              "Unexpected register store without NEON");
-      Opc = AArch64::ST1Threev2d, Offset = false;
+      Opc = AArch64::ST1Threev2d;
+	  Offset = false;
     }
     break;
   case 64:
     if (AArch64::QQQQRegClass.hasSubClassEq(RC)) {
       assert(Subtarget.hasNEON() &&
              "Unexpected register store without NEON");
-      Opc = AArch64::ST1Fourv2d, Offset = false;
+      Opc = AArch64::ST1Fourv2d;
+	  Offset = false;
     }
     break;
+  default:
+	  assert (0);
   }
   assert(Opc && "Unknown register class");
 
-  const MachineInstrBuilder &MI = BuildMI(MBB, MBBI, DL, get(Opc))
-                                      .addReg(SrcReg, getKillRegState(isKill))
-                                      .addFrameIndex(FI);
-
-  if (Offset)
-    MI.addImm(0);
-  MI.addMemOperand(MMO);
+  if (Offset) {
+	  BuildMI(MBB, MBBI, DL, get(Opc))
+		  .addReg(SrcReg, getKillRegState(isKill))
+		  .addFrameIndex(FI).addImm (0).addMemOperand (MMO);
+  } else {
+	  BuildMI(MBB, MBBI, DL, get(Opc))
+		  .addReg(SrcReg, getKillRegState(isKill))
+		  .addFrameIndex(FI).addMemOperand (MMO);
+  }
 }
 
 void AArch64InstrInfo::loadRegFromStackSlot(
@@ -1839,12 +1849,15 @@ void AArch64InstrInfo::loadRegFromStackSlot(
   }
   assert(Opc && "Unknown register class");
 
-  const MachineInstrBuilder &MI = BuildMI(MBB, MBBI, DL, get(Opc))
-                                      .addReg(DestReg, getDefRegState(true))
-                                      .addFrameIndex(FI);
-  if (Offset)
-    MI.addImm(0);
-  MI.addMemOperand(MMO);
+  if (Offset) {
+	  BuildMI(MBB, MBBI, DL, get(Opc))
+		  .addReg(DestReg, getDefRegState(true))
+		  .addFrameIndex(FI).addImm(0).addMemOperand(MMO);
+  } else {
+	  BuildMI(MBB, MBBI, DL, get(Opc))
+		  .addReg(DestReg, getDefRegState(true))
+		  .addFrameIndex(FI).addMemOperand (MMO);
+  }
 }
 
 void llvm::emitFrameOffset(MachineBasicBlock &MBB,
