From d5e4538cdc28f5ea162b231cdadbb851ee980fdc Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Sat, 7 Nov 2015 02:47:31 +0000 Subject: [PATCH] Try to fix build more -- like r252392 but for WebAssembly. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@252394 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp b/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp index 077273c17d7..58b16dc4cb6 100644 --- a/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp +++ b/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp @@ -154,7 +154,7 @@ static void SortBlocks(MachineFunction &MF, const MachineLoopInfo &MLI) { SmallPtrSet Visited; SmallVector Stack; - MachineBasicBlock *Entry = MF.begin(); + MachineBasicBlock *Entry = &*MF.begin(); Visited.insert(Entry); Stack.push_back(POStackEntry(Entry, MF, MLI)); @@ -170,7 +170,7 @@ static void SortBlocks(MachineFunction &MF, const MachineLoopInfo &MLI) { // Put the block in its position in the MachineFunction. MachineBasicBlock &MBB = *Entry.MBB; - MBB.moveBefore(MF.begin()); + MBB.moveBefore(&*MF.begin()); // Branch instructions may utilize a fallthrough, so update them if a // fallthrough has been added or removed. @@ -196,7 +196,7 @@ static void SortBlocks(MachineFunction &MF, const MachineLoopInfo &MLI) { assert(Loop->getHeader() == Loop->getTopBlock()); assert((Loop->getHeader() == &MBB || Loop->contains( - MLI.getLoopFor(prev(MachineFunction::iterator(&MBB))))) && + MLI.getLoopFor(&*prev(MachineFunction::iterator(&MBB))))) && "Loop isn't contiguous"); } else { // Assert that non-loops have no backedge predecessors. @@ -257,7 +257,7 @@ static void PlaceMarkers(MachineFunction &MF, const MachineLoopInfo &MLI, Iter = next(MachineFunction::iterator(Bottom)); } BuildMI(MBB, MBB.begin(), DebugLoc(), TII.get(WebAssembly::LOOP)) - .addMBB(Iter); + .addMBB(&*Iter); } // Check for forward branches and switches that need BLOCKS placed. -- 2.34.1