diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2012-10-02 17:49:47 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2012-10-02 17:49:47 +0000 |
commit | a346f462716b4eb32d27ffe20fc8696473f225f6 (patch) | |
tree | 96c635345334b05647648ec2ec22ad6ec2876936 | |
parent | fba80d9e97685f4aff959a6ba9fb076536bf285e (diff) | |
download | external_llvm-a346f462716b4eb32d27ffe20fc8696473f225f6.zip external_llvm-a346f462716b4eb32d27ffe20fc8696473f225f6.tar.gz external_llvm-a346f462716b4eb32d27ffe20fc8696473f225f6.tar.bz2 |
Fix a silly coding error on my part. The whole point of the speculator
being separate was that it can grow the use list. As a consequence, we
can't use the iterator-pair interface, we need an index based interface.
Expose such an interface from the AllocaPartitioning, and use it in the
speculator.
This should at least fix a use-after-free bug found by Duncan, and may
fix some of the other crashers.
I don't have a nice deterministic test case yet, but if I get a good
one, I'll add it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165027 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Transforms/Scalar/SROA.cpp | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/lib/Transforms/Scalar/SROA.cpp b/lib/Transforms/Scalar/SROA.cpp index b3b0315..5cf6e32 100644 --- a/lib/Transforms/Scalar/SROA.cpp +++ b/lib/Transforms/Scalar/SROA.cpp @@ -194,16 +194,6 @@ public: use_iterator use_begin(const_iterator I) { return Uses[I - begin()].begin(); } use_iterator use_end(unsigned Idx) { return Uses[Idx].end(); } use_iterator use_end(const_iterator I) { return Uses[I - begin()].end(); } - void use_push_back(unsigned Idx, const PartitionUse &PU) { - Uses[Idx].push_back(PU); - } - void use_push_back(const_iterator I, const PartitionUse &PU) { - Uses[I - begin()].push_back(PU); - } - void use_erase(unsigned Idx, use_iterator UI) { Uses[Idx].erase(UI); } - void use_erase(const_iterator I, use_iterator UI) { - Uses[I - begin()].erase(UI); - } typedef SmallVectorImpl<PartitionUse>::const_iterator const_use_iterator; const_use_iterator use_begin(unsigned Idx) const { return Uses[Idx].begin(); } @@ -214,6 +204,26 @@ public: const_use_iterator use_end(const_iterator I) const { return Uses[I - begin()].end(); } + + unsigned use_size(unsigned Idx) const { return Uses[Idx].size(); } + unsigned use_size(const_iterator I) const { return Uses[I - begin()].size(); } + const PartitionUse &getUse(unsigned PIdx, unsigned UIdx) const { + return Uses[PIdx][UIdx]; + } + const PartitionUse &getUse(const_iterator I, unsigned UIdx) const { + return Uses[I - begin()][UIdx]; + } + + void use_push_back(unsigned Idx, const PartitionUse &PU) { + Uses[Idx].push_back(PU); + } + void use_push_back(const_iterator I, const PartitionUse &PU) { + Uses[I - begin()].push_back(PU); + } + void use_erase(unsigned Idx, use_iterator UI) { Uses[Idx].erase(UI); } + void use_erase(const_iterator I, use_iterator UI) { + Uses[I - begin()].erase(UI); + } /// @} /// \brief Allow iterating the dead users for this alloca. @@ -1774,11 +1784,13 @@ public: PHIOrSelectSpeculator(const TargetData &TD, AllocaPartitioning &P, SROA &Pass) : TD(TD), P(P), Pass(Pass) {} - /// \brief Visit the users of the alloca partition and rewrite them. - void visitUsers(AllocaPartitioning::const_use_iterator I, - AllocaPartitioning::const_use_iterator E) { - for (; I != E; ++I) - visit(cast<Instruction>(I->U->getUser())); + /// \brief Visit the users of an alloca partition and rewrite them. + void visitUsers(AllocaPartitioning::const_iterator PI) { + // Note that we need to use an index here as the underlying vector of uses + // may be grown during speculation. However, we never need to re-visit the + // new uses, and so we can use the initial size bound. + for (unsigned Idx = 0, Size = P.use_size(PI); Idx != Size; ++Idx) + visit(cast<Instruction>(P.getUse(PI, Idx).U->getUser())); } private: @@ -2991,7 +3003,7 @@ bool SROA::rewriteAllocaPartition(AllocaInst &AI, PHIOrSelectSpeculator Speculator(*TD, P, *this); DEBUG(dbgs() << " speculating "); DEBUG(P.print(dbgs(), PI, "")); - Speculator.visitUsers(P.use_begin(PI), P.use_end(PI)); + Speculator.visitUsers(PI); // Try to compute a friendly type for this partition of the alloca. This // won't always succeed, in which case we fall back to a legal integer type |