diff options
author | Hans Wennborg <hans@hanshq.net> | 2016-03-14 11:04:15 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2016-03-14 11:04:15 +0000 |
commit | 369ebfe4c9c6526a981e85df87453bb1bc818df6 (patch) | |
tree | 7dd7476498a0459fae58e6aac932723058876333 /llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp | |
parent | a949100532a17768c6ead8416a05a79831ad0eed (diff) | |
download | llvm-369ebfe4c9c6526a981e85df87453bb1bc818df6.zip llvm-369ebfe4c9c6526a981e85df87453bb1bc818df6.tar.gz llvm-369ebfe4c9c6526a981e85df87453bb1bc818df6.tar.bz2 |
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.
llvm-svn: 263418
Diffstat (limited to 'llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp')
-rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp index 5c65998..c6a3f13 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp @@ -517,7 +517,7 @@ bool WebAssemblyRegStackify::runOnMachineFunction(MachineFunction &MF) { if (Insert != &*MII) { ImposeStackOrdering(&*MII); MII = std::prev( - make_reverse_iterator(MachineBasicBlock::iterator(Insert))); + llvm::make_reverse_iterator(MachineBasicBlock::iterator(Insert))); Changed = true; } } |