From 6dd6969cee28a71ce6dad138a73ff703c5d43d55 Mon Sep 17 00:00:00 2001 From: Artur Pilipenko Date: Fri, 15 Jan 2016 15:27:46 +0000 Subject: Change isSafeToLoadUnconditionally arguments order. Separated from http://reviews.llvm.org/D10920. llvm-svn: 257894 --- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp') diff --git a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp index 114d22ddf2e..0fc6953350b 100644 --- a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -1151,12 +1151,12 @@ static bool isSafeSelectToSpeculate(SelectInst *SI) { // Both operands to the select need to be dereferencable, either absolutely // (e.g. allocas) or at this point because we can see other accesses to it. if (!TDerefable && - !isSafeToLoadUnconditionally(SI->getTrueValue(), LI, - LI->getAlignment())) + !isSafeToLoadUnconditionally(SI->getTrueValue(), LI->getAlignment(), + LI)) return false; if (!FDerefable && - !isSafeToLoadUnconditionally(SI->getFalseValue(), LI, - LI->getAlignment())) + !isSafeToLoadUnconditionally(SI->getFalseValue(), LI->getAlignment(), + LI)) return false; } @@ -1230,7 +1230,7 @@ static bool isSafePHIToSpeculate(PHINode *PN) { // If this pointer is always safe to load, or if we can prove that there is // already a load in the block, then we can move the load to the pred block. if (isDereferenceablePointer(InVal, DL) || - isSafeToLoadUnconditionally(InVal, Pred->getTerminator(), MaxAlign)) + isSafeToLoadUnconditionally(InVal, MaxAlign, Pred->getTerminator())) continue; return false; -- cgit v1.2.3