Merge branch 'master' into release-0.16.0

Author: redstar

appveyor.yml

@@ -108,6 +108,7 @@ after_build:
             ninja install > $null
             copy bin\ldc2.pdb ..\ldc-x64\bin
             cd ..\ldc-x64
+            (gc etc\ldc2.conf).replace('c:/projects/ldc-x64/', '%%ldcbinarypath%%/../') | sc etc\ldc2.conf
             $artifactFilename = "LDC-Win64-master-$Env:APPVEYOR_BUILD_NUMBER.7z"
             7z a "..\$artifactFilename" * > $null
             cd ..

driver/cl_options.cpp

@@ -435,9 +435,18 @@ cl::opt<unsigned, true> nestedTemplateDepth("template-depth",
     cl::location(global.params.nestedTmpl),
     cl::init(500));
 
+#if LDC_LLVM_VER < 307
 cl::opt<bool, true, FlagParser<bool> > color("color",
     cl::desc("Force colored console output"),
     cl::location(global.params.color));
+#else
+void CreateColorOption()
+{
+    new cl::opt<bool, true, FlagParser<bool> >("color",
+    cl::desc("Force colored console output"),
+    cl::location(global.params.color));
+}
+#endif
 
 cl::opt<bool, true> useDIP25("dip25",
     cl::desc("implement http://wiki.dlang.org/DIP25 (experimental)"),

driver/cl_options.h

@@ -85,5 +85,9 @@ namespace opts {
     // Arguments to -d-debug
     extern std::vector<std::string> debugArgs;
     // Arguments to -run
+
+#if LDC_LLVM_VER >= 307
+    void CreateColorOption();
+#endif
 }
 #endif

driver/configfile.cpp

@@ -224,16 +224,18 @@ bool ConfigFile::read(const char* explicitConfFile)
     // handle switches
     if (config_setting_t *sw = config_setting_get_member(root, "switches"))
     {
+        // replace all %%ldcbinarypath%% occurrences by the path to the
+        // LDC bin directory (using forward slashes)
         std::string binpathkey = "%%ldcbinarypath%%";
 
         std::string binpath = exe_path::getBinDir();
+        std::replace(binpath.begin(), binpath.end(), '\\', '/');
 
         int len = config_setting_length(sw);
         for (int i = 0; i < len; i++)
         {
             std::string v(config_setting_get_string(config_setting_get_elem(sw, i)));
 
-            // replace binpathkey with binpath
             size_t p;
             while (std::string::npos != (p = v.find(binpathkey)))
                 v.replace(p, binpathkey.size(), binpath);

driver/main.cpp

@@ -174,6 +174,17 @@ static void hide(llvm::StringMap<cl::Option *>& map, const char* name) {
         map[name]->setHiddenFlag(cl::Hidden);
 }
 
+static void rename(llvm::StringMap<cl::Option *>& map, const char* from, const char *to) {
+    llvm::StringMap<cl::Option*>::iterator i = map.find(from);
+    if (i != map.end())
+    {
+        cl::Option *opt = i->getValue();
+        map.erase(i);
+        opt->setArgStr(to);
+        map[to] = opt;
+    }
+}
+
 /// Removes command line options exposed from within LLVM that are unlikely
 /// to be useful for end users from the -help output.
 static void hideLLVMOptions() {
@@ -242,6 +253,14 @@ static void hideLLVMOptions() {
     // line has been parsed).
     hide(map, "fdata-sections");
     hide(map, "ffunction-sections");
+
+#if LDC_LLVM_VER >= 307
+    // LLVM 3.7 introduces compiling as shared library. The result
+    // is a clash in the command line options.
+    rename(map, "color", "llvm-color");
+    hide(map, "llvm-color");
+    opts::CreateColorOption();
+#endif
 }
 #endif
 

gen/abi-win64.cpp

@@ -40,6 +40,8 @@ struct Win64TargetABI : TargetABI
 
     bool passByVal(Type* t);
 
+    bool passThisBeforeSret(TypeFunction* tf);
+
     void rewriteFunctionType(TypeFunction* tf, IrFuncTy &fty);
 
     void rewriteArgument(IrFuncTy& fty, IrFuncTyArg& arg);
@@ -117,6 +119,11 @@ bool Win64TargetABI::passByVal(Type* t)
     return false;
 }
 
+bool Win64TargetABI::passThisBeforeSret(TypeFunction* tf)
+{
+    return tf->linkage == LINKcpp;
+}
+
 void Win64TargetABI::rewriteFunctionType(TypeFunction* tf, IrFuncTy &fty)
 {
     // RETURN VALUE

gen/abi.h

@@ -106,6 +106,9 @@ struct TargetABI
     /// Returns true if the type is passed by value
     virtual bool passByVal(Type* t) = 0;
 
+    // Returns true if the 'this' argument is to be passed before the 'sret' argument.
+    virtual bool passThisBeforeSret(TypeFunction* tf) { return false; }
+
     /// Called to give ABI the chance to rewrite the types
     virtual void rewriteFunctionType(TypeFunction* t, IrFuncTy& fty) = 0;
     virtual void rewriteVarargs(IrFuncTy& fty, std::vector<IrFuncTyArg*>& args);

gen/functions.cpp

@@ -196,6 +196,9 @@ llvm::FunctionType* DtoFunctionType(Type* type, IrFuncTy &irFty, Type* thistype,
     if (irFty.arg_nest) argtypes.push_back(irFty.arg_nest->ltype);
     if (irFty.arg_arguments) argtypes.push_back(irFty.arg_arguments->ltype);
 
+    if (irFty.arg_sret && irFty.arg_this && abi->passThisBeforeSret(f))
+        std::swap(argtypes[0], argtypes[1]);
+
     const size_t firstExplicitArg = argtypes.size();
     const size_t numExplicitLLArgs = irFty.args.size();
     for (size_t i = 0; i < numExplicitLLArgs; i++)
@@ -405,8 +408,18 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati
     }
 
     ADD_PA(ret)
-    ADD_PA(arg_sret)
-    ADD_PA(arg_this)
+
+    if (irFty.arg_sret && irFty.arg_this && gABI->passThisBeforeSret(f))
+    {
+        ADD_PA(arg_this)
+        ADD_PA(arg_sret)
+    }
+    else
+    {
+        ADD_PA(arg_sret)
+        ADD_PA(arg_this)
+    }
+
     ADD_PA(arg_nest)
     ADD_PA(arg_arguments)
 
@@ -537,7 +550,9 @@ void DtoDeclareFunction(FuncDeclaration* fdecl)
     // name parameters
     llvm::Function::arg_iterator iarg = func->arg_begin();
 
-    if (irFty.arg_sret) {
+    const bool passThisBeforeSret = irFty.arg_sret && irFty.arg_this && gABI->passThisBeforeSret(f);
+
+    if (irFty.arg_sret && !passThisBeforeSret) {
         iarg->setName(".sret_arg");
         irFunc->retArg = iarg;
         ++iarg;
@@ -569,6 +584,12 @@ void DtoDeclareFunction(FuncDeclaration* fdecl)
         ++iarg;
     }
 
+    if (passThisBeforeSret) {
+        iarg->setName(".sret_arg");
+        irFunc->retArg = iarg;
+        ++iarg;
+    }
+
     if (irFty.arg_arguments) {
         iarg->setName("._arguments");
         irFunc->_arguments = iarg;