Merge branch 'master' into release-0.16.0

Author: redstar

.travis.yml

@@ -66,12 +66,11 @@ after_success:
     fi
 
 notifications:
-  # Temporarily disabled due to time limit problems.
-  # email:
-  #   recipients:
-  #     - "[email protected]"
-  #   on_success: never
-  #   on_failure: change
+  email:
+    recipients:
+      - "[email protected]"
+    on_success: never
+    on_failure: change
   irc:
     channels:
       - "irc.freenode.org#ldc"

appveyor.yml

@@ -26,7 +26,6 @@ matrix:
 # scripts that are called at very beginning, before repo cloning
 init:
   - git config --global core.autocrlf input
-  - ren "c:\Program Files (x86)\Windows Kits\10\include\wdf" 00wdf
   - call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
   # Print environment info
   - set
@@ -100,7 +99,7 @@ build_script:
   - cd ninja-ldc
   - cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=c:\projects\ldc-x64 -DLLVM_ROOT_DIR=c:/projects/llvm-x64 -DLIBCONFIG_INCLUDE_DIR=c:/projects/libconfig/lib -DLIBCONFIG_LIBRARY=c:/projects/libconfig/lib/x64/ReleaseStatic/libconfig.lib ..\ldc
   # Work around LDC issue #930
-  - ps: (gc build.ninja).replace('runtime/std/string-unittest-debug.obj -w -d -g -unittest', 'runtime/std/string-unittest-debug.obj -w -d -unittest') | sc build.ninja
+  - ps: (gc build.ninja).replace('runtime/std/string-unittest-debug.obj -w -d -g -link-debuglib -unittest', 'runtime/std/string-unittest-debug.obj -w -d -link-debuglib -unittest') | sc build.ninja
   # Build LDC, druntime and phobos
   - ninja -j2
 
@@ -110,12 +109,13 @@ after_build:
         If ($Env:APPVEYOR_JOB_CONFIG -eq 'Debug') {
             echo 'Preparing artifact...'
             cd c:\projects\ninja-ldc
-            ninja install
+            ninja install > $null
             copy bin\ldc2.pdb ..\ldc-x64\bin
             cd ..\ldc-x64
-            7z a ..\ldc-x64.7z * > $null
+            $artifactFilename = "LDC-Win64-master-$Env:APPVEYOR_BUILD_NUMBER.7z"
+            7z a "..\$artifactFilename" * > $null
             cd ..
-            Push-AppveyorArtifact ldc-x64.7z
+            Push-AppveyorArtifact $artifactFilename
         }
 
 #---------------------------------#
@@ -146,11 +146,11 @@ test_script:
 
 deploy:
   release: 'LDC Win64 master'
-  description: 'Rolling release based on latest successful Win64 CI build from master branch'
+  description: "Latest successful Win64 CI builds of branch 'master'"
   provider: GitHub
   auth_token:
     secure: qnbD8agL9mr0SFvy/sMkR2E29oQQ427T5zYwVVZkjRS3IZ361tG+9jlSiyEkyULy
-  artifact: ldc-x64.7z
+  artifact: LDC-Win64-master-$(APPVEYOR_BUILD_NUMBER).7z
   draft: true
   prerelease: true
   on:

driver/main.cpp

@@ -90,15 +90,18 @@ static cl::list<std::string, StringsAdapter> importPaths("I",
     cl::Prefix);
 
 static cl::opt<std::string> defaultLib("defaultlib",
-    cl::desc("Default libraries for non-debug-info build (overrides previous)"),
+    cl::desc("Default libraries to link with (overrides previous)"),
     cl::value_desc("lib1,lib2,..."),
     cl::ZeroOrMore);
 
 static cl::opt<std::string> debugLib("debuglib",
-    cl::desc("Default libraries for debug info build (overrides previous)"),
+    cl::desc("Debug versions of default libraries (overrides previous)"),
     cl::value_desc("lib1,lib2,..."),
     cl::ZeroOrMore);
 
+static cl::opt<bool> linkDebugLib("link-debuglib",
+    cl::desc("Link with libraries specified in -debuglib, not -defaultlib"),
+    cl::ZeroOrMore);
 
 #if LDC_LLVM_VER < 304
 namespace llvm {
@@ -401,8 +404,16 @@ static void parseCommandLine(int argc, char **argv, Strings &sourceFiles, bool &
     sourceFiles.reserve(fileList.size());
     typedef std::vector<std::string>::iterator It;
     for(It I = fileList.begin(), E = fileList.end(); I != E; ++I)
+    {
         if (!I->empty())
-            sourceFiles.push(mem.xstrdup(I->c_str()));
+        {
+            char* copy = mem.xstrdup(I->c_str());
+#ifdef _WIN32
+            std::replace(copy, copy + I->length(), '/', '\\');
+#endif
+            sourceFiles.push(copy);
+        }
+    }
 
     if (noDefaultLib)
     {
@@ -413,8 +424,7 @@ static void parseCommandLine(int argc, char **argv, Strings &sourceFiles, bool &
     else
     {
         // Parse comma-separated default library list.
-        std::stringstream libNames(
-            global.params.symdebug ? debugLib : defaultLib);
+        std::stringstream libNames(linkDebugLib ? debugLib : defaultLib);
         while (libNames.good())
         {
             std::string lib;
@@ -1077,7 +1087,7 @@ int main(int argc, char **argv)
         const char *ext;
         const char *name;
 
-        const char *p = static_cast<const char *>(files.data[i]);
+        const char *p = files.data[i];
 
         p = FileName::name(p);      // strip path
         ext = FileName::ext(p);
@@ -1176,7 +1186,7 @@ int main(int argc, char **argv)
         }
 
         id = Identifier::idPool(name);
-        Module *m = new Module(static_cast<const char *>(files.data[i]), id, global.params.doDocComments, global.params.doHdrGeneration);
+        Module *m = new Module(files.data[i], id, global.params.doDocComments, global.params.doHdrGeneration);
         modules.push(m);
     }
 

gen/abi-aarch64.cpp

@@ -125,6 +125,15 @@ struct AArch64TargetABI : TargetABI
         // pass a void* pointer to the actual __va_list struct to LLVM's va_arg intrinsic
         return DtoLoad(pAp);
     }
+
+    Type* vaListType() {
+        // We need to pass the actual va_list type for correct mangling. Simply
+        // using TypeIdentifier here is a bit wonky but works, as long as the name
+        // is actually available in the scope (this is what DMD does, so if a better
+        // solution is found there, this should be adapted).
+        return (new TypeIdentifier(Loc(),
+            Identifier::idPool("__va_list_tag")))->pointerTo();
+    }
 };
 
 // The public getter for abi.cpp

gen/abi-x86.cpp

@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "gen/llvm.h"
+#include "id.h"
 #include "mars.h"
 #include "gen/abi-generic.h"
 #include "gen/abi.h"
@@ -70,6 +71,7 @@ struct X86TargetABI : TargetABI
         }
     }
 
+private:
     bool returnOSXStructInArg(TypeStruct* t)
     {
         // https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/LowLevelABI/Mac_OS_X_ABI_Function_Calls.pdf
@@ -86,6 +88,20 @@ struct X86TargetABI : TargetABI
         return !t->sym->isPOD() || (sz != 1 && sz != 2 && sz != 4 && sz != 8);
     }
 
+    bool isMagicCLong(Type *t)
+    {
+        // The frontend has magic structs to express the variable-sized C types
+        // for C++ mangling purposes. We need to pass them like integers, not
+        // on the stack.
+
+        Type * const bt = t->toBasetype();
+        if (bt->ty != Tstruct) return false;
+
+        Identifier *id = static_cast<TypeStruct *>(bt)->sym->ident;
+        return (id == Id::__c_long) || (id == Id::__c_ulong);
+    }
+
+public:
     bool returnInArg(TypeFunction* tf)
     {
         if (tf->isref)
@@ -103,6 +119,8 @@ struct X86TargetABI : TargetABI
         // as well as structs (except for some OSX cases).
         else
         {
+            if (isMagicCLong(rt)) return false;
+
             if (rt->ty == Tstruct)
             {
                 return !isOSX || returnOSXStructInArg((TypeStruct*)rt);
@@ -193,9 +211,10 @@ struct X86TargetABI : TargetABI
         {
             // RETURN VALUE
 
-            // cfloat -> i64
-            if (tf->next->toBasetype() == Type::tcomplex32)
+            if ((!fty.ret->byref && isMagicCLong(tf->next)) ||
+                tf->next->toBasetype() == Type::tcomplex32)
             {
+                // __c_long -> i32, cfloat -> i64
                 fty.ret->rewrite = &integerRewrite;
                 fty.ret->ltype = integerRewrite.type(fty.ret->type, fty.ret->ltype);
             }
@@ -212,12 +231,14 @@ struct X86TargetABI : TargetABI
                     fty.ret->ltype = integerRewrite.type(fty.ret->type, fty.ret->ltype);
                 }
             }
+
             // IMPLICIT PARAMETERS
 
             // EXPLICIT PARAMETERS
 
             // Clang does not pass empty structs, while it seems that GCC does,
-            // at least on Linux x86.
+            // at least on Linux x86. We don't know whether the C compiler will
+            // be Clang or GCC, so just assume Clang on OS X and G++ on Linux.
             if (isOSX)
             {
                 size_t i = 0;
@@ -240,6 +261,18 @@ struct X86TargetABI : TargetABI
                     ++i;
                 }
             }
+
+            for (size_t i = 0; i < fty.args.size(); ++i)
+            {
+                IrFuncTyArg *arg = fty.args[i];
+                if (!arg->byref && isMagicCLong(arg->type))
+                {
+                    arg->rewrite = &integerRewrite;
+                    arg->ltype = integerRewrite.type(arg->type, arg->ltype);
+                    arg->byref = false;
+                    arg->attrs.clear();
+                }
+            }
         }
     }
 };

gen/arrays.cpp

@@ -441,21 +441,28 @@ LLConstant* DtoConstArrayInitializer(ArrayInitializer* arrinit)
     if (global.errors)
         fatal();
 
-    // fill out any null entries still left with default values
-
-    // element default initializer
-    LLConstant* defelem = DtoConstExpInit(arrinit->loc, elemty, elemty->defaultInit(arrinit->loc));
-    bool mismatch2 =  (defelem->getType() != llelemty);
+    // Fill out any null entries still left with default values.
 
+    // Element default initializer. Compute lazily to be able to avoid infinite
+    // recursion for types with members that are default initialized to empty
+    // arrays of themselves.
+    LLConstant* elemDefaultInit = NULL;
     for (size_t i = 0; i < arrlen; i++)
     {
         if (initvals[i] != NULL)
             continue;
 
-        initvals[i] = defelem;
+        if (!elemDefaultInit)
+        {
+            elemDefaultInit = DtoConstExpInit(arrinit->loc, elemty,
+                elemty->defaultInit(arrinit->loc));
+            if (elemDefaultInit->getType() != llelemty)
+            {
+                mismatch = true;
+            }
+        }
 
-        if (mismatch2)
-            mismatch = true;
+        initvals[i] = elemDefaultInit;
     }
 
     LLConstant* constarr;

gen/dibuilder.cpp

@@ -841,9 +841,10 @@ void ldc::DIBuilder::EmitStopPoint(Loc& loc)
     // (line 0), then we can just ignore it (see GitHub issue #998 for why we
     // cannot do this in all cases).
     if (!loc.linnum &&
-          !IR->ir->getCurrentDebugLocation()
-#if LDC_LLVM_VER < 307
-              .isUnknown()
+#if LDC_LLVM_VER >= 307
+          IR->ir->getCurrentDebugLocation()
+#else
+          !IR->ir->getCurrentDebugLocation().isUnknown()
 #endif
         )
         return;

gen/programs.cpp

@@ -70,7 +70,12 @@ static std::string getProgram(const char *name, const cl::opt<std::string> &opt,
 
 std::string getGcc()
 {
+#if defined(__FreeBSD__) && __FreeBSD__ >= 10
+    // Default compiler on FreeBSD 10 is clang
+    return getProgram("clang", gcc, "CC");
+#else
     return getProgram("gcc", gcc, "CC");
+#endif
 }
 
 std::string getArchiver()

runtime/CMakeLists.txt

@@ -13,7 +13,7 @@ set(BUILD_BC_LIBS         OFF                                       CACHE BOOL
 set(INCLUDE_INSTALL_DIR   ${CMAKE_INSTALL_PREFIX}/include/d         CACHE PATH    "Path to install D modules to")
 set(BUILD_SHARED_LIBS     OFF                                       CACHE BOOL    "Whether to build the runtime as a shared library")
 set(D_FLAGS               -w;-d                                     CACHE STRING  "Runtime build flags, separated by ;")
-set(D_FLAGS_DEBUG         -g                                        CACHE STRING  "Runtime build flags (debug libraries), separated by ;")
+set(D_FLAGS_DEBUG         -g;-link-debuglib                         CACHE STRING  "Runtime build flags (debug libraries), separated by ;")
 set(D_FLAGS_RELEASE       -O3;-release                              CACHE STRING  "Runtime build flags (release libraries), separated by ;")
 if(MSVC)
     set(LINK_WITH_MSVCRT  ON                                        CACHE BOOL    "Link with MSVCRT.lib (DLL) instead of LIBCMT.lib (static)")