maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[objcarcopts] Some more minor code cleanups/comment additions. 

llvm-svn: 184531
This commit is contained in:
Michael Gottesman 2013-06-21 06:54:31 +00:00
parent edab1359a0
commit b7deb4cd79
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
View File

@ -571,7 +571,7 @@ namespace {
void void
PtrState::Merge(const PtrState &Other, bool TopDown) { PtrState::Merge(const PtrState &Other, bool TopDown) {
Seq = MergeSeqs(Seq, Other.Seq, 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 we're not in a sequence (anymore), drop all associated state.
if (Seq == S_None) { if (Seq == S_None) {
@ -584,6 +584,10 @@ PtrState::Merge(const PtrState &Other, bool TopDown) {
// mixing them is unsafe. // mixing them is unsafe.
ClearSequenceProgress(); ClearSequenceProgress();
} else { } 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); Partial = RRI.Merge(Other.RRI);
} }
} }