Move global variables related to diagnostics into a separate struct

CONTRIBUTING.md

@@ -239,7 +239,7 @@ without control flow statements.
 This was done successfully in src/dmd/escape.d, it wasn't easy, but
 it was well worth it.
 
-17. Try to eliminate reliance on `global.errors`, use `dmd.errorsink: ErrorSink` instead.
+17. Try to eliminate reliance on `global.diag.errors`, use `dmd.errorsink: ErrorSink` instead.
 
 18. For aggregates that expose public access to fields, think hard about why this is
 necessary and if it can be done better. Merely replacing them with read/write properties

compiler/src/dmd/astbase.d

@@ -2502,7 +2502,7 @@ struct ASTBase
         extern (D) this()
         {
             super(Loc.initial, STMT.Error);
-            assert(global.gaggedErrors || global.errors);
+            assert(global.diag.gaggedErrors || global.diag.errors);
         }
 
         override void accept(Visitor v)
@@ -6350,7 +6350,7 @@ struct ASTBase
             if (errorexp is null)
                 errorexp = new ErrorExp();
 
-            if (global.errors == 0 && global.gaggedErrors == 0)
+            if (global.diag.errors == 0 && global.diag.gaggedErrors == 0)
             {
                 /* Unfortunately, errors can still leak out of gagged errors,
                 * and we need to set the error count to prevent bogus code

compiler/src/dmd/blockexit.d

@@ -108,7 +108,7 @@ int blockExit(Statement s, FuncDeclaration func, ErrorSink eSink)
 
         void visitMixin(MixinStatement s)
         {
-            assert(global.errors);
+            assert(global.diag.errors);
             result = BE.fallthru;
         }
 
@@ -177,7 +177,7 @@ int blockExit(Statement s, FuncDeclaration func, ErrorSink eSink)
 
         void visitWhile(WhileStatement s)
         {
-            assert(global.errors);
+            assert(global.diag.errors);
             result = BE.fallthru;
         }
 
@@ -249,7 +249,7 @@ int blockExit(Statement s, FuncDeclaration func, ErrorSink eSink)
 
         void visitForeachRange(ForeachRangeStatement s)
         {
-            assert(global.errors);
+            assert(global.diag.errors);
             result = BE.fallthru;
         }
 

compiler/src/dmd/canthrow.d

@@ -106,7 +106,7 @@ CT canThrow(Expression e, FuncDeclaration func, ErrorSink eSink)
             if (ce.inDebugStatement)
                 return;
 
-            if (global.errors && !ce.e1.type)
+            if (global.diag.errors && !ce.e1.type)
                 return; // error recovery
 
             if (ce.f && ce.arguments.length > 0)

compiler/src/dmd/clone.d

@@ -110,7 +110,7 @@ FuncDeclaration hasIdentityOpAssign(AggregateDeclaration ad, Scope* sc)
     scope er = new NullExp(ad.loc, ad.type);    // dummy rvalue
     scope el = new IdentifierExp(ad.loc, Id.p); // dummy lvalue
     el.type = ad.type;
-    const errors = global.startGagging(); // Do not report errors, even if the template opAssign fbody makes it.
+    const errors = global.diag.startGagging(); // Do not report errors, even if the template opAssign fbody makes it.
     sc = sc.push();
     sc.tinst = null;
     sc.minst = null;
@@ -125,7 +125,7 @@ FuncDeclaration hasIdentityOpAssign(AggregateDeclaration ad, Scope* sc)
     }
 
     sc = sc.pop();
-    global.endGagging(errors);
+    global.diag.endGagging(errors);
     if (!f)
         return null;
     if (f.errors)
@@ -385,7 +385,7 @@ FuncDeclaration buildOpAssign(StructDeclaration sd, Scope* sc)
     sd.members.push(fop);
     fop.addMember(sc, sd);
     sd.hasIdentityAssign = true; // temporary mark identity assignable
-    const errors = global.startGagging(); // Do not report errors, even if the template opAssign fbody makes it.
+    const errors = global.diag.startGagging(); // Do not report errors, even if the template opAssign fbody makes it.
     Scope* sc2 = sc.push();
     sc2.stc = 0;
     sc2.linkage = LINK.d;
@@ -395,7 +395,7 @@ FuncDeclaration buildOpAssign(StructDeclaration sd, Scope* sc)
     //semantic3(fop, sc2); // isn't run here for lazy forward reference resolution.
 
     sc2.pop();
-    if (global.endGagging(errors)) // if errors happened
+    if (global.diag.endGagging(errors)) // if errors happened
     {
         // Disable generated opAssign, because some members forbid identity assignment.
         fop.storage_class |= STC.disable;
@@ -494,7 +494,7 @@ private FuncDeclaration hasIdentityOpEquals(AggregateDeclaration ad, Scope* sc)
 
     bool hasIt(Type tthis)
     {
-        const errors = global.startGagging(); // Do not report errors, even if the template opAssign fbody makes it
+        const errors = global.diag.startGagging(); // Do not report errors, even if the template opAssign fbody makes it
         sc = sc.push();
         sc.tinst = null;
         sc.minst = null;
@@ -511,7 +511,7 @@ private FuncDeclaration hasIdentityOpEquals(AggregateDeclaration ad, Scope* sc)
             f = rfc(el);
 
         sc = sc.pop();
-        global.endGagging(errors);
+        global.diag.endGagging(errors);
 
         return f !is null;
     }
@@ -614,14 +614,14 @@ FuncDeclaration buildXopEquals(StructDeclaration sd, Scope* sc)
     Expression e2 = new IdentifierExp(loc, Id.p);
     Expression e = new EqualExp(EXP.equal, loc, e1, e2);
     fop.fbody = new ReturnStatement(loc, e);
-    const errors = global.startGagging(); // Do not report errors
+    const errors = global.diag.startGagging(); // Do not report errors
     Scope* sc2 = sc.push();
     sc2.stc = 0;
     sc2.linkage = LINK.d;
     fop.dsymbolSemantic(sc2);
     fop.semantic2(sc2);
     sc2.pop();
-    if (global.endGagging(errors)) // if errors happened
+    if (global.diag.endGagging(errors)) // if errors happened
         fop = sd.xerreq;
     return fop;
 }
@@ -738,14 +738,14 @@ FuncDeclaration buildXopCmp(StructDeclaration sd, Scope* sc)
     Expression e2 = new IdentifierExp(loc, Id.p);
     Expression e = new CallExp(loc, new DotIdExp(loc, e1, Id.cmp), e2);
     fop.fbody = new ReturnStatement(loc, e);
-    const errors = global.startGagging(); // Do not report errors
+    const errors = global.diag.startGagging(); // Do not report errors
     Scope* sc2 = sc.push();
     sc2.stc = 0;
     sc2.linkage = LINK.d;
     fop.dsymbolSemantic(sc2);
     fop.semantic2(sc2);
     sc2.pop();
-    if (global.endGagging(errors)) // if errors happened
+    if (global.diag.endGagging(errors)) // if errors happened
         fop = sd.xerrcmp;
     return fop;
 }
@@ -1617,7 +1617,7 @@ private Statement generateCopyCtorBody(StructDeclaration sd)
  */
 bool needCopyCtor(StructDeclaration sd, out bool hasCpCtor)
 {
-    if (global.errors)
+    if (global.diag.errors)
         return false;
 
     auto ctor = sd.search(sd.loc, Id.ctor);
@@ -1731,7 +1731,7 @@ bool buildCopyCtor(StructDeclaration sd, Scope* sc)
     ccd.fbody = copyCtorBody;
     sd.members.push(ccd);
     ccd.addMember(sc, sd);
-    const errors = global.startGagging();
+    const errors = global.diag.startGagging();
     Scope* sc2 = sc.push();
     sc2.stc = 0;
     sc2.linkage = LINK.d;
@@ -1740,7 +1740,7 @@ bool buildCopyCtor(StructDeclaration sd, Scope* sc)
     ccd.semantic3(sc2);
     //printf("ccd semantic: %s\n", ccd.type.toChars());
     sc2.pop();
-    if (global.endGagging(errors) || sd.isUnionDeclaration())
+    if (global.diag.endGagging(errors) || sd.isUnionDeclaration())
     {
         ccd.storage_class |= STC.disable;
         ccd.fbody = null;

compiler/src/dmd/cond.d

@@ -382,9 +382,9 @@ extern (C++) final class StaticForeach : RootObject
 
         // Run 'typeof' gagged to avoid duplicate errors and if it fails just create
         // an empty foreach to expose them.
-        const olderrors = global.startGagging();
+        const olderrors = global.diag.startGagging();
         ety = ety.typeSemantic(aloc, sc);
-        if (global.endGagging(olderrors))
+        if (global.diag.endGagging(olderrors))
             s2.push(createForeach(aloc, pparams[1], null));
         else
         {
@@ -924,7 +924,7 @@ extern (C++) final class StaticIfCondition : Condition
 
         int errorReturn()
         {
-            if (!global.gag)
+            if (!global.diag.gag)
                 inc = Include.no; // so we don't see the error message again
             return 0;
         }

compiler/src/dmd/constfold.d

@@ -654,7 +654,7 @@ UnionExp Equal(EXP op, const ref Loc loc, Type type, Expression e1, Expression e
         StringExp es2 = e2.isStringExp();
         if (es1.sz != es2.sz)
         {
-            assert(global.errors);
+            assert(global.diag.errors);
             cantExp(ue);
             return ue;
         }
@@ -1477,7 +1477,7 @@ UnionExp Cat(const ref Loc loc, Type type, Expression e1, Expression e2)
             /* Can happen with:
              *   auto s = "foo"d ~ "bar"c;
              */
-            assert(global.errors);
+            assert(global.diag.errors);
             cantExp(ue);
             assert(ue.exp().type);
             return ue;

compiler/src/dmd/dcast.d

@@ -2068,9 +2068,9 @@ Expression castTo(Expression e, Scope* sc, Type t, Type att = null)
              *   cast(to)e1.aliasthis
              */
             auto exp = resolveAliasThis(sc, e);
-            const errors = global.startGagging();
+            const errors = global.diag.startGagging();
             exp = castTo(exp, sc, t, att);
-            return global.endGagging(errors) ? null : exp;
+            return global.diag.endGagging(errors) ? null : exp;
         }
 
         bool hasAliasThis;

compiler/src/dmd/declaration.d

@@ -619,7 +619,7 @@ extern (C++) final class AliasDeclaration : Declaration
         Dsymbol err()
         {
             // Avoid breaking "recursive alias" state during errors gagged
-            if (global.gag)
+            if (global.diag.gag)
                 return this;
             aliassym = new AliasDeclaration(loc, ident, Type.terror);
             type = Type.terror;
@@ -632,15 +632,15 @@ extern (C++) final class AliasDeclaration : Declaration
         if (inuse == 1 && type && _scope)
         {
             inuse = 2;
-            const olderrors = global.errors;
+            const olderrors = global.diag.errors;
             Dsymbol s = type.toDsymbol(_scope);
             //printf("[%s] type = %s, s = %p, this = %p\n", loc.toChars(), type.toChars(), s, this);
-            if (global.errors != olderrors)
+            if (global.diag.errors != olderrors)
                 return err();
             if (s)
             {
                 s = s.toAlias();
-                if (global.errors != olderrors)
+                if (global.diag.errors != olderrors)
                     return err();
                 aliassym = s;
                 inuse = 0;
@@ -650,7 +650,7 @@ extern (C++) final class AliasDeclaration : Declaration
                 Type t = type.typeSemantic(loc, _scope);
                 if (t.ty == Terror)
                     return err();
-                if (global.errors != olderrors)
+                if (global.diag.errors != olderrors)
                     return err();
                 //printf("t = %s\n", t.toChars());
                 inuse = 0;
@@ -1099,12 +1099,12 @@ extern (C++) class VarDeclaration : Declaration
         assert(type && _init);
 
         // Ungag errors when not speculative
-        const oldgag = global.gag;
-        if (global.gag)
+        const oldgag = global.diag.gag;
+        if (global.diag.gag)
         {
             Dsymbol sym = isMember();
             if (sym && !sym.isSpeculative())
-                global.gag = 0;
+                global.diag.gag = 0;
         }
 
         if (_scope)
@@ -1118,7 +1118,7 @@ extern (C++) class VarDeclaration : Declaration
         }
 
         Expression e = _init.initializerToExpression(needFullType ? type : null);
-        global.gag = oldgag;
+        global.diag.gag = oldgag;
         return e;
     }
 

compiler/src/dmd/dinterpret.d

@@ -2121,7 +2121,7 @@ public:
                     v.inuse++;
                     e = interpret(e, istate);
                     v.inuse--;
-                    if (CTFEExp.isCantExp(e) && !global.gag && !ctfeGlobals.stackTraceCallsToSuppress)
+                    if (CTFEExp.isCantExp(e) && !global.diag.gag && !ctfeGlobals.stackTraceCallsToSuppress)
                         errorSupplemental(loc, "while evaluating %s.init", v.toChars());
                     if (exceptionOrCantInterpret(e))
                         return e;
@@ -4992,7 +4992,7 @@ public:
             result = paintTypeOntoLiteral(pue, e.type, result);
             result.loc = e.loc;
         }
-        else if (CTFEExp.isCantExp(result) && !global.gag)
+        else if (CTFEExp.isCantExp(result) && !global.diag.gag)
             showCtfeBackTrace(e, fd); // Print a stack trace.
     }
 

compiler/src/dmd/dmodule.d

@@ -655,7 +655,7 @@ extern (C++) final class Module : Package
                     cast(int)name.length, name.ptr, cast(int)pkgfile.length, pkgfile.ptr);
             }
         }
-        if (!global.gag)
+        if (!global.diag.gag)
         {
             /* Print path
              */
@@ -929,7 +929,7 @@ extern (C++) final class Module : Package
                     error(md ? md.loc : loc, "%s `%s` from file %s conflicts with package name %s", kind, toPrettyChars, srcname, pkg.toChars());
             }
             else
-                assert(global.errors);
+                assert(global.diag.errors);
         }
         else
         {
@@ -1085,7 +1085,7 @@ extern (C++) final class Module : Package
             //printf("[%d] %s semantic2a\n", i, s.toPrettyChars());
             s.semantic2(null);
 
-            if (global.errors)
+            if (global.diag.errors)
                 break;
         }
         a.setDim(0);
@@ -1102,7 +1102,7 @@ extern (C++) final class Module : Package
             //printf("[%d] %s semantic3a\n", i, s.toPrettyChars());
             s.semantic3(null);
 
-            if (global.errors)
+            if (global.diag.errors)
                 break;
         }
         a.setDim(0);
@@ -1260,14 +1260,14 @@ extern (C++) final class Module : Package
         auto imp = new Import(Loc.initial, pkgids[], modid, null, true);
         // Module.load will call fatal() if there's no module available.
         // Gag the error here, pushing the error handling to the caller.
-        const errors = global.startGagging();
+        const errors = global.diag.startGagging();
         imp.load(null);
         if (imp.mod)
         {
             imp.mod.importAll(null);
             imp.mod.dsymbolSemantic(null);
         }
-        global.endGagging(errors);
+        global.diag.endGagging(errors);
         mod = imp.mod;
         return mod;
     }

compiler/src/dmd/dscope.d

@@ -562,7 +562,7 @@ extern (C++) struct Scope
 
     extern (D) Dsymbol search_correct(Identifier ident)
     {
-        if (global.gag)
+        if (global.diag.gag)
             return null; // don't do it for speculative compiles; too time consuming
 
         /************************************************

compiler/src/dmd/dsymbol.d

@@ -118,7 +118,7 @@ struct Ungag
 
     extern (C++) ~this() nothrow
     {
-        global.gag = oldgag;
+        global.diag.gag = oldgag;
     }
 }
 
@@ -605,9 +605,9 @@ extern (C++) class Dsymbol : ASTNode
 
     final Ungag ungagSpeculative() const
     {
-        const oldgag = global.gag;
-        if (global.gag && !isSpeculative() && !toParent2().isFuncDeclaration())
-            global.gag = 0;
+        const oldgag = global.diag.gag;
+        if (global.diag.gag && !isSpeculative() && !toParent2().isFuncDeclaration())
+            global.diag.gag = 0;
         return Ungag(oldgag);
     }