diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2016-09-19 22:57:26 -0700 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2016-10-24 23:58:47 -0700 |
commit | de2d8694e25a814696358e95141f4b1aa4d8847e (patch) | |
tree | c7d38f5bcbb5cac2908ca83704d58b1d7af72752 /lib/Target/WebAssembly/WebAssemblyRegColoring.cpp | |
parent | da112fc9f478e25fc27ede821e85a18687adfbdf (diff) | |
download | llvm-de2d8694e25a814696358e95141f4b1aa4d8847e.tar.gz |
Update aosp/master LLVM for rebase to r275480
Bug: http://b/31320715
This merges commit 7dcf7f03e005379ef2f06db96aa93f06186b66d5 from
aosp/dev.
Test: Build AOSP and run RenderScript tests (host tests for slang and
libbcc, RsTest, CTS)
Change-Id: Iaf3738f74312d875e69f61d604ac058f381a2a1a
Diffstat (limited to 'lib/Target/WebAssembly/WebAssemblyRegColoring.cpp')
-rw-r--r-- | lib/Target/WebAssembly/WebAssemblyRegColoring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/WebAssembly/WebAssemblyRegColoring.cpp b/lib/Target/WebAssembly/WebAssemblyRegColoring.cpp index 9ec66595d8da..dedd9108dfd5 100644 --- a/lib/Target/WebAssembly/WebAssemblyRegColoring.cpp +++ b/lib/Target/WebAssembly/WebAssemblyRegColoring.cpp @@ -66,7 +66,7 @@ static float computeWeight(const MachineRegisterInfo *MRI, float weight = 0.0f; for (MachineOperand &MO : MRI->reg_nodbg_operands(VReg)) weight += LiveIntervals::getSpillWeight(MO.isDef(), MO.isUse(), MBFI, - MO.getParent()); + *MO.getParent()); return weight; } @@ -99,7 +99,7 @@ bool WebAssemblyRegColoring::runOnMachineFunction(MachineFunction &MF) { unsigned VReg = TargetRegisterInfo::index2VirtReg(i); if (MFI.isVRegStackified(VReg)) continue; - // Skip unused registers, which can use $discard. + // Skip unused registers, which can use $drop. if (MRI->use_empty(VReg)) continue; |