From 369ebfe4c9c6526a981e85df87453bb1bc818df6 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Mon, 14 Mar 2016 11:04:15 +0000 Subject: 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::make_reverse_iterator>(IteratorTy)' with [ IteratorTy=llvm::MachineInstrBundleIterator ] C:\b\depot_tools\win_toolchain\vs_files\391bbf1220d3edcd3cc3fccdb56224181e3b13a7\win_sdk\bin\..\..\VC\include\xutility(1217): note: or 'std::reverse_iterator std::make_reverse_iterator>(_RanIt)' [found using argument-dependent lookup] with [ _RanIt=llvm::MachineInstrBundleIterator ] I don't have VS2015 locally at the moment, but hopefully this will help. llvm-svn: 263418 --- llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp') diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp index 5c6599865a8..c6a3f136d40 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; } } -- cgit v1.2.3