summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorMichael Gottesman <mgottesman@apple.com>2013-06-21 06:54:31 +0000
committerMichael Gottesman <mgottesman@apple.com>2013-06-21 06:54:31 +0000
commitb7deb4cd798df5e7699be3c8467618002ac43394 (patch)
tree867a06bf0f294327dfe0a453a64910c60a191882 /llvm/lib
parentedab1359a0ad2141f797bc6a1039cc4dc1dd8829 (diff)
downloadbcm5719-llvm-b7deb4cd798df5e7699be3c8467618002ac43394.tar.gz
bcm5719-llvm-b7deb4cd798df5e7699be3c8467618002ac43394.zip
[objcarcopts] Some more minor code cleanups/comment additions.
llvm-svn: 184531
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp b/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
index a66771a479b..8a182199f0e 100644
--- a/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
+++ b/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
@@ -571,7 +571,7 @@ namespace {
void
PtrState::Merge(const PtrState &Other, bool TopDown) {
Seq = MergeSeqs(Seq, Other.Seq, TopDown);
- KnownPositiveRefCount = KnownPositiveRefCount && Other.KnownPositiveRefCount;
+ KnownPositiveRefCount &= Other.KnownPositiveRefCount;
// If we're not in a sequence (anymore), drop all associated state.
if (Seq == S_None) {
@@ -584,6 +584,10 @@ PtrState::Merge(const PtrState &Other, bool TopDown) {
// mixing them is unsafe.
ClearSequenceProgress();
} else {
+ // Otherwise merge the other PtrState's RRInfo into our RRInfo. At this
+ // point, we know that currently we are not partial. Stash whether or not
+ // the merge operation caused us to undergo a partial merging of reverse
+ // insertion points.
Partial = RRI.Merge(Other.RRI);
}
}
OpenPOWER on IntegriCloud