revert files unintentionally checked in

llvm-svn: 238174
This commit is contained in:
Vince Harron 2015-05-26 03:10:41 +00:00
parent 218353d847
commit ebf2b2a10b
2 changed files with 5 additions and 7 deletions

View File

@ -305,9 +305,7 @@ protected:
ClangASTType m_clang_type;
struct Flags {
// clang_type_resolve_state is a ResolveState enum
// using unsigned type here to work around a very noisy gcc warning
unsigned clang_type_resolve_state : 2;
ResolveState clang_type_resolve_state : 2;
bool is_complete_objc_class : 1;
} m_flags;

View File

@ -101,7 +101,7 @@ Type::Type
m_decl (decl),
m_clang_type (clang_type)
{
m_flags.SetResolveState(clang_type ? clang_type_resolve_state : eResolveStateUnresolved);
m_flags.clang_type_resolve_state = (clang_type ? clang_type_resolve_state : eResolveStateUnresolved);
m_flags.is_complete_objc_class = false;
}
@ -118,7 +118,7 @@ Type::Type () :
m_decl (),
m_clang_type ()
{
m_flags.SetResolveState(eResolveStateUnresolved);
m_flags.clang_type_resolve_state = eResolveStateUnresolved;
m_flags.is_complete_objc_class = false;
}
@ -505,7 +505,7 @@ Type::ResolveClangType (ResolveState clang_type_resolve_state)
if (encoding_clang_type.IsValid())
{
m_clang_type = encoding_clang_type;
m_flags.SetResolveState(encoding_type->m_flags.clang_type_resolve_state);
m_flags.clang_type_resolve_state = encoding_type->m_flags.clang_type_resolve_state;
}
}
break;
@ -594,7 +594,7 @@ Type::ResolveClangType (ResolveState clang_type_resolve_state)
// Check if we have a forward reference to a class/struct/union/enum?
if (m_clang_type.IsValid() && m_flags.clang_type_resolve_state < clang_type_resolve_state)
{
m_flags.SetResolveState(eResolveStateFull);
m_flags.clang_type_resolve_state = eResolveStateFull;
if (!m_clang_type.IsDefined ())
{
// We have a forward declaration, we need to resolve it to a complete definition.