summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Transforms
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2010-11-24 22:04:20 +0000
committerNick Lewycky <nicholas@mxc.ca>2010-11-24 22:04:20 +0000
commitb8de00ee071dc31cc3e3f38f32029b466618b6f3 (patch)
treefd0c1ef4857ec83efaab626359bae30b26566dec /llvm/lib/Transforms
parent9f75d5df0b4412e3204946a04b0695c36dab24ee (diff)
downloadbcm5719-llvm-b8de00ee071dc31cc3e3f38f32029b466618b6f3.tar.gz
bcm5719-llvm-b8de00ee071dc31cc3e3f38f32029b466618b6f3.zip
Treat a call of function pointer like a load of the pointer when considering
whether the pointer can be replaced with the global variable it is a copy of. Fixes PR8680. llvm-svn: 120126
Diffstat (limited to 'llvm/lib/Transforms')
-rw-r--r--llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
index 3d676b2b246..3b4f4439d4f 100644
--- a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
+++ b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
@@ -1783,7 +1783,7 @@ static bool PointsToConstantGlobal(Value *V) {
/// see any stores or other unknown uses. If we see pointer arithmetic, keep
/// track of whether it moves the pointer (with isOffset) but otherwise traverse
/// the uses. If we see a memcpy/memmove that targets an unoffseted pointer to
-/// the alloca, and if the source pointer is a pointer to a constant global, we
+/// the alloca, and if the source pointer is a pointer to a constant global, we
/// can optimize this.
static bool isOnlyCopiedFromConstantGlobal(Value *V, MemTransferInst *&TheCopy,
bool isOffset) {
@@ -1816,6 +1816,11 @@ static bool isOnlyCopiedFromConstantGlobal(Value *V, MemTransferInst *&TheCopy,
// load and we can ignore it.
if (CS.onlyReadsMemory())
continue;
+
+ // If this is the function being called then we treat it like a load and
+ // ignore it.
+ if (CS.isCallee(UI))
+ continue;
// If this is being passed as a byval argument, the caller is making a
// copy, so it is only a read of the alloca.
OpenPOWER on IntegriCloud