aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/d/d-lang.cc2
-rw-r--r--gcc/testsuite/gdc.dg/asm1.d8
-rw-r--r--gcc/testsuite/gdc.dg/compilable.d2
-rw-r--r--gcc/testsuite/gdc.dg/lto/ltotests_0.d2
-rw-r--r--gcc/testsuite/gdc.dg/runnable.d2
-rw-r--r--libphobos/libdruntime/MERGE2
-rw-r--r--libphobos/libdruntime/rt/util/utf.d4
-rw-r--r--libphobos/src/MERGE2
-rw-r--r--libphobos/src/std/range/package.d2
-rw-r--r--libphobos/testsuite/libphobos.typeinfo/struct-align.d2
10 files changed, 14 insertions, 14 deletions
diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc
index 82e24de..24a1125 100644
--- a/gcc/d/d-lang.cc
+++ b/gcc/d/d-lang.cc
@@ -306,7 +306,7 @@ d_init_options (unsigned int, cl_decoded_option *decoded_options)
global.params.cplusplus = CppStdRevisionCpp14;
/* Warnings and deprecations are disabled by default. */
- global.params.useDeprecated = DIAGNOSTICoff;
+ global.params.useDeprecated = DIAGNOSTICinform;
global.params.warnings = DIAGNOSTICoff;
global.params.imppath = new Strings ();
diff --git a/gcc/testsuite/gdc.dg/asm1.d b/gcc/testsuite/gdc.dg/asm1.d
index 3fcfd6a..dce3676 100644
--- a/gcc/testsuite/gdc.dg/asm1.d
+++ b/gcc/testsuite/gdc.dg/asm1.d
@@ -13,8 +13,8 @@ void parse2()
{
asm
{
- "" : : "g" 1 ? 2 : 3;
- "" : : "g" 1 ? 2 : : 3;
+ "" : : "g" (1 ? 2 : 3);
+ "" : : "g" (1 ? 2 : :) 3;
// { dg-error "expression expected, not ':'" "" { target *-*-* } .-1 }
// { dg-error "expected constant string constraint for operand" "" { target *-*-* } .-2 }
}
@@ -58,7 +58,7 @@ void semantic1()
void semantic2a(X...)(X expr)
{
alias X[0] var1;
- asm { "%0" : "=m" var1; } // { dg-error "double 'double' is a type, not an lvalue" }
+ asm { "%0" : "=m" (var1); } // { dg-error "double 'double' is a type, not an lvalue" }
}
void semantic2()
@@ -86,6 +86,6 @@ void semantic4()
{
asm
{
- "%0" : : "m" S4.foo; // { dg-error "template instance opDispatch!\"foo\" has no value" }
+ "%0" : : "m" (S4.foo); // { dg-error "template instance opDispatch!\"foo\" has no value" }
}
}
diff --git a/gcc/testsuite/gdc.dg/compilable.d b/gcc/testsuite/gdc.dg/compilable.d
index 92a1875..3f92f9b 100644
--- a/gcc/testsuite/gdc.dg/compilable.d
+++ b/gcc/testsuite/gdc.dg/compilable.d
@@ -250,7 +250,7 @@ class C204 : I204
// https://bugzilla.gdcproject.org/show_bug.cgi?id=241
import imports.gdc241a;
-import imports.gdc241b : S241, C241, E241, N241;
+public import imports.gdc241b : S241, C241, E241, N241;
/******************************************/
// https://bugzilla.gdcproject.org/show_bug.cgi?id=242
diff --git a/gcc/testsuite/gdc.dg/lto/ltotests_0.d b/gcc/testsuite/gdc.dg/lto/ltotests_0.d
index bb18bea..91737609 100644
--- a/gcc/testsuite/gdc.dg/lto/ltotests_0.d
+++ b/gcc/testsuite/gdc.dg/lto/ltotests_0.d
@@ -46,7 +46,7 @@ struct S61b
{
try
other.a();
- catch
+ catch (Throwable)
other.b();
}
}
diff --git a/gcc/testsuite/gdc.dg/runnable.d b/gcc/testsuite/gdc.dg/runnable.d
index 7307e09..d974bda 100644
--- a/gcc/testsuite/gdc.dg/runnable.d
+++ b/gcc/testsuite/gdc.dg/runnable.d
@@ -243,7 +243,7 @@ void test36b()(char val)
auto test36c_1()
{
int a;
- void c() {};
+ void c() {}
class Result
{
int b;
diff --git a/libphobos/libdruntime/MERGE b/libphobos/libdruntime/MERGE
index 5e3bf3b..bcde105 100644
--- a/libphobos/libdruntime/MERGE
+++ b/libphobos/libdruntime/MERGE
@@ -1,4 +1,4 @@
-5cc061a8733731d5b40334c0eb7a927b6d6241ce
+d05ebaad15fbffce6d707c138c84d7b60fcf5ffd
The first line of this file holds the git revision number of the last
merge done from the dlang/druntime repository.
diff --git a/libphobos/libdruntime/rt/util/utf.d b/libphobos/libdruntime/rt/util/utf.d
index 0775840..55869b3 100644
--- a/libphobos/libdruntime/rt/util/utf.d
+++ b/libphobos/libdruntime/rt/util/utf.d
@@ -651,9 +651,9 @@ string toUTF8(in wchar[] s)
else
{
r.length = i;
- foreach (dchar c; s[i .. slen])
+ foreach (dchar ch; s[i .. slen])
{
- encode(r, c);
+ encode(r, ch);
}
break;
}
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE
index 5900ca7..1562f74 100644
--- a/libphobos/src/MERGE
+++ b/libphobos/src/MERGE
@@ -1,4 +1,4 @@
-64ed4684fa2a0f2401f5b6df34f6dcb4c3973945
+021ae0df76727a32809a29887095ab7093489ea3
The first line of this file holds the git revision number of the last
merge done from the dlang/phobos repository.
diff --git a/libphobos/src/std/range/package.d b/libphobos/src/std/range/package.d
index fe581f3..13601cb 100644
--- a/libphobos/src/std/range/package.d
+++ b/libphobos/src/std/range/package.d
@@ -4874,7 +4874,7 @@ if (allSatisfy!(isInputRange, Ranges))
// Just make sure 1-range case instantiates. This hangs the compiler
// when no explicit stopping policy is specified due to Bug 4652.
auto stuff = lockstep([1,2,3,4,5], StoppingPolicy.shortest);
- foreach (int i, a; stuff)
+ foreach (i, a; stuff)
{
assert(stuff[i] == a);
}
diff --git a/libphobos/testsuite/libphobos.typeinfo/struct-align.d b/libphobos/testsuite/libphobos.typeinfo/struct-align.d
index 7286651..54eaaa6 100644
--- a/libphobos/testsuite/libphobos.typeinfo/struct-align.d
+++ b/libphobos/testsuite/libphobos.typeinfo/struct-align.d
@@ -2,7 +2,7 @@ module structalign;
void main ()
{
- struct K { int *a; };
+ struct K { int *a; }
K k;
auto ti = typeid (k);