From 55313d21dc0a37d575fdb5440927675cc33810d2 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Mon, 1 Jun 2015 17:26:30 +0000 Subject: Disable MachineSink on convergent operations, similar to how IR Sink is restricted. No test because no in-tree target currently has convergent MachineInstr's. llvm-svn: 238763 --- llvm/lib/CodeGen/MachineSink.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'llvm/lib/CodeGen/MachineSink.cpp') diff --git a/llvm/lib/CodeGen/MachineSink.cpp b/llvm/lib/CodeGen/MachineSink.cpp index 5f03390f146..aed0e500d44 100644 --- a/llvm/lib/CodeGen/MachineSink.cpp +++ b/llvm/lib/CodeGen/MachineSink.cpp @@ -655,6 +655,10 @@ bool MachineSinking::SinkInstruction(MachineInstr *MI, bool &SawStore) { if (!MI->isSafeToMove(AA, SawStore)) return false; + // Convergent operations may only be moved to control equivalent locations. + if (MI->isConvergent()) + return false; + // FIXME: This should include support for sinking instructions within the // block they are currently in to shorten the live ranges. We often get // instructions sunk into the top of a large block, but it would be better to -- cgit v1.2.3