[Lldb-commits] [lldb] r238174 - revert files unintentionally checked in

Vince Harron vince at nethacker.com
Mon May 25 20:10:41 PDT 2015


Author: vharron
Date: Mon May 25 22:10:41 2015
New Revision: 238174

URL: http://llvm.org/viewvc/llvm-project?rev=238174&view=rev
Log:
revert files unintentionally checked in


Modified:
    lldb/trunk/include/lldb/Symbol/Type.h
    lldb/trunk/source/Symbol/Type.cpp

Modified: lldb/trunk/include/lldb/Symbol/Type.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Type.h?rev=238174&r1=238173&r2=238174&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/Type.h (original)
+++ lldb/trunk/include/lldb/Symbol/Type.h Mon May 25 22:10:41 2015
@@ -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;
 

Modified: lldb/trunk/source/Symbol/Type.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Type.cpp?rev=238174&r1=238173&r2=238174&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Type.cpp (original)
+++ lldb/trunk/source/Symbol/Type.cpp Mon May 25 22:10:41 2015
@@ -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 cla
                     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 cla
     // 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.





More information about the lldb-commits mailing list