Initialize Target before Type

As `Type._init()` depends on `target.isLP64`. Don't initialize that
field in `reconcileCommands`, but in `Target._init()`.

Author: kinke

Diff for: src/dmd/frontend.d

@@ -140,18 +140,17 @@ void initDMD(
     }
 
     versionIdentifiers.each!(VersionCondition.addGlobalIdent);
-    addDefaultVersionIdentifiers(global.params, target);
 
+    target.os = defaultTargetOS();
+    target._init(global.params);
     Type._init();
     Id.initialize();
     Module._init();
-    target._init(global.params);
-    target.os = defaultTargetOS();
     Expression._init();
     Objc._init();
     FileCache._init();
 
-    addDefaultVersionIdentifiers(global.params,target);
+    addDefaultVersionIdentifiers(global.params, target);
 
     version (CRuntime_Microsoft)
         initFPU();

Diff for: src/dmd/mars.d

@@ -293,10 +293,10 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)
     setDefaultLibrary();
 
     // Initialization
+    target._init(params);
     Type._init();
     Id.initialize();
     Module._init();
-    target._init(params);
     Expression._init();
     Objc._init();
     import dmd.filecache : FileCache;
@@ -2541,10 +2541,6 @@ private void reconcileCommands(ref Param params)
             error(Loc.initial, "`-mscrtlib` can only be used when targetting windows");
     }
 
-    // Target uses 64bit pointers.
-    // FIXME: X32 is 64bit but uses 32 bit pointers
-    target.isLP64 = target.is64bit;
-
     if (params.boundscheck != CHECKENABLE._default)
     {
         if (params.useArrayBounds == CHECKENABLE._default)

Diff for: src/dmd/target.d

@@ -191,12 +191,16 @@ extern (C++) struct Target
      */
     extern (C++) void _init(ref const Param params)
     {
+        // is64bit, mscoff and cpu are initialized in parseCommandLine
+
         this.params = &params;
 
         FloatProperties.initialize();
         DoubleProperties.initialize();
         RealProperties.initialize();
 
+        isLP64 = is64bit;
+
         // These have default values for 32 bit code, they get
         // adjusted for 64 bit code.
         ptrsize = 4;

Diff for: src/tests/cxxfrontend.c

@@ -67,17 +67,19 @@ static void frontend_init()
     gc_disable();
 
     global._init();
-    target.os = Target::OS_linux;
     global.vendor = "Front-End Tester";
     global.params.objname = NULL;
+
+    target.os = Target::OS_linux;
+    target.is64bit = true;
     target.cpu = CPU::native;
+    target._init(global.params);
 
     Type::_init();
     Id::initialize();
     Module::_init();
     Expression::_init();
     Objc::_init();
-    target._init(global.params);
     CTFloat::initialize();
 }
 
@@ -525,12 +527,12 @@ void test_cppmangle()
     fd = (*cd->members)[0]->isFuncDeclaration();
     assert(fd);
     mangle = cppThunkMangleItanium(fd, b->offset);
-    assert(strcmp(mangle, "_ZThn4_N7Derived9MethodCPPEv") == 0);
+    assert(strcmp(mangle, "_ZThn8_N7Derived9MethodCPPEv") == 0);
 
     fd = (*cd->members)[1]->isFuncDeclaration();
     assert(fd);
     mangle = cppThunkMangleItanium(fd, b->offset);
-    assert(strcmp(mangle, "_ZThn4_N7Derived7MethodDEv") == 0);
+    assert(strcmp(mangle, "_ZThn8_N7Derived7MethodDEv") == 0);
 
     assert(!global.endGagging(errors));
 }

Diff for: test/dub_package/frontend_file.d

@@ -3,6 +3,7 @@
 dependency "dmd" path="../.."
 +/
 import std.stdio;
+import std.string : replace;
 
 // test frontend
 void main()
@@ -49,7 +50,7 @@ void main()
 import object;
 double average(int[] array)
 {
-    immutable immutable(uint) initialLength = array.length;
+    immutable immutable(SIZE_T) initialLength = array.length;
     double accumulator = 0.0;
     for (; array.length;)
     {
@@ -60,7 +61,7 @@ double average(int[] array)
     }
     return accumulator / cast(double)initialLength;
 }
-};
+}.replace("SIZE_T", size_t.sizeof == 8 ? "ulong" : "uint");
 
     assert(generated.canFind(expected));
 }
@@ -73,6 +74,5 @@ This is required because this file is stored with Unix line endings but the
 */
 string toUnixLineEndings(string str)
 {
-    import std.string : replace;
     return str.replace("\r\n", "\n");
 }