Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-28 02:37:37 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[MemorySSA] Update analysis when the terminator is a memory instruction.

Browse Source 
Update MemorySSA when moving the terminator instruction, as that may be a memory touching instruction.
Resolves PR44029.
This commit is contained in:
Alina Sbirlea 2019-11-20 13:44:51 -08:00
parent 049043b598
commit da4baa2a6c
3 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp
View File

@ -662,6 +662,9 @@ static bool mergeBlocksIntoPredecessors(Loop &L, DominatorTree &DT,
// Merge Succ into Pred and delete it.
MergeBlockIntoPredecessor(Succ, &DTU, &LI, MSSAU);
if (MSSAU && VerifyMemorySSA)
MSSAU->getMemorySSA()->verifyMemorySSA();
Changed = true;
}

8
llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
View File

@ -247,7 +247,7 @@ bool llvm::MergeBlockIntoPredecessor(BasicBlock *BB, DomTreeUpdater *DTU,
Instruction *STI = BB->getTerminator();
Instruction *Start = &*BB->begin();
// If there's nothing to move, mark the starting instruction as the last
// instruction in the block.
// instruction in the block. Terminator instruction is handled separately.
if (Start == STI)
Start = PTI;
@ -274,6 +274,12 @@ bool llvm::MergeBlockIntoPredecessor(BasicBlock *BB, DomTreeUpdater *DTU,
// Move terminator instruction.
PredBB->getInstList().splice(PredBB->end(), BB->getInstList());
// Terminator may be a memory accessing instruction too.
if (MSSAU)
if (MemoryUseOrDef *MUD = cast_or_null<MemoryUseOrDef>(
MSSAU->getMemorySSA()->getMemoryAccess(PredBB->getTerminator())))
MSSAU->moveToPlace(MUD, PredBB, MemorySSA::End);
}
// Add unreachable to now empty BB.
new UnreachableInst(BB->getContext(), BB);

63
llvm/test/Analysis/MemorySSA/pr44029.ll Normal file
View File

@ -0,0 +1,63 @@
; RUN: opt -loop-simplifycfg -verify-memoryssa -S < %s | FileCheck %s
; REQUIRES: asserts
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
declare i32 @eggs(...)
declare void @spam()
; CHECK-LABEL: @f()
define void @f() personality i8* bitcast (i32 (...)* @eggs to i8*) {
bb:
invoke void @spam()
to label %bb2 unwind label %bb4
bb2: ; preds = %bb
invoke void @spam()
to label %bb8 unwind label %bb5
bb4: ; preds = %bb
%tmp = landingpad { i8*, i32 }
cleanup
resume { i8*, i32 } undef
bb5: ; preds = %bb2
%tmp6 = landingpad { i8*, i32 }
cleanup
unreachable
bb8: ; preds = %bb13, %bb2
br label %bb10
bb10: ; preds = %bb8
invoke void @spam()
to label %bb11 unwind label %bb20
bb11: ; preds = %bb10
invoke void @spam()
to label %bb12 unwind label %bb22
bb12: ; preds = %bb11
invoke void @spam()
to label %bb13 unwind label %bb24
bb13: ; preds = %bb12
br label %bb8
bb20: ; preds = %bb10
%tmp21 = landingpad { i8*, i32 }
cleanup
unreachable
bb22: ; preds = %bb11
%tmp23 = landingpad { i8*, i32 }
cleanup
unreachable
bb24: ; preds = %bb12
%tmp25 = landingpad { i8*, i32 }
cleanup
unreachable
}