diff options
| author | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-06-16 07:50:07 +0000 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-06-16 07:50:07 +0000 |
| commit | e5d0ba591e28d8be1fb5775fb0418fee04af17d7 (patch) | |
| tree | 2e9f2bbf419a978098a1a9c4cb3305fd4a402a89 /libphobos | |
| parent | 9bf706aae20a891885780c9d419addd5d0bc510d (diff) | |
d/dmd: Merge upstream dmd f8e38c001
Fixes bug where foreach(int) doesn't work on BigEndian targets by
deprecating the use of index types smaller than a size_t/ptrdiff_t.
Reviewed-on: https://github.com/dlang/dmd/pull/10009
From-SVN: r272350
Diffstat (limited to 'libphobos')
| -rw-r--r-- | libphobos/libdruntime/MERGE | 2 | ||||
| -rw-r--r-- | libphobos/libdruntime/rt/minfo.d | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libphobos/libdruntime/MERGE b/libphobos/libdruntime/MERGE index dec75f7cb33..a142195c62f 100644 --- a/libphobos/libdruntime/MERGE +++ b/libphobos/libdruntime/MERGE @@ -1,4 +1,4 @@ -aab44549221cb29434fe2feccaf1174af54dd79d +cb1583b4b7313bb6d79a5102b6c91e71f5181b19 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/minfo.d b/libphobos/libdruntime/rt/minfo.d index 548bcc71c60..47228663562 100644 --- a/libphobos/libdruntime/rt/minfo.d +++ b/libphobos/libdruntime/rt/minfo.d @@ -125,7 +125,7 @@ struct ModuleGroup break; distloop: // search for next (previous) module in cycle. - foreach (int m, d; distance) + foreach (m, d; distance) { if (d == curdist) { @@ -470,7 +470,7 @@ struct ModuleGroup // pre-allocate enough space to hold all modules. ctors = (cast(immutable(ModuleInfo)**).malloc(len * (void*).sizeof)); ctoridx = 0; - foreach (int idx, m; _modules) + foreach (idx, m; _modules) { if (m.flags & relevantFlags) { @@ -582,8 +582,8 @@ struct ModuleGroup } // initialize the initial edges - foreach (int i, ref v; initialEdges) - v = i; + foreach (i, ref v; initialEdges) + v = cast(int)i; bool sort(ref immutable(ModuleInfo)*[] ctors, uint mask) { |