record bits uses bitfield

Author: klemens-morgenstern

include/mrdox/Metadata/Record.hpp

@@ -32,10 +32,12 @@ namespace mrdox {
 
 /** Bit constants used with Record metadata
 */
-enum class RecFlags0 : std::uint32_t
+union RecFlags0
 {
-    isFinal             = 0x00000001,
-    isFinalDestructor   = 0x00000002
+    BitFieldFullValue raw{.value=0u};
+
+    BitFlag<0> isFinal;
+    BitFlag<1> isFinalDestructor;
 };
 
 /** Metadata for a direct base.
@@ -81,7 +83,7 @@ struct RecordInfo : SymbolInfo
     // are converted into records with the typedef as the Name + this flag set.
     bool IsTypeDef = false;
 
-    Bits<RecFlags0> specs;
+    RecFlags0 specs;
 
     llvm::SmallVector<MemberTypeInfo, 4> Members;   // List of info about record members.
 

source/api/AST/ASTVisitor.cpp

@@ -695,9 +695,9 @@ buildRecord(
     parseFields(I, D, PublicOnly, AccessSpecifier::AS_public, R_);
 
     // These are from CXXRecordDecl::isEffectivelyFinal()
-    I.specs.set<RecFlags0::isFinal>(D->template hasAttr<FinalAttr>());
+    I.specs.isFinal = D->template hasAttr<FinalAttr>();
     if(auto const DT = D->getDestructor())
-        I.specs.set<RecFlags0::isFinalDestructor>(DT->template hasAttr<FinalAttr>());
+        I.specs.isFinalDestructor = DT->template hasAttr<FinalAttr>();
 
     if(TypedefNameDecl const* TD = D->getTypedefNameForAnonDecl())
     {

source/api/AST/AnyBlock.hpp

@@ -839,7 +839,7 @@ class RecordBlock
         case RECORD_IS_TYPE_DEF:
             return decodeRecord(R, I->IsTypeDef, Blob);
         case RECORD_BITS:
-            return decodeRecord(R, Blob, I->specs);
+            return decodeRecord<1u>(R, {&I->specs.raw}, Blob);
         case RECORD_FRIENDS:
             return decodeRecord(R, I->Friends, Blob);
         default:

source/api/AST/BitcodeWriter.cpp

@@ -931,7 +931,7 @@ emitBlock(
     emitSymbolPart(I);
     emitRecord(I.TagType, RECORD_TAG_TYPE);
     emitRecord(I.IsTypeDef, RECORD_IS_TYPE_DEF);
-    emitRecord(RECORD_BITS, I.specs);
+    emitRecord({I.specs.raw}, RECORD_BITS);
     for (const auto& N : I.Members)
         emitBlock(N);
     for (const auto& B : I.Bases)

source/api/Metadata/Interface.cpp

@@ -104,7 +104,7 @@ class Interface::Build
 
         // Functions
         {
-            auto const isFinal = From.specs.get<RecFlags0::isFinal>();
+            auto const isFinal = From.specs.isFinal.get();
             for(auto const& ref : From.Children.Functions)
             {
                 auto const& J = corpus_.get<FunctionInfo>(ref.id);

source/api/Metadata/Reduce.cpp

@@ -124,7 +124,7 @@ void merge(RecordInfo& I, RecordInfo&& Other)
     if (!I.TagType)
         I.TagType = Other.TagType;
     I.IsTypeDef = I.IsTypeDef || Other.IsTypeDef;
-    I.specs.merge(std::move(Other).specs);
+    I.specs.raw.value |= Other.specs.raw.value;
     if (I.Members.empty())
         I.Members = std::move(Other.Members);
     if (I.Bases.empty())

source/api/_XML/CXXTags.hpp

@@ -49,19 +49,6 @@ constexpr llvm::StringRef dataMemberTagName = "data";
 constexpr llvm::StringRef javadocTagName    = "doc";
 constexpr llvm::StringRef baseTagName       = "base";
 
-constexpr llvm::StringRef getBitsIDName(RecFlags0 ID)
-{
-    switch(ID)
-    {
-    case RecFlags0::isFinal:           return "is-final";
-    case RecFlags0::isFinalDestructor: return "is-final-dtor";
-    default:
-        Assert(false);
-    }
-    return "";
-}
-
-
 
 constexpr llvm::StringRef getNameForValue(...)
 {
@@ -236,10 +223,11 @@ struct BitFieldWriter
 template<class Enum>
 WriteBits(Bits<Enum> const&) -> WriteBits<Enum>;
 
-inline void write(Bits<RecFlags0> const& bits, XMLTags& tags)
+inline void write(RecFlags0 const& bits, XMLTags& tags)
 {
-    WriteBits(bits).write<RecFlags0::isFinal>(tags);
-    WriteBits(bits).write<RecFlags0::isFinalDestructor>(tags);
+    BitFieldWriter<RecFlags0> fw(bits, tags);
+    fw.write(&RecFlags0::isFinal, "is-final");
+    fw.write(&RecFlags0::isFinalDestructor, "is-final-dtor");
 }
 
 inline void write(FnFlags0 const& bits, XMLTags& tags)