replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use 'unsigned char' to get this past gcc error message: 

error: invalid conversion from 'unsigned char' to '{anonymous}::Sequence'

llvm-svn: 196004
This commit is contained in:
Bill Wendling 2013-12-01 03:36:07 +00:00
parent 54ee53a0c4
commit 2798f1ef58
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,7 +432,7 @@ namespace {
bool Partial; bool Partial;
/// The current position in the sequence. /// The current position in the sequence.
Sequence Seq : 8; unsigned char Seq : 8;
/// Unidirectional information about the current sequence. /// Unidirectional information about the current sequence.
RRInfo RRI; RRInfo RRI;
@ -498,7 +498,7 @@ namespace {
} }
Sequence GetSeq() const { Sequence GetSeq() const {
return Seq; return static_cast<Sequence>(Seq);
} }
void ClearSequenceProgress() { void ClearSequenceProgress() {
@ -538,7 +538,8 @@ 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(static_cast<Sequence>(Seq), static_cast<Sequence>(Other.Seq),
TopDown);
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.