Merge pull request #11091 from kinke/valist

dlang-bot · web-flow · commit 2dc6c9d6193d · 2020-05-03T10:10:53.000+02:00
[stable] Prevent redundant type semantic for va_list
merged-on-behalf-of: Iain Buclaw &lt;ibuclaw@gdcproject.org&gt;
diff --git a/src/dmd/astbase.d b/src/dmd/astbase.d
@@ -2686,7 +2686,6 @@ struct ASTBase
         extern (C++) __gshared Type tstring;     // immutable(char)[]
         extern (C++) __gshared Type twstring;    // immutable(wchar)[]
         extern (C++) __gshared Type tdstring;    // immutable(dchar)[]
-        extern (C++) __gshared Type tvalist;     // va_list alias
         extern (C++) __gshared Type terror;      // for error recovery
         extern (C++) __gshared Type tnull;       // for null type
 
@@ -2847,7 +2846,6 @@ struct ASTBase
             tstring = tchar.immutableOf().arrayOf();
             twstring = twchar.immutableOf().arrayOf();
             tdstring = tdchar.immutableOf().arrayOf();
-            tvalist = Target.va_listType();
 
             const isLP64 = global.params.isLP64;
 
@@ -6518,7 +6516,7 @@ struct ASTBase
     {
         extern (C++) __gshared int ptrsize;
 
-        extern (C++) static Type va_listType()
+        extern (C++) static Type va_listType(const ref Loc loc, Scope* sc)
         {
             if (global.params.isWindows)
             {
diff --git a/src/dmd/dsymbolsem.d b/src/dmd/dsymbolsem.d
@@ -3498,8 +3498,7 @@ private extern(C++) final class DsymbolSemanticVisitor : Visitor
 
             bool isVa_list(Parameter p)
             {
-                Type.tvalist = Type.tvalist.typeSemantic(funcdecl.loc, sc);
-                return p.type.equals(Type.tvalist);
+                return p.type.equals(target.va_listType(funcdecl.loc, sc));
             }
 
             const nparams = f.parameterList.length;
diff --git a/src/dmd/mtype.d b/src/dmd/mtype.d
@@ -440,7 +440,6 @@ extern (C++) abstract class Type : ASTNode
     extern (C++) __gshared Type tstring;     // immutable(char)[]
     extern (C++) __gshared Type twstring;    // immutable(wchar)[]
     extern (C++) __gshared Type tdstring;    // immutable(dchar)[]
-    extern (C++) __gshared Type tvalist;     // va_list alias
     extern (C++) __gshared Type terror;      // for error recovery
     extern (C++) __gshared Type tnull;       // for null type
 
@@ -891,7 +890,6 @@ extern (C++) abstract class Type : ASTNode
         tstring = tchar.immutableOf().arrayOf();
         twstring = twchar.immutableOf().arrayOf();
         tdstring = tdchar.immutableOf().arrayOf();
-        tvalist = target.va_listType();
 
         const isLP64 = global.params.isLP64;
 
diff --git a/src/dmd/mtype.h b/src/dmd/mtype.h
@@ -189,7 +189,6 @@ class Type : public ASTNode
     static Type *tstring;               // immutable(char)[]
     static Type *twstring;              // immutable(wchar)[]
     static Type *tdstring;              // immutable(dchar)[]
-    static Type *tvalist;               // va_list alias
     static Type *terror;                // for error recovery
     static Type *tnull;                 // for null type
 
diff --git a/src/dmd/semantic3.d b/src/dmd/semantic3.d
@@ -401,7 +401,7 @@ private extern(C++) final class Semantic3Visitor : Visitor
                 if (f.linkage == LINK.d || f.parameterList.length)
                 {
                     // Declare _argptr
-                    Type t = Type.tvalist;
+                    Type t = target.va_listType(funcdecl.loc, sc);
                     // Init is handled in FuncDeclaration_toObjFile
                     funcdecl.v_argptr = new VarDeclaration(funcdecl.loc, t, Id._argptr, new VoidInitializer(funcdecl.loc));
                     funcdecl.v_argptr.storage_class |= STC.temp;
diff --git a/src/dmd/target.d b/src/dmd/target.d
@@ -31,6 +31,7 @@ import dmd.cppmangle;
 import dmd.cppmanglewin;
 import dmd.dclass;
 import dmd.declaration;
+import dmd.dscope;
 import dmd.dstruct;
 import dmd.dsymbol;
 import dmd.expression;
@@ -106,6 +107,8 @@ extern (C++) struct Target
     FPTypeProperties!double DoubleProperties;   ///
     FPTypeProperties!real_t RealProperties;     ///
 
+    private Type va_list; // cached lazy result of va_listType()
+
     /**
      * Initialize the Target
      */
@@ -250,34 +253,41 @@ extern (C++) struct Target
     }
 
     /**
-     * Type for the `va_list` type for the target.
+     * Type for the `va_list` type for the target; e.g., required for `_argptr`
+     * declarations.
      * NOTE: For Posix/x86_64 this returns the type which will really
      * be used for passing an argument of type va_list.
      * Returns:
      *      `Type` that represents `va_list`.
      */
-    extern (C++) Type va_listType()
+    extern (C++) Type va_listType(const ref Loc loc, Scope* sc)
     {
+        if (va_list)
+            return va_list;
+
         if (global.params.isWindows)
         {
-            return Type.tchar.pointerTo();
+            va_list = Type.tchar.pointerTo();
         }
-        else if (global.params.isLinux || global.params.isFreeBSD || global.params.isOpenBSD || global.params.isDragonFlyBSD ||
-            global.params.isSolaris || global.params.isOSX)
+        else if (global.params.isLinux        || global.params.isFreeBSD || global.params.isOpenBSD ||
+                 global.params.isDragonFlyBSD || global.params.isSolaris || global.params.isOSX)
         {
             if (global.params.is64bit)
             {
-                return (new TypeIdentifier(Loc.initial, Identifier.idPool("__va_list_tag"))).pointerTo();
+                va_list = new TypeIdentifier(Loc.initial, Identifier.idPool("__va_list_tag")).pointerTo();
+                va_list = typeSemantic(va_list, loc, sc);
             }
             else
             {
-                return Type.tchar.pointerTo();
+                va_list = Type.tchar.pointerTo();
             }
         }
         else
         {
             assert(0);
         }
+
+        return va_list;
     }
 
     /**
diff --git a/src/dmd/target.h b/src/dmd/target.h
@@ -89,12 +89,16 @@ struct Target
     FPTypeProperties<double> DoubleProperties;
     FPTypeProperties<real_t> RealProperties;
 
+private:
+    Type *va_list;
+
+public:
     void _init(const Param& params);
     // Type sizes and support.
     unsigned alignsize(Type *type);
     unsigned fieldalign(Type *type);
     unsigned critsecsize();
-    Type *va_listType();  // get type of va_list
+    Type *va_listType(const Loc &loc, Scope *sc);  // get type of va_list
     int isVectorTypeSupported(int sz, Type *type);
     bool isVectorOpSupported(Type *type, TOK op, Type *t2 = NULL);
     // ABI and backend.

Original file line number	Diff line number	Diff line change
`@@ -2686,7 +2686,6 @@ struct ASTBase`
`2686`	`2686`	`extern (C++) __gshared Type tstring; // immutable(char)[]`
`2687`	`2687`	`extern (C++) __gshared Type twstring; // immutable(wchar)[]`
`2688`	`2688`	`extern (C++) __gshared Type tdstring; // immutable(dchar)[]`
`2689`		`- extern (C++) __gshared Type tvalist; // va_list alias`
`2690`	`2689`	`extern (C++) __gshared Type terror; // for error recovery`
`2691`	`2690`	`extern (C++) __gshared Type tnull; // for null type`
`2692`	`2691`
`@@ -2847,7 +2846,6 @@ struct ASTBase`
`2847`	`2846`	`tstring = tchar.immutableOf().arrayOf();`
`2848`	`2847`	`twstring = twchar.immutableOf().arrayOf();`
`2849`	`2848`	`tdstring = tdchar.immutableOf().arrayOf();`
`2850`		`- tvalist = Target.va_listType();`
`2851`	`2849`
`2852`	`2850`	`const isLP64 = global.params.isLP64;`
`2853`	`2851`
`@@ -6518,7 +6516,7 @@ struct ASTBase`
`6518`	`6516`	`{`
`6519`	`6517`	`extern (C++) __gshared int ptrsize;`
`6520`	`6518`
`6521`		`- extern (C++) static Type va_listType()`
	`6519`	`+ extern (C++) static Type va_listType(const ref Loc loc, Scope* sc)`
`6522`	`6520`	`{`
`6523`	`6521`	`if (global.params.isWindows)`
`6524`	`6522`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3498,8 +3498,7 @@ private extern(C++) final class DsymbolSemanticVisitor : Visitor`
`3498`	`3498`
`3499`	`3499`	`bool isVa_list(Parameter p)`
`3500`	`3500`	`{`
`3501`		`- Type.tvalist = Type.tvalist.typeSemantic(funcdecl.loc, sc);`
`3502`		`- return p.type.equals(Type.tvalist);`
	`3501`	`+ return p.type.equals(target.va_listType(funcdecl.loc, sc));`
`3503`	`3502`	`}`
`3504`	`3503`
`3505`	`3504`	`const nparams = f.parameterList.length;`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ private extern(C++) final class Semantic3Visitor : Visitor`
`401`	`401`	`if (f.linkage == LINK.d \|\| f.parameterList.length)`
`402`	`402`	`{`
`403`	`403`	`// Declare _argptr`
`404`		`- Type t = Type.tvalist;`
	`404`	`+ Type t = target.va_listType(funcdecl.loc, sc);`
`405`	`405`	`// Init is handled in FuncDeclaration_toObjFile`
`406`	`406`	`funcdecl.v_argptr = new VarDeclaration(funcdecl.loc, t, Id._argptr, new VoidInitializer(funcdecl.loc));`
`407`	`407`	`funcdecl.v_argptr.storage_class \|= STC.temp;`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ import dmd.cppmangle;`
`31`	`31`	`import dmd.cppmanglewin;`
`32`	`32`	`import dmd.dclass;`
`33`	`33`	`import dmd.declaration;`
	`34`	`+import dmd.dscope;`
`34`	`35`	`import dmd.dstruct;`
`35`	`36`	`import dmd.dsymbol;`
`36`	`37`	`import dmd.expression;`
`@@ -106,6 +107,8 @@ extern (C++) struct Target`
`106`	`107`	`FPTypeProperties!double DoubleProperties; ///`
`107`	`108`	`FPTypeProperties!real_t RealProperties; ///`
`108`	`109`
	`110`	`+ private Type va_list; // cached lazy result of va_listType()`
	`111`	`+`
`109`	`112`	`/**`
`110`	`113`	`* Initialize the Target`
`111`	`114`	`*/`
`@@ -250,34 +253,41 @@ extern (C++) struct Target`
`250`	`253`	`}`
`251`	`254`
`252`	`255`	`/**`
`253`		- * Type for the `va_list` type for the target.
	`256`	+ * Type for the `va_list` type for the target; e.g., required for `_argptr`
	`257`	`+ * declarations.`
`254`	`258`	`* NOTE: For Posix/x86_64 this returns the type which will really`
`255`	`259`	`* be used for passing an argument of type va_list.`
`256`	`260`	`* Returns:`
`257`	`261`	* `Type` that represents `va_list`.
`258`	`262`	`*/`
`259`		`- extern (C++) Type va_listType()`
	`263`	`+ extern (C++) Type va_listType(const ref Loc loc, Scope* sc)`
`260`	`264`	`{`
	`265`	`+ if (va_list)`
	`266`	`+ return va_list;`
	`267`	`+`
`261`	`268`	`if (global.params.isWindows)`
`262`	`269`	`{`
`263`		`- return Type.tchar.pointerTo();`
	`270`	`+ va_list = Type.tchar.pointerTo();`
`264`	`271`	`}`
`265`		`- else if (global.params.isLinux \|\| global.params.isFreeBSD \|\| global.params.isOpenBSD \|\| global.params.isDragonFlyBSD \|\|`
`266`		`- global.params.isSolaris \|\| global.params.isOSX)`
	`272`	`+ else if (global.params.isLinux \|\| global.params.isFreeBSD \|\| global.params.isOpenBSD \|\|`
	`273`	`+ global.params.isDragonFlyBSD \|\| global.params.isSolaris \|\| global.params.isOSX)`
`267`	`274`	`{`
`268`	`275`	`if (global.params.is64bit)`
`269`	`276`	`{`
`270`		`- return (new TypeIdentifier(Loc.initial, Identifier.idPool("__va_list_tag"))).pointerTo();`
	`277`	`+ va_list = new TypeIdentifier(Loc.initial, Identifier.idPool("__va_list_tag")).pointerTo();`
	`278`	`+ va_list = typeSemantic(va_list, loc, sc);`
`271`	`279`	`}`
`272`	`280`	`else`
`273`	`281`	`{`
`274`		`- return Type.tchar.pointerTo();`
	`282`	`+ va_list = Type.tchar.pointerTo();`
`275`	`283`	`}`
`276`	`284`	`}`
`277`	`285`	`else`
`278`	`286`	`{`
`279`	`287`	`assert(0);`
`280`	`288`	`}`
	`289`	`+`
	`290`	`+ return va_list;`
`281`	`291`	`}`
`282`	`292`
`283`	`293`	`/**`