RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-02-25 21:33:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[MemCpyOpt] Skip optimizing basic blocks not reachable from entry

Browse Source 
Summary:
Skip basic blocks not reachable from the entry node
in MemCpyOptPass::iterateOnFunction.

Code that is unreachable may have properties that do not exist
for reachable code (an instruction in a basic block can for
example be dominated by a later instruction in the same basic
block, for example if there is a single block loop).
MemCpyOptPass::processStore is only safe to use for reachable
basic blocks, since it may iterate past the basic block
beginning when used for unreachable blocks. By simply skipping
to optimize unreachable basic blocks we can avoid asserts such
as "Assertion `!NodePtr->isKnownSentinel()' failed."
in MemCpyOptPass::processStore.

The problem was detected by fuzz tests.

Reviewers: eli.friedman, dneilson, efriedma

Reviewed By: efriedma

Subscribers: efriedma, llvm-commits

Differential Revision: https://reviews.llvm.org/D45889

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@330635 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bjorn Pettersson 2018-04-23 19:55:04 +00:00
parent 3f46946fed
commit dee6650968
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Transforms/Scalar/MemCpyOptimizer.cpp
View File

@ -1391,10 +1391,19 @@ bool MemCpyOptPass::processByValArgument(CallSite CS, unsigned ArgNo) {
bool MemCpyOptPass::iterateOnFunction(Function &F) {
bool MadeChange = false;
DominatorTree &DT = LookupDomTree();
// Walk all instruction in the function.
for (BasicBlock &BB : F) {
// Skip unreachable blocks. For example processStore assumes that an
// instruction in a BB can't be dominated by a later instruction in the
// same BB (which is a scenario that can happen for an unreachable BB that
// has itself as a predecessor).
if (!DT.isReachableFromEntry(&BB))
continue;
for (BasicBlock::iterator BI = BB.begin(), BE = BB.end(); BI != BE;) {
// Avoid invalidating the iterator.
// Avoid invalidating the iterator.
Instruction *I = &*BI++;
bool RepeatInstruction = false;

39
test/Transforms/MemCpyOpt/process_store.ll Normal file
View File

@ -0,0 +1,39 @@
; RUN: opt < %s -memcpyopt -disable-output
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@b = common dso_local local_unnamed_addr global i32 0, align 4
@a = common dso_local local_unnamed_addr global i32 0, align 4
declare dso_local i32 @f1()
; Do not crash due to store first in BB.
define dso_local void @f2() {
for.end:
%0 = load i32, i32* @b, align 4
ret void
for.body:
store i32 %1, i32* @a, align 4
%call = call i32 @f1()
%cmp = icmp sge i32 %call, 0
%1 = load i32, i32* @b, align 4
br label %for.body
}
; Do not crash due to call not before store in BB.
define dso_local void @f3() {
for.end:
%0 = load i32, i32* @b, align 4
ret void
for.body:
%t = add i32 %t2, 1
store i32 %1, i32* @a, align 4
%call = call i32 @f1()
%cmp = icmp sge i32 %call, 0
%1 = load i32, i32* @b, align 4
%t2 = xor i32 %t, 5
br label %for.body
}