Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 25ad2a2

Browse files
MartinNowakMartinNowak
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents 9c23698 + 6e5682a commit 25ad2a2

File tree

308 files changed

+9266
-6534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+9266
-6534
lines changed

‎.circleci/run.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,7 @@ publictests()
121121
122122
codecov()
123123
{
124-
# CodeCov gets confused by lst files which it can't matched
125-
rm -rf test/runnable/extra-files
126-
download "https://codecov.io/bash" "https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov" "codecov.sh"
127-
bash codecov.sh
124+
OS_NAME=linux source ../dmd/ci/codecov.sh
128125
}
129126
130127
case $1 in

‎CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ src/core/cpuid.d @WalterBright @ibuclaw @JackStouffer
2222
src/core/demangle.d @WalterBright @MartinNowak @rainers @ibuclaw
2323
src/core/exception.d @MartinNowak @WalterBright @jmdavis @CyberShadow
2424
src/core/internal @MartinNowak @schveiguy
25+
src/core/int128.d @WalterBright
2526
src/core/math.d @ibuclaw @redstar
2627
src/core/runtime.d @MartinNowak @Abscissa
2728
src/core/simd.d @WalterBright @MartinNowak
@@ -34,7 +35,7 @@ src/core/sys/freebsd/* @redstar @MartinNowak @Calrama @jmdavis
3435
src/core/sys/linux/* @Burgos @redstar @MartinNowak
3536
src/core/sys/netbsd/* @nrTQgc @joakim-noah
3637
src/core/sys/dragonflybsd/* @dkgroot
37-
src/core/sys/openbsd/* @redstar
38+
src/core/sys/openbsd/* @redstar @ibara
3839
src/core/sys/posix/* @CyberShadow @MartinNowak @joakim-noah @redstar
3940
src/core/sys/solaris/* @redstar
4041
src/core/sys/windows/* @CyberShadow

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ARCH: x64
2020
x86-OMF:
2121
OS: Win_32
22-
MODEL: 32
22+
MODEL: 32omf
2323
ARCH: x86
2424
steps:
2525
- checkout: self

‎benchmark/gcbench/vdparser.extra/vdc/ast/node.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class NodeAllocData
7474
for(byte* p = beg; p < end && *cast(size_t*)p != 0; p += sz)
7575
{
7676
Node n = cast(Node) p;
77-
sz = n.classinfo.init.length;
77+
sz = typeid(n).initializer.length;
7878
sz = (sz + 15) & ~15;
7979
assert(sz > 0);
8080
clear(n); // calls rt_finalize
@@ -223,7 +223,7 @@ class Node
223223

224224
final Node _cloneShallow()
225225
{
226-
Node n = static_cast!Node(this.classinfo.create());
226+
Node n = static_cast!Node(typeid(this).create());
227227

228228
n.id = id;
229229
n.attr = attr;
@@ -244,7 +244,7 @@ class Node
244244

245245
bool compare(const(Node) n) const
246246
{
247-
if(this.classinfo !is n.classinfo)
247+
if (typeid(this) !is typeid(n))
248248
return false;
249249

250250
if(n.id != id || n.attr != attr || n.annotation != annotation)
@@ -307,7 +307,7 @@ class Node
307307
////////////////////////////////////////////////////////////
308308
abstract void toD(CodeWriter writer)
309309
{
310-
writer(this.classinfo.name);
310+
writer(typeid(this).name);
311311
writer.nl();
312312

313313
auto indent = CodeIndenter(writer);

‎benchmark/gcbench/vdparser.extra/vdc/ast/type.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ class TypeIndirection : Type
753753
return true;
754754

755755
Type nextThis = getNextType();
756-
if(this.classinfo != from.classinfo)
756+
if (typeid(this) != typeid(from))
757757
return false;
758758
auto ifrom = static_cast!TypeIndirection(from);
759759
_assert(ifrom !is null);
@@ -906,7 +906,7 @@ class TypeDynamicArray : TypeIndirection
906906
if(super.convertableFrom(from, flags))
907907
return true;
908908

909-
if(from.classinfo == typeid(TypeStaticArray))
909+
if (typeid(from) is typeid(TypeStaticArray))
910910
{
911911
Type nextThis = getNextType();
912912
auto arrfrom = static_cast!TypeStaticArray(from);

‎benchmark/gcbench/vdparser.extra/vdc/interpret.d

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ class Value
229229
version(none)
230230
Value opassign(string op)(Value v)
231231
{
232-
TypeInfo ti1 = this.classinfo;
233-
TypeInfo ti2 = v.classinfo;
232+
TypeInfo ti1 = typeid(this);
233+
TypeInfo ti2 = typeid(v);
234234
foreach(iv1; BasicTypeValues)
235235
{
236236
if(ti1 is typeid(iv1))
@@ -260,8 +260,8 @@ class Value
260260
version(none)
261261
Value opBinOp(string op)(Value v)
262262
{
263-
TypeInfo ti1 = this.classinfo;
264-
TypeInfo ti2 = v.classinfo;
263+
TypeInfo ti1 = typeid(this);
264+
TypeInfo ti2 = typeid(v);
265265
foreach(iv1; BasicTypeValues)
266266
{
267267
if(ti1 is typeid(iv1))
@@ -298,7 +298,7 @@ class Value
298298
version(none)
299299
Value opUnOp(string op)()
300300
{
301-
TypeInfo ti1 = this.classinfo;
301+
TypeInfo ti1 = typeid(this);
302302
foreach(iv1; BasicTypeValues)
303303
{
304304
if(ti1 is typeid(iv1))
@@ -338,7 +338,7 @@ class Value
338338
{
339339
Value binOp(Value v)
340340
{
341-
TypeInfo ti = v.classinfo;
341+
TypeInfo ti = typeid(v);
342342
foreach(iv2; Types)
343343
{
344344
if(ti is typeid(iv2))
@@ -374,7 +374,7 @@ class Value
374374
if(!mutable)
375375
return semanticErrorValue(this, " value is not mutable");
376376

377-
TypeInfo ti = v.classinfo;
377+
TypeInfo ti = typeid(v);
378378
foreach(iv2; Types)
379379
{
380380
if(ti is typeid(iv2))
@@ -610,7 +610,7 @@ class ValueT(T) : Value
610610
if(!mutable) // doCast changes this value
611611
return semanticErrorValue(this, " value is not mutable");
612612

613-
TypeInfo ti = v.classinfo;
613+
TypeInfo ti = typeid(v);
614614
foreach(iv2; RHS_BasicTypeValues)
615615
{
616616
if(ti is typeid(iv2))

‎benchmark/gcbench/vdparser.extra/vdc/logger.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ version(enableLog) {
8181
if(gLogFile.length == 0)
8282
OutputDebugStringA(toStringz(s));
8383
else
84-
synchronized(logSync.classinfo)
84+
synchronized(typeid(logSync))
8585
{
8686
if(gLogFirst)
8787
{

‎changelog/openbsd_ioctls.dd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Add support for OpenBSD ioctls
2+
3+
Support OpenBSD ioctls as found in OpenBSD's $(LINK2 https://github.com/openbsd/src/blob/master/sys/sys/filio.h, /usr/include/sys/filio.h), $(LINK2 https://github.com/openbsd/src/blob/master/sys/sys/ioccom.h, /usr/include/sys/ioccom.h), $(LINK2 https://github.com/openbsd/src/blob/master/sys/sys/ioctl.h, /usr/include/sys/ioctl.h), and $(LINK2 https://github.com/openbsd/src/blob/master/sys/sys/ttycom.h, /usr/include/sys/ttycom.h).

‎changelog/safe_opequals.dd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Add support for `@safe` class `opEquals`
2+
3+
`object.opEquals` is now `@safe` if the static types being compared provide an `opEquals` method that is also `@safe`.

‎mak/COPY

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
COPY=\
22
$(IMPDIR)\object.d \
3+
$(IMPDIR)\__builtins.di \
4+
$(IMPDIR)\importc.h \
35
\
46
$(IMPDIR)\core\gc\config.d \
57
$(IMPDIR)\core\gc\gcinterface.d \
@@ -214,6 +216,7 @@ COPY=\
214216
$(IMPDIR)\core\sys\linux\ifaddrs.d \
215217
$(IMPDIR)\core\sys\linux\io_uring.d \
216218
$(IMPDIR)\core\sys\linux\link.d \
219+
$(IMPDIR)\core\sys\linux\perf_event.d \
217220
$(IMPDIR)\core\sys\linux\sched.d \
218221
$(IMPDIR)\core\sys\linux\stdio.d \
219222
$(IMPDIR)\core\sys\linux\string.d \
@@ -257,10 +260,12 @@ COPY=\
257260
\
258261
$(IMPDIR)\core\sys\openbsd\dlfcn.d \
259262
$(IMPDIR)\core\sys\openbsd\err.d \
263+
$(IMPDIR)\core\sys\openbsd\execinfo.d \
260264
$(IMPDIR)\core\sys\openbsd\pthread_np.d \
261265
$(IMPDIR)\core\sys\openbsd\stdlib.d \
262266
$(IMPDIR)\core\sys\openbsd\string.d \
263267
$(IMPDIR)\core\sys\openbsd\time.d \
268+
$(IMPDIR)\core\sys\openbsd\unistd.d \
264269
\
265270
$(IMPDIR)\core\sys\openbsd\sys\cdefs.d \
266271
$(IMPDIR)\core\sys\openbsd\sys\elf.d \

0 commit comments

Comments
 (0)