summaryrefslogtreecommitdiff
path: root/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
commit36d9cda15d5a1eb81a5641935be84d342127698d (patch)
treee2569bc67bd9788f9dd9e47a01a63b4e48e0bf17 /lib
parent817ef2d78e9ea9671ebd50913f9a0baf3ad70d93 (diff)
downloadllvm-36d9cda15d5a1eb81a5641935be84d342127698d.tar.gz
llvm-36d9cda15d5a1eb81a5641935be84d342127698d.tar.bz2
llvm-36d9cda15d5a1eb81a5641935be84d342127698d.tar.xz
[objcarcopts] Some more minor code cleanups/comment additions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184531 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Transforms/ObjCARC/ObjCARCOpts.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
index a66771a479..8a182199f0 100644
--- a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
+++ b/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);
}
}