[dscope.d] compress some flags (#21570)

Author: thewilsonator

compiler/src/dmd/aggregate.d

@@ -169,7 +169,7 @@ extern (C++) abstract class AggregateDeclaration : ScopeDsymbol
         sc2.parent = this;
         sc2.inunion = isUnionDeclaration();
         sc2.visibility = Visibility(Visibility.Kind.public_);
-        sc2.explicitVisibility = 0;
+        sc2.explicitVisibility = false;
         sc2.aligndecl = null;
         sc2.userAttribDecl = null;
         sc2.namespace = null;

compiler/src/dmd/attrib.d

@@ -78,7 +78,7 @@ extern (C++) abstract class AttribDeclaration : Dsymbol
      * the scope after it used.
      */
     extern (D) static Scope* createNewScope(Scope* sc, STC stc, LINK linkage,
-        CPPMANGLE cppmangle, Visibility visibility, int explicitVisibility,
+        CPPMANGLE cppmangle, Visibility visibility, bool explicitVisibility,
         AlignDeclaration aligndecl, PragmaDeclaration inlining)
     {
         Scope* sc2 = sc;

compiler/src/dmd/common/bitfields.d

@@ -19,13 +19,16 @@ version(Has_Bitfields)
  * Params:
  *   S = type of a struct with only boolean fields, which should become bit fields
  *   T = type of bit fields variable, must have enough bits to store all booleans
+ *   field = if provided, assume it is declared and initialized elsewhere
+ *   bitOff = start using bits at the given offset
  * Returns: D code with a bit fields variable and getter / setter functions
  */
-extern (D) string generateBitFields(S, T, int ID = __LINE__)()
+extern (D) string generateBitFields(S, T, string field = "", int bitOff = 0, int ID = __LINE__)()
 if (__traits(isUnsigned, T))
 {
     import core.bitop: bsr;
-
+    // if _fieldName provided, assume it declared and initialized elsewhere
+    enum fieldName = field.length == 0 ? "bitFields" : field;
     string result = "extern (C++) pure nothrow @nogc @safe final {";
 
     struct BitInfo
@@ -39,7 +42,7 @@ if (__traits(isUnsigned, T))
     // Iterate over members to compute bit offset and bit size for each of them
     enum BitInfo bitInfo = () {
         BitInfo result;
-        int bitOffset = 0;
+        int bitOffset = bitOff;
         foreach (size_t i, mem; __traits(allMembers, S))
         {
             alias memType = typeof(__traits(getMember, S, mem));
@@ -62,7 +65,7 @@ if (__traits(isUnsigned, T))
     version(Debugger_friendly)
     {
         // unique name needed to allow same name as in base class using `alias`, but without overloading
-        string bitfieldsName = "bitfields" ~ toString!(ID);
+        string bitfieldsName = fieldName ~ toString!(ID);
         string bitfieldsRead = T.stringof~" "~bitfieldsName~"() const pure { return 0";
         string bitfieldsWrite = "void "~bitfieldsName~"("~T.stringof~" v) {\n";
     }
@@ -86,11 +89,11 @@ if (__traits(isUnsigned, T))
         else
         {
             result ~= "
-                "~typeName~" "~mem~"() const scope { return cast("~typeName~") ((bitFields >>> "~shift~") & "~sizeMask~"); }
+                "~typeName~" "~mem~"() const scope { return cast("~typeName~") (("~fieldName~" >>> "~shift~") & "~sizeMask~"); }
             "~typeName~" "~mem~"("~typeName~" v) scope
             {
-                bitFields &= ~("~sizeMask~" << "~shift~");
-                bitFields |= v << "~shift~";
+                "~fieldName~" &= ~("~sizeMask~" << "~shift~");
+                "~fieldName~" |= v << "~shift~";
                 return v;
             }";
         }
@@ -99,7 +102,8 @@ if (__traits(isUnsigned, T))
     {
         bitfieldsRead ~= ";\n}\n";
         bitfieldsWrite ~= "}\n";
-        result ~= "alias bitFields = "~bitfieldsName~";\n";
+        if (field.length == 0)
+            result ~= "alias "~fieldName~" = "~bitfieldsName~";\n";
         result ~= bitfieldsRead ~ bitfieldsWrite;
         result ~= "\n}\n";
         return result;
@@ -108,7 +112,9 @@ if (__traits(isUnsigned, T))
     {
         result ~= "\n}\n";
         enum TP initVal = bitInfo.initialValue;
-        return result ~ " private "~T.stringof~" bitFields = " ~ toString!(initVal) ~ ";\n";
+        if (field.length == 0)
+            result ~= " private "~T.stringof~" "~fieldName~" = " ~ toString!(initVal) ~ ";\n";
+        return result;
     }
 }
 

compiler/src/dmd/dscope.d

@@ -55,7 +55,8 @@ enum Contract : ubyte
     ensure = 3, // out contract
 }
 
-private extern (D) struct BitFields
+/// Bitfield for settable/copyable flags, see `copyFlagsFrom`, `resetAllFlags`
+private extern (D) struct FlagBitFields
 {
     bool ctor;              /// constructor type
     bool noAccessCheck;     /// don't do access checks
@@ -74,6 +75,14 @@ private extern (D) struct BitFields
     bool ctfeBlock;         /// inside a `if (__ctfe)` block
 }
 
+private extern (D) struct NonFlagBitFields
+{
+    ubyte intypeof;                 /// in typeof(exp)
+    bool nofree;                    /// true if shouldn't free it
+    bool inLoop;                    /// true if inside a loop (where constructor calls aren't allowed)
+    bool inDefaultArg;              /// true if inside a default argument (where __FILE__, etc are evaluated at the call site)
+    bool explicitVisibility;        /// set if in an explicit visibility attribute
+}
 /// State of -preview switches
 ///
 /// By making them part of a Scope, we reduce reliance on dmd.globals,
@@ -140,10 +149,6 @@ extern (C++) struct Scope
     ForeachStatement fes;           /// if nested function for ForeachStatement, this is it
     Scope* callsc;                  /// used for __FUNCTION__, __PRETTY_FUNCTION__ and __MODULE__
     Dsymbol inunion;                /// != null if processing members of a union
-    bool nofree;                    /// true if shouldn't free it
-    bool inLoop;                    /// true if inside a loop (where constructor calls aren't allowed)
-    bool inDefaultArg;              /// true if inside a default argument (where __FILE__, etc are evaluated at the call site)
-    int intypeof;                   /// in typeof(exp)
     VarDeclaration lastVar;         /// Previous symbol used to prevent goto-skips-init
     ErrorSink eSink;                /// sink for error messages
 
@@ -174,15 +179,15 @@ extern (C++) struct Scope
 
     /// visibility for class members
     Visibility visibility = Visibility(Visibility.Kind.public_);
-    int explicitVisibility;         /// set if in an explicit visibility attribute
 
     STC stc;                        /// storage class
 
     DeprecatedDeclaration depdecl;  /// customized deprecation message
 
     import dmd.common.bitfields : generateBitFields;
-    mixin(generateBitFields!(BitFields, ushort));
-
+    mixin(generateBitFields!(FlagBitFields, ushort));
+    private ushort bitFields2;
+    mixin(generateBitFields!(NonFlagBitFields, ushort, "bitFields2"));
     Previews previews;
 
     // user defined attributes

compiler/src/dmd/dsymbolsem.d

@@ -351,7 +351,7 @@ Expression resolveAliasThis(Scope* sc, Expression e, bool gag = false, bool find
                  * so resolve it ahead.
                  */
                 {
-                    int save = sc.intypeof;
+                    ubyte save = sc.intypeof;
                     sc.intypeof = 1; // bypass "need this" error check
                     e = resolveProperties(sc, e);
                     sc.intypeof = save;

compiler/src/dmd/frontend.h

@@ -7257,10 +7257,6 @@ struct Scope final
     ForeachStatement* fes;
     Scope* callsc;
     Dsymbol* inunion;
-    bool nofree;
-    bool inLoop;
-    bool inDefaultArg;
-    int32_t intypeof;
     VarDeclaration* lastVar;
     ErrorSink* eSink;
     Module* minst;
@@ -7272,7 +7268,6 @@ struct Scope final
     CPPMANGLE cppmangle;
     PragmaDeclaration* inlining;
     Visibility visibility;
-    int32_t explicitVisibility;
     STC stc;
     DeprecatedDeclaration* depdecl;
     bool ctor() const;
@@ -7303,7 +7298,18 @@ struct Scope final
     bool ctfeBlock(bool v);
 private:
     uint16_t bitFields;
-public:
+    uint16_t bitFields2;
+public:
+    uint8_t intypeof() const;
+    uint8_t intypeof(uint8_t v);
+    bool nofree() const;
+    bool nofree(bool v);
+    bool inLoop() const;
+    bool inLoop(bool v);
+    bool inDefaultArg() const;
+    bool inDefaultArg(bool v);
+    bool explicitVisibility() const;
+    bool explicitVisibility(bool v);
     Previews previews;
     UserAttributeDeclaration* userAttribDecl;
     DocComment* lastdc;
@@ -7329,10 +7335,6 @@ struct Scope final
         fes(),
         callsc(),
         inunion(),
-        nofree(),
-        inLoop(),
-        inDefaultArg(),
-        intypeof(),
         lastVar(),
         eSink(),
         minst(),
@@ -7344,9 +7346,9 @@ struct Scope final
         cppmangle((CPPMANGLE)0u),
         inlining(),
         visibility(Visibility((Visibility::Kind)5u, nullptr)),
-        explicitVisibility(),
         depdecl(),
         bitFields(0u),
+        bitFields2(),
         previews(),
         userAttribDecl(),
         lastdc(),
@@ -7355,7 +7357,7 @@ struct Scope final
         argStruct()
     {
     }
-    Scope(Scope* enclosing, Module* _module = nullptr, ScopeDsymbol* scopesym = nullptr, FuncDeclaration* func = nullptr, VarDeclaration* varDecl = nullptr, Dsymbol* parent = nullptr, LabelStatement* slabel = nullptr, SwitchStatement* switchStatement = nullptr, Statement* tryBody = nullptr, TryFinallyStatement* tryFinally = nullptr, ScopeGuardStatement* scopeGuard = nullptr, Statement* sbreak = nullptr, Statement* scontinue = nullptr, ForeachStatement* fes = nullptr, Scope* callsc = nullptr, Dsymbol* inunion = nullptr, bool nofree = false, bool inLoop = false, bool inDefaultArg = false, int32_t intypeof = 0, VarDeclaration* lastVar = nullptr, ErrorSink* eSink = nullptr, Module* minst = nullptr, TemplateInstance* tinst = nullptr, CtorFlow ctorflow = CtorFlow(), AlignDeclaration* aligndecl = nullptr, CPPNamespaceDeclaration* namespace_ = nullptr, LINK linkage = (LINK)1u, CPPMANGLE cppmangle = (CPPMANGLE)0u, PragmaDeclaration* inlining = nullptr, Visibility visibility = Visibility((Visibility::Kind)5u, nullptr), int32_t explicitVisibility = 0, STC stc = (STC)0LLU, DeprecatedDeclaration* depdecl = nullptr, uint16_t bitFields = 0u, Previews previews = Previews(), UserAttributeDeclaration* userAttribDecl = nullptr, DocComment* lastdc = nullptr, void* anchorCounts = nullptr, Identifier* prevAnchor = nullptr, AliasDeclaration* aliasAsg = nullptr, StructDeclaration* argStruct = nullptr) :
+    Scope(Scope* enclosing, Module* _module = nullptr, ScopeDsymbol* scopesym = nullptr, FuncDeclaration* func = nullptr, VarDeclaration* varDecl = nullptr, Dsymbol* parent = nullptr, LabelStatement* slabel = nullptr, SwitchStatement* switchStatement = nullptr, Statement* tryBody = nullptr, TryFinallyStatement* tryFinally = nullptr, ScopeGuardStatement* scopeGuard = nullptr, Statement* sbreak = nullptr, Statement* scontinue = nullptr, ForeachStatement* fes = nullptr, Scope* callsc = nullptr, Dsymbol* inunion = nullptr, VarDeclaration* lastVar = nullptr, ErrorSink* eSink = nullptr, Module* minst = nullptr, TemplateInstance* tinst = nullptr, CtorFlow ctorflow = CtorFlow(), AlignDeclaration* aligndecl = nullptr, CPPNamespaceDeclaration* namespace_ = nullptr, LINK linkage = (LINK)1u, CPPMANGLE cppmangle = (CPPMANGLE)0u, PragmaDeclaration* inlining = nullptr, Visibility visibility = Visibility((Visibility::Kind)5u, nullptr), STC stc = (STC)0LLU, DeprecatedDeclaration* depdecl = nullptr, uint16_t bitFields = 0u, uint16_t bitFields2 = 0u, Previews previews = Previews(), UserAttributeDeclaration* userAttribDecl = nullptr, DocComment* lastdc = nullptr, void* anchorCounts = nullptr, Identifier* prevAnchor = nullptr, AliasDeclaration* aliasAsg = nullptr, StructDeclaration* argStruct = nullptr) :
         enclosing(enclosing),
         _module(_module),
         scopesym(scopesym),
@@ -7372,10 +7374,6 @@ struct Scope final
         fes(fes),
         callsc(callsc),
         inunion(inunion),
-        nofree(nofree),
-        inLoop(inLoop),
-        inDefaultArg(inDefaultArg),
-        intypeof(intypeof),
         lastVar(lastVar),
         eSink(eSink),
         minst(minst),
@@ -7387,10 +7385,10 @@ struct Scope final
         cppmangle(cppmangle),
         inlining(inlining),
         visibility(visibility),
-        explicitVisibility(explicitVisibility),
         stc(stc),
         depdecl(depdecl),
         bitFields(bitFields),
+        bitFields2(bitFields2),
         previews(previews),
         userAttribDecl(userAttribDecl),
         lastdc(lastdc),

compiler/src/dmd/scope.h

@@ -67,10 +67,6 @@ struct Scope final
     ForeachStatement *fes;      // if nested function for ForeachStatement, this is it
     Scope *callsc;              // used for __FUNCTION__, __PRETTY_FUNCTION__ and __MODULE__
     Dsymbol *inunion;           // !=null if processing members of a union
-    d_bool nofree;                // true if shouldn't free it
-    d_bool inLoop;                // true if inside a loop (where constructor calls aren't allowed)
-    d_bool inDefaultArg;          // true if inside a default argument (where __FILE__, etc are evaluated at the call site)
-    int intypeof;               // in typeof(exp)
     VarDeclaration *lastVar;    // Previous symbol used to prevent goto-skips-init
     ErrorSink *eSink;           // sink for error messages
 
@@ -96,13 +92,12 @@ struct Scope final
     PragmaDeclaration *inlining; // inlining strategy for functions
 
     Visibility visibility;            // visibility for class members
-    int explicitVisibility;     // set if in an explicit visibility attribute
 
     StorageClass stc;           // storage class
 
     DeprecatedDeclaration *depdecl; // customized deprecation message
 
-    uint16_t flags;
+    uint16_t flags, flags2;
     uint16_t previews; // state of preview switches
 
     bool ctor() const;

compiler/src/dmd/semantic3.d

@@ -345,7 +345,7 @@ private extern(C++) final class Semantic3Visitor : Visitor
             sc2.linkage = funcdecl.isCsymbol() ? LINK.c : LINK.d;
             sc2.stc &= STC.flowThruFunction;
             sc2.visibility = Visibility(Visibility.Kind.public_);
-            sc2.explicitVisibility = 0;
+            sc2.explicitVisibility = false;
             sc2.aligndecl = null;
             if (funcdecl.ident != Id.require && funcdecl.ident != Id.ensure)
             {