Merge remote-tracking branch 'origin/dmd-rewrite-stable' into merge-2.111

Conflicts:
	dmd/declaration.h
	dmd/expression.h

Author: kinke

dmd/cxxfrontend.d

@@ -16,6 +16,7 @@ import dmd.astenums;
 import dmd.attrib;
 import dmd.common.outbuffer : OutBuffer;
 import dmd.dclass : ClassDeclaration;
+import dmd.declaration : TypeInfoDeclaration;
 import dmd.denum : EnumDeclaration;
 import dmd.dmodule /*: Module*/;
 import dmd.dscope : Scope;
@@ -277,6 +278,19 @@ bool fill(StructDeclaration sd, Loc loc,
     return dmd.expressionsem.fill(sd, loc, elements, ctorinit);
 }
 
+/***********************************************************
+ * func.d
+ */
+FuncDeclaration genCfunc(Parameters* fparams, Type treturn, const(char)* name, StorageClass stc = STC.none)
+{
+    return FuncDeclaration.genCfunc(fparams, treturn, name, cast(STC) stc);
+}
+
+FuncDeclaration genCfunc(Parameters* fparams, Type treturn, Identifier id, StorageClass stc = STC.none)
+{
+    return FuncDeclaration.genCfunc(fparams, treturn, id, cast(STC) stc);
+}
+
 /***********************************************************
  * funcsem.d
  */
@@ -720,6 +734,18 @@ bool builtinTypeInfo(Type t)
     return dmd.typinf.builtinTypeInfo(t);
 }
 
+Type makeNakedAssociativeArray(TypeAArray t)
+{
+    import dmd.typinf;
+    return dmd.typinf.makeNakedAssociativeArray(t);
+}
+
+TypeInfoDeclaration getTypeInfoAssocArrayDeclaration(TypeAArray t, Scope* sc)
+{
+    import dmd.typinf;
+    return dmd.typinf.getTypeInfoAssocArrayDeclaration(t, sc);
+}
+
 version (IN_LLVM)
 {
     /***********************************************************

dmd/declaration.h

@@ -37,9 +37,11 @@ namespace dmd
     bool checkClosure(FuncDeclaration* fd);
     MATCH leastAsSpecialized(FuncDeclaration *f, FuncDeclaration *g, Identifiers *names);
     PURE isPure(FuncDeclaration *f);
+    FuncDeclaration *genCfunc(Parameters *args, Type *treturn, const char *name, StorageClass stc=0);
+    FuncDeclaration *genCfunc(Parameters *args, Type *treturn, Identifier *id, StorageClass stc=0);
 }
 
-enum class STC : uint64_t;
+//enum STC : ulong from astenums.d:
 
     #define STCundefined          0ULL
 
@@ -756,9 +758,6 @@ class FuncDeclaration : public Declaration
     bool hasNestedFrameRefs();
     ParameterList getParameterList();
 
-    static FuncDeclaration *genCfunc(Parameters *args, Type *treturn, const char *name, STC stc = (STC)0);
-    static FuncDeclaration *genCfunc(Parameters *args, Type *treturn, Identifier *id, STC stc = (STC)0);
-
     virtual FuncDeclaration *toAliasFunc() { return this; }
     void accept(Visitor *v) override { v->visit(this); }
 };

dmd/expression.h

@@ -40,7 +40,6 @@ class OverloadSet;
 class StringExp;
 class InterpExp;
 class LoweredAssignExp;
-class EnumDeclaration;
 class StaticForeach;
 #ifdef IN_GCC
 typedef union tree_node Symbol;

dmd/frontend.h

@@ -377,6 +377,22 @@ enum class MessageStyle : uint8_t
     sarif = 2u,
 };
 
+struct SourceLoc final
+{
+    _d_dynamicArray< const char > filename;
+    uint32_t line;
+    uint32_t column;
+    uint32_t fileOffset;
+    const char* toChars(bool showColumns = Loc::showColumns, MessageStyle messageStyle = Loc::messageStyle) const;
+    SourceLoc() :
+        filename(),
+        line(),
+        column(),
+        fileOffset()
+    {
+    }
+};
+
 struct Loc final
 {
 private:
@@ -390,7 +406,8 @@ struct Loc final
     uint32_t linnum() const;
     const char* filename() const;
     const char* toChars(bool showColumns = Loc::showColumns, MessageStyle messageStyle = Loc::messageStyle) const;
-    bool equals(const Loc& loc) const;
+    SourceLoc toSourceLoc() const;
+    bool equals(Loc loc) const;
     Loc() :
         index(0u)
     {
@@ -4052,8 +4069,6 @@ class FuncDeclaration : public Declaration
     bool needsClosure();
     bool hasNestedFrameRefs();
     ParameterList getParameterList();
-    static FuncDeclaration* genCfunc(Array<Parameter* >* fparams, Type* treturn, const char* name, STC stc = (STC)0LLU);
-    static FuncDeclaration* genCfunc(Array<Parameter* >* fparams, Type* treturn, Identifier* id, STC stc = (STC)0LLU);
     virtual FuncDeclaration* toAliasFunc();
     void accept(Visitor* v) override;
 };

dmd/func.d

@@ -1058,12 +1058,12 @@ version (IN_LLVM)
     /**********************************
      * Generate a FuncDeclaration for a runtime library function.
      */
-    static FuncDeclaration genCfunc(Parameters* fparams, Type treturn, const(char)* name, STC stc = STC.none)
+    extern(D) static FuncDeclaration genCfunc(Parameters* fparams, Type treturn, const(char)* name, STC stc = STC.none)
     {
         return genCfunc(fparams, treturn, Identifier.idPool(name[0 .. strlen(name)]), stc);
     }
 
-    static FuncDeclaration genCfunc(Parameters* fparams, Type treturn, Identifier id, STC stc = STC.none)
+    extern(D) static FuncDeclaration genCfunc(Parameters* fparams, Type treturn, Identifier id, STC stc = STC.none)
     {
         FuncDeclaration fd;
         TypeFunction tf;

dmd/globals.h

@@ -504,6 +504,14 @@ typedef unsigned long long uinteger_t;
 #endif
 
 // file location
+struct SourceLoc
+{
+    DString filename;
+    uint32_t line;
+    uint32_t column;
+    uint32_t fileOffset;
+};
+
 struct Loc
 {
 private:
@@ -529,6 +537,7 @@ struct Loc
     uint32_t charnum() const;
     uint32_t linnum() const;
     const char *filename() const;
+    SourceLoc toSourceLoc() const;
 
     const char *toChars(
         bool showColumns = Loc::showColumns,

dmd/iasmgcc.d

@@ -55,7 +55,8 @@ public Statement gccAsmSemantic(GccAsmStatement s, Scope* sc)
         *ptoklist = null;
     }
     p.token = *toklist;
-    p.scanloc = s.loc;
+    p.baseLoc.startLine = s.loc.linnum;
+    p.linnum = s.loc.linnum;
 
     // Parse the gcc asm statement.
     const errors = global.errors;

dmd/location.d

@@ -124,14 +124,20 @@ nothrow:
         return this.index - locFileTable[i].startIndex;
     }
 
+    /// Returns: this location as a SourceLoc
+    extern (C++) SourceLoc toSourceLoc() const @nogc @safe
+    {
+        return SourceLoc(this);
+    }
+
     /**
      * Checks for equivalence by comparing the filename contents (not the pointer) and character location.
      *
      * Note:
      *  - Uses case-insensitive comparison on Windows
      *  - Ignores `charnum` if `Columns` is false.
      */
-    extern (C++) bool equals(ref const(Loc) loc) const
+    extern (C++) bool equals(Loc loc) const
     {
         SourceLoc lhs = SourceLoc(this);
         SourceLoc rhs = SourceLoc(loc);

dmd/typinf.h

@@ -14,12 +14,16 @@
 
 class Expression;
 class Type;
+class TypeAArray;
+class TypeInfoDeclaration;
 struct Scope;
 
 namespace dmd
 {
     bool genTypeInfo(Expression *e, Loc loc, Type *torig, Scope *sc);
     bool isSpeculativeType(Type *t);
     bool builtinTypeInfo(Type *t);
+    Type *makeNakedAssociativeArray(TypeAArray *t);
+    TypeInfoDeclaration *getTypeInfoAssocArrayDeclaration(TypeAArray *t, Scope *sc);
 }
 Type *getTypeInfoType(Loc loc, Type *t, Scope *sc);

gen/trycatchfinally.cpp

@@ -112,7 +112,7 @@ void TryCatchScope::emitCatchBodies(IRState &irs, llvm::Value *ehPtrSlot) {
        * exception handler. At some point should try to do better.
        */
       FuncDeclaration *fdend =
-          FuncDeclaration::genCfunc(nullptr, Type::tvoid, "__cxa_end_catch");
+          dmd::genCfunc(nullptr, Type::tvoid, "__cxa_end_catch");
       Expression *efunc = VarExp::create(Loc(), fdend);
       Expression *ecall = CallExp::create(Loc(), efunc);
       ecall->type = Type::tvoid;

runtime/druntime/src/etc/linux/memoryerror.d

@@ -40,7 +40,7 @@ version (linux)
 
 version (MemoryErrorSupported)
     version = AnySupported;
-else version (MemoryErrorSupported)
+else version (MemoryAssertSupported)
     version = AnySupported;
 
 version (AnySupported):