Merge pull request #2650 from kinke/osx64_mangling

[2.079] WIP: 64-bit macOS (u)long mangling

Author: kinke

CMakeLists.txt

@@ -417,6 +417,7 @@ append("-DOPAQUE_VTBLS" LDC_CXXFLAGS)
 append("\"-DLDC_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}\"" LDC_CXXFLAGS)
 append("-DLDC_LLVM_VER=${LDC_LLVM_VER}" LDC_CXXFLAGS)
 append("\"-DLDC_LIBDIR_SUFFIX=\\\"${LIB_SUFFIX}\\\"\"" LDC_CXXFLAGS)
+append("-DLDC_HOST_FE_VER=${D_COMPILER_FE_VERSION}" LDC_CXXFLAGS)
 
 if(GENERATE_OFFTI)
     append("-DGENERATE_OFFTI" LDC_CXXFLAGS)

cmake/Modules/FindDCompiler.cmake

@@ -8,6 +8,7 @@
 #  D_COMPILER_FLAGS    - D compiler flags (could be passed in the DMD environment variable)
 #  D_COMPILER_ID       = {"DigitalMars", "LDMD", "LDC", "GDC"}
 #  D_COMPILER_VERSION_STRING - String containing the compiler version, e.g. "DMD64 D Compiler v2.070.2"
+#  D_COMPILER_FE_VERSION - compiler front-end version, e.g. "2070"
 #  D_COMPILER_DMD_COMPAT - true if the D compiler cmdline interface is compatible with DMD
 
 
@@ -64,13 +65,16 @@ if (D_COMPILER)
                     OUTPUT_VARIABLE D_COMPILER_VERSION_STRING
                     ERROR_VARIABLE D_COMPILER_VERSION_STRING
                     ERROR_QUIET)
+    string(REGEX MATCH " (D Compiler|based on DMD) v([0-9]+)\\.([0-9]+)" D_COMPILER_FE_VERSION "${D_COMPILER_VERSION_STRING}")
+    math(EXPR D_COMPILER_FE_VERSION ${CMAKE_MATCH_2}*1000+${CMAKE_MATCH_3}) # e.g., 2079
     string(REGEX MATCH "^[^\r\n:]*" D_COMPILER_VERSION_STRING "${D_COMPILER_VERSION_STRING}")
 endif()
 
 
 if (D_COMPILER_FOUND)
     message(STATUS "Found host D compiler ${D_COMPILER}, with default flags '${D_COMPILER_FLAGS}'")
     message(STATUS "Host D compiler version: ${D_COMPILER_VERSION_STRING}")
+    message(STATUS "Host D compiler front-end version: ${D_COMPILER_FE_VERSION}")
 else()
     message(FATAL_ERROR "No D compiler found! Try setting the 'D_COMPILER' variable or 'DMD' environment variable.")
 endif()

dmd/cppmangle.d

@@ -943,14 +943,18 @@ public:
         if (t.isImmutable() || t.isShared())
             return error(t);
 
-        /* __c_long and __c_ulong get special mangling
+        /* magic structs __c_(u)long(long) get special mangling
          */
         const id = t.sym.ident;
         //printf("struct id = '%s'\n", id.toChars());
         if (id == Id.__c_long)
             return writeBasicType(t, 0, 'l');
         else if (id == Id.__c_ulong)
             return writeBasicType(t, 0, 'm');
+        else if (id == Id.__c_longlong)
+            return writeBasicType(t, 0, 'x');
+        else if (id == Id.__c_ulonglong)
+            return writeBasicType(t, 0, 'y');
 
         //printf("TypeStruct %s\n", t.toChars());
         doSymbol(t);

dmd/cppmanglewin.d

@@ -374,16 +374,18 @@ public:
     override void visit(TypeStruct type)
     {
         const id = type.sym.ident;
-        char c;
+        string c;
         if (id == Id.__c_long_double)
-            c = 'O'; // VC++ long double
+            c = "O"; // VC++ long double
         else if (id == Id.__c_long)
-            c = 'J'; // VC++ long
+            c = "J"; // VC++ long
         else if (id == Id.__c_ulong)
-            c = 'K'; // VC++ unsigned long
-        else
-            c = 0;
-        if (c)
+            c = "K"; // VC++ unsigned long
+        else if (id == Id.__c_longlong)
+            c = "_J"; // VC++ long long
+        else if (id == Id.__c_ulonglong)
+            c = "_K"; // VC++ unsigned long long
+        if (c.length)
         {
             if (type.isImmutable() || type.isShared())
             {
@@ -396,7 +398,7 @@ public:
                     return;
             }
             mangleModifier(type);
-            buf.writeByte(c);
+            buf.writestring(c);
         }
         else
         {
@@ -1025,7 +1027,8 @@ private:
             if (rettype.ty == Tstruct || rettype.ty == Tenum)
             {
                 const id = rettype.toDsymbol(null).ident;
-                if (id != Id.__c_long_double && id != Id.__c_long && id != Id.__c_ulong)
+                if (id != Id.__c_long_double && id != Id.__c_long && id != Id.__c_ulong &&
+                    id != Id.__c_longlong && id != Id.__c_ulonglong)
                 {
                     tmp.buf.writeByte('?');
                     tmp.buf.writeByte('A');

dmd/id.d

@@ -111,6 +111,8 @@ immutable Msgtable[] msgtable =
     { "gate", "__gate" },
     { "__c_long" },
     { "__c_ulong" },
+    { "__c_longlong" },
+    { "__c_ulonglong" },
     { "__c_long_double" },
     { "cpp_type_info_ptr", "__cpp_type_info_ptr" },
     { "_assert", "assert" },

dmd/id.h

@@ -31,6 +31,8 @@ struct Id
     static Identifier *offsetof;
     static Identifier *__c_long;
     static Identifier *__c_ulong;
+    static Identifier *__c_longlong;
+    static Identifier *__c_ulonglong;
     static Identifier *__c_long_double;
     static Identifier *__switch;
     static Identifier *crt_constructor;

dmd/mars.d

@@ -551,7 +551,14 @@ extern (C++) int mars_mainBody(ref Strings files, ref Strings libmodules)
     Objc._init();
     builtin_init();
 
-  version (IN_LLVM) {} else
+  version (IN_LLVM)
+  {
+    // LDC prints binary/version/config before entering this function.
+    // DMD prints the predefined versions as part of addDefaultVersionIdentifiers().
+    // Let's do it here after initialization, as e.g. Objc.init() may add `D_ObjectiveC`.
+    printPredefinedVersions();
+  }
+  else
   {
     printPredefinedVersions();
 
@@ -1610,8 +1617,7 @@ void addDefaultVersionIdentifiers()
 
 } // !IN_LLVM
 
-// IN_LLVM replaced: `private` by `extern (C++)`
-extern (C++) void printPredefinedVersions()
+private void printPredefinedVersions()
 {
     if (global.params.verbose && global.versionids)
     {

dmd/mars.h

@@ -102,7 +102,6 @@ void ensurePathToNameExists(Loc loc, const char *name);
 
 #if IN_LLVM
 int mars_mainBody(Strings &files, Strings &libmodules);
-void printPredefinedVersions();
 #endif
 
 const char *importHint(const char *s);

driver/main.cpp

@@ -1123,7 +1123,6 @@ int cppmain(int argc, char **argv) {
 
 void addDefaultVersionIdentifiers() {
   registerPredefinedVersions();
-  printPredefinedVersions();
 }
 
 void codegenModules(Modules &modules) {

gen/abi.cpp

@@ -197,6 +197,7 @@ bool TargetABI::isMagicCppStruct(Type *t) {
 
   Identifier *id = static_cast<TypeStruct *>(t)->sym->ident;
   return (id == Id::__c_long) || (id == Id::__c_ulong) ||
+         (id == Id::__c_longlong) || (id == Id::__c_ulonglong) ||
          (id == Id::__c_long_double);
 }