[llvm] r263418 - Try to fix build of WebAssemblyRegStackify.cpp on Windows
Hans Wennborg via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 14 04:04:16 PDT 2016
Author: hans
Date: Mon Mar 14 06:04:15 2016
New Revision: 263418
URL: http://llvm.org/viewvc/llvm-project?rev=263418&view=rev
Log:
Try to fix build of WebAssemblyRegStackify.cpp on Windows
It's failing to build on VS2015 with:
C:\b\build\slave\ClangToTWin\build\src\third_party\llvm\lib\Target\WebAssembly\WebAssemblyRegStackify.cpp(520):
error C2668: 'llvm::make_reverse_iterator': ambiguous call to overloaded function
C:\b\build\slave\ClangToTWin\build\src\third_party\llvm\include\llvm/ADT/STLExtras.h(217):
note: could be 'std::reverse_iterator<llvm::MachineBasicBlock::iterator>
llvm::make_reverse_iterator<llvm::MachineInstrBundleIterator<llvm::MachineInstr>>(IteratorTy)'
with
[
IteratorTy=llvm::MachineInstrBundleIterator<llvm::MachineInstr>
]
C:\b\depot_tools\win_toolchain\vs_files\391bbf1220d3edcd3cc3fccdb56224181e3b13a7\win_sdk\bin\..\..\VC\include\xutility(1217):
note: or 'std::reverse_iterator<llvm::MachineBasicBlock::iterator>
std::make_reverse_iterator<llvm::MachineInstrBundleIterator<llvm::MachineInstr>>(_RanIt)' [found using argument-dependent lookup]
with
[
_RanIt=llvm::MachineInstrBundleIterator<llvm::MachineInstr>
]
I don't have VS2015 locally at the moment, but hopefully this will help.
Modified:
llvm/trunk/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp
Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp?rev=263418&r1=263417&r2=263418&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp Mon Mar 14 06:04:15 2016
@@ -517,7 +517,7 @@ bool WebAssemblyRegStackify::runOnMachin
if (Insert != &*MII) {
ImposeStackOrdering(&*MII);
MII = std::prev(
- make_reverse_iterator(MachineBasicBlock::iterator(Insert)));
+ llvm::make_reverse_iterator(MachineBasicBlock::iterator(Insert)));
Changed = true;
}
}
More information about the llvm-commits
mailing list