Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

swift-ci · swift-ci · commit e85c04a3cd98 · 2016-10-11T10:31:09.000-07:00
* origin/swift-3.1-branch:
  [RegisterScavenger] Remove aliasing registers of operands from the candidate set
diff --git a/lib/CodeGen/RegisterScavenging.cpp b/lib/CodeGen/RegisterScavenging.cpp
@@ -419,7 +419,8 @@ unsigned RegScavenger::scavengeRegister(const TargetRegisterClass *RC,
   for (const MachineOperand &MO : MI.operands()) {
     if (MO.isReg() && MO.getReg() != 0 && !(MO.isUse() && MO.isUndef()) &&
         !TargetRegisterInfo::isVirtualRegister(MO.getReg()))
-      Candidates.reset(MO.getReg());
+      for (MCRegAliasIterator AI(MO.getReg(), TRI, true); AI.isValid(); ++AI)
+        Candidates.reset(*AI);
   }
 
   // Try to find a register that's unused if there is one, as then we won't

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,8 @@ unsigned RegScavenger::scavengeRegister(const TargetRegisterClass *RC,`
`419`	`419`	`for (const MachineOperand &MO : MI.operands()) {`
`420`	`420`	`if (MO.isReg() && MO.getReg() != 0 && !(MO.isUse() && MO.isUndef()) &&`
`421`	`421`	`!TargetRegisterInfo::isVirtualRegister(MO.getReg()))`
`422`		`- Candidates.reset(MO.getReg());`
	`422`	`+ for (MCRegAliasIterator AI(MO.getReg(), TRI, true); AI.isValid(); ++AI)`
	`423`	`+ Candidates.reset(*AI);`
`423`	`424`	`}`
`424`	`425`
`425`	`426`	`// Try to find a register that's unused if there is one, as then we won't`