Merged dmd 2.059beta

gen/cl_helpers.cpp

@@ -1,5 +1,6 @@
 #include "gen/cl_helpers.h"
 
+#include "mars.h"
 #include "root.h"
 #include "rmem.h"
 

gen/optimizer.cpp

@@ -12,7 +12,7 @@
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/Transforms/IPO.h"
 
-#include "root.h"       // error()
+#include "mars.h"       // error()
 #include <cstring>      // strcmp();
 
 using namespace llvm;

gen/pragma.cpp

@@ -379,6 +379,6 @@ void DtoCheckPragma(PragmaDeclaration *decl, Dsymbol *s,
         break;
 
     default:
-        warning("the LDC specific pragma '%s' is not yet implemented, ignoring", ident->toChars());
+        warning(Loc(), "the LDC specific pragma '%s' is not yet implemented, ignoring", ident->toChars());
     }
 }

gen/tocall.cpp

@@ -72,7 +72,7 @@ DValue* DtoVaArg(Loc& loc, Type* type, Expression* valistArg)
         llt = getPtrToType(llt);
     // issue a warning for broken va_arg instruction.
     if (global.params.cpu != ARCHx86)
-        warning("%s: va_arg for C variadic functions is probably broken for anything but x86", loc.toChars());
+        warning(Loc(), "%s: va_arg for C variadic functions is probably broken for anything but x86", loc.toChars());
     // done
     return new DImValue(type, gIR->ir->CreateVAArg(expelem->getLVal(), llt, "tmp"));
 }