diff --git a/compiler/src/dmd/backend/drtlsym.d b/compiler/src/dmd/backend/drtlsym.d index fae0871423..b252a7fa27 100644 --- a/compiler/src/dmd/backend/drtlsym.d +++ b/compiler/src/dmd/backend/drtlsym.d @@ -103,13 +103,7 @@ Symbol* getRtlsym(RTLSYM i) @trusted case RTLSYM.MEMSETDOUBLE: symbolz(ps,FL.func,FREGSAVED,"_memsetDouble", 0, t); break; case RTLSYM.MEMSETSIMD: symbolz(ps,FL.func,FREGSAVED,"_memsetSIMD",0, t); break; case RTLSYM.MEMSETN: symbolz(ps,FL.func,FREGSAVED,"_memsetn", 0, t); break; - case RTLSYM.NEWCLASS: symbolz(ps,FL.func,FREGSAVED,"_d_newclass", 0, t); break; case RTLSYM.NEWTHROW: symbolz(ps,FL.func,FREGSAVED,"_d_newThrowable", 0, t); break; - case RTLSYM.NEWARRAYT: symbolz(ps,FL.func,FREGSAVED,"_d_newarrayT", 0, t); break; - case RTLSYM.NEWARRAYIT: symbolz(ps,FL.func,FREGSAVED,"_d_newarrayiT", 0, t); break; - case RTLSYM.NEWITEMT: symbolz(ps,FL.func,FREGSAVED,"_d_newitemT", 0, t); break; - case RTLSYM.NEWITEMIT: symbolz(ps,FL.func,FREGSAVED,"_d_newitemiT", 0, t); break; - case RTLSYM.NEWARRAYMITX: symbolz(ps,FL.func,FREGSAVED,"_d_newarraymiTX", 0, t); break; case RTLSYM.ARRAYLITERALTX: symbolz(ps,FL.func,FREGSAVED,"_d_arrayliteralTX", 0, t); break; case RTLSYM.ASSOCARRAYLITERALTX: symbolz(ps,FL.func,FREGSAVED,"_d_assocarrayliteralTX", 0, t); break; case RTLSYM.CALLFINALIZER: symbolz(ps,FL.func,FREGSAVED,"_d_callfinalizer", 0, t); break; @@ -120,18 +114,13 @@ Symbol* getRtlsym(RTLSYM i) @trusted case RTLSYM.CLASS_CAST: symbolz(ps,FL.func,FREGSAVED,"_d_class_cast", 0, t); break; case RTLSYM.INTERFACE_CAST: symbolz(ps,FL.func,FREGSAVED,"_d_interface_cast", 0, t); break; case RTLSYM.ARRAYCATT: symbolz(ps,FL.func,FREGSAVED,"_d_arraycatT", 0, t); break; - case RTLSYM.ARRAYCATNTX: symbolz(ps,FL.func,FREGSAVED,"_d_arraycatnTX", 0, t); break; - case RTLSYM.ARRAYAPPENDT: symbolz(ps,FL.func,FREGSAVED,"_d_arrayappendT", 0, t); break; - case RTLSYM.ARRAYAPPENDCTX: symbolz(ps,FL.func,FREGSAVED,"_d_arrayappendcTX", 0, t); break; case RTLSYM.ARRAYAPPENDCD: symbolz(ps,FL.func,FREGSAVED,"_d_arrayappendcd", 0, t); break; case RTLSYM.ARRAYAPPENDWD: symbolz(ps,FL.func,FREGSAVED,"_d_arrayappendwd", 0, t); break; case RTLSYM.ARRAYSETLENGTHT: symbolz(ps,FL.func,FREGSAVED,"_d_arraysetlengthT", 0, t); break; case RTLSYM.ARRAYSETLENGTHIT: symbolz(ps,FL.func,FREGSAVED,"_d_arraysetlengthiT", 0, t); break; case RTLSYM.ARRAYCOPY: symbolz(ps,FL.func,FREGSAVED,"_d_arraycopy", 0, t); break; - case RTLSYM.ARRAYASSIGN: symbolz(ps,FL.func,FREGSAVED,"_d_arrayassign", 0, t); break; case RTLSYM.ARRAYASSIGN_R: symbolz(ps,FL.func,FREGSAVED,"_d_arrayassign_r", 0, t); break; case RTLSYM.ARRAYASSIGN_L: symbolz(ps,FL.func,FREGSAVED,"_d_arrayassign_l", 0, t); break; - case RTLSYM.ARRAYSETASSIGN: symbolz(ps,FL.func,FREGSAVED,"_d_arraysetassign", 0, t); break; case RTLSYM.ARRAYEQ2: symbolz(ps,FL.func,FREGSAVED,"_adEq2", 0, t); break; /* Associative Arrays https://github.com/dlang/dmd/blob/master/druntime/src/rt/aaA.d */ @@ -173,21 +162,11 @@ Symbol* getRtlsym(RTLSYM i) @trusted case RTLSYM.TRACE_EPI_N: symbolz(ps,FL.func,ALLREGS|mBP|mES,"_trace_epi_n",0,tstrace); break; case RTLSYM.TRACE_EPI_F: symbolz(ps,FL.func,ALLREGS|mBP|mES,"_trace_epi_f",0,tstrace); break; - case RTLSYM.TRACENEWCLASS: symbolz(ps,FL.func,FREGSAVED,"_d_newclassTrace", 0, t); break; - case RTLSYM.TRACENEWARRAYT: symbolz(ps,FL.func,FREGSAVED,"_d_newarrayTTrace", 0, t); break; - case RTLSYM.TRACENEWARRAYIT: symbolz(ps,FL.func,FREGSAVED,"_d_newarrayiTTrace", 0, t); break; - case RTLSYM.TRACENEWARRAYMTX: symbolz(ps,FL.func,FREGSAVED,"_d_newarraymTXTrace", 0, t); break; - case RTLSYM.TRACENEWARRAYMITX: symbolz(ps,FL.func,FREGSAVED,"_d_newarraymiTXTrace", 0, t); break; - case RTLSYM.TRACENEWITEMT: symbolz(ps,FL.func,FREGSAVED,"_d_newitemTTrace", 0, t); break; - case RTLSYM.TRACENEWITEMIT: symbolz(ps,FL.func,FREGSAVED,"_d_newitemiTTrace", 0, t); break; + case RTLSYM.TRACECALLFINALIZER: symbolz(ps,FL.func,FREGSAVED,"_d_callfinalizerTrace", 0, t); break; case RTLSYM.TRACECALLINTERFACEFINALIZER: symbolz(ps,FL.func,FREGSAVED,"_d_callinterfacefinalizerTrace", 0, t); break; case RTLSYM.TRACEARRAYLITERALTX: symbolz(ps,FL.func,FREGSAVED,"_d_arrayliteralTXTrace", 0, t); break; case RTLSYM.TRACEASSOCARRAYLITERALTX: symbolz(ps,FL.func,FREGSAVED,"_d_assocarrayliteralTXTrace", 0, t); break; - case RTLSYM.TRACEARRAYCATT: symbolz(ps,FL.func,FREGSAVED,"_d_arraycatTTrace", 0, t); break; - case RTLSYM.TRACEARRAYCATNTX: symbolz(ps,FL.func,FREGSAVED,"_d_arraycatnTXTrace", 0, t); break; - case RTLSYM.TRACEARRAYAPPENDT: symbolz(ps,FL.func,FREGSAVED,"_d_arrayappendTTrace", 0, t); break; - case RTLSYM.TRACEARRAYAPPENDCTX: symbolz(ps,FL.func,FREGSAVED,"_d_arrayappendcTXTrace", 0, t); break; case RTLSYM.TRACEARRAYAPPENDCD: symbolz(ps,FL.func,FREGSAVED,"_d_arrayappendcdTrace", 0, t); break; case RTLSYM.TRACEARRAYAPPENDWD: symbolz(ps,FL.func,FREGSAVED,"_d_arrayappendwdTrace", 0, t); break; case RTLSYM.TRACEARRAYSETLENGTHT: symbolz(ps,FL.func,FREGSAVED,"_d_arraysetlengthTTrace", 0, t); break; diff --git a/compiler/src/dmd/backend/rtlsym.d b/compiler/src/dmd/backend/rtlsym.d index e1be6b647e..84fa605a82 100644 --- a/compiler/src/dmd/backend/rtlsym.d +++ b/compiler/src/dmd/backend/rtlsym.d @@ -47,14 +47,8 @@ enum RTLSYM MEMSETDOUBLE, MEMSETSIMD, MEMSETN, - NEWCLASS, NEWTHROW, - NEWARRAYT, - NEWARRAYIT, - NEWITEMT, - NEWITEMIT, - NEWARRAYMTX, - NEWARRAYMITX, + ARRAYLITERALTX, ASSOCARRAYLITERALTX, CALLFINALIZER, @@ -65,18 +59,13 @@ enum RTLSYM CLASS_CAST, INTERFACE_CAST, ARRAYCATT, - ARRAYCATNTX, - ARRAYAPPENDT, - ARRAYAPPENDCTX, ARRAYAPPENDCD, ARRAYAPPENDWD, ARRAYSETLENGTHT, ARRAYSETLENGTHIT, ARRAYCOPY, - ARRAYASSIGN, ARRAYASSIGN_R, ARRAYASSIGN_L, - ARRAYSETASSIGN, ARRAYEQ2, AANEW, AAEQUAL, @@ -116,21 +105,11 @@ enum RTLSYM TRACE_EPI_N, TRACE_EPI_F, - TRACENEWCLASS, - TRACENEWARRAYT, - TRACENEWARRAYIT, - TRACENEWARRAYMTX, - TRACENEWARRAYMITX, - TRACENEWITEMT, - TRACENEWITEMIT, + TRACECALLFINALIZER, TRACECALLINTERFACEFINALIZER, TRACEARRAYLITERALTX, TRACEASSOCARRAYLITERALTX, - TRACEARRAYCATT, - TRACEARRAYCATNTX, - TRACEARRAYAPPENDT, - TRACEARRAYAPPENDCTX, TRACEARRAYAPPENDCD, TRACEARRAYAPPENDWD, TRACEARRAYSETLENGTHT, diff --git a/compiler/src/dmd/e2ir.d b/compiler/src/dmd/e2ir.d index e570dd72ba..9cc7e7ef5a 100644 --- a/compiler/src/dmd/e2ir.d +++ b/compiler/src/dmd/e2ir.d @@ -326,12 +326,6 @@ void toTraceGC(ref IRState irs, elem* e, Loc loc) { static immutable RTLSYM[2][25] map = [ - [ RTLSYM.NEWCLASS, RTLSYM.TRACENEWCLASS ], - [ RTLSYM.NEWITEMT, RTLSYM.TRACENEWITEMT ], - [ RTLSYM.NEWITEMIT, RTLSYM.TRACENEWITEMIT ], - [ RTLSYM.NEWARRAYT, RTLSYM.TRACENEWARRAYT ], - [ RTLSYM.NEWARRAYIT, RTLSYM.TRACENEWARRAYIT ], - [ RTLSYM.NEWARRAYMITX, RTLSYM.TRACENEWARRAYMITX ], [ RTLSYM.CALLFINALIZER, RTLSYM.TRACECALLFINALIZER ], [ RTLSYM.CALLINTERFACEFINALIZER, RTLSYM.TRACECALLINTERFACEFINALIZER ], @@ -339,13 +333,10 @@ void toTraceGC(ref IRState irs, elem* e, Loc loc) [ RTLSYM.ARRAYLITERALTX, RTLSYM.TRACEARRAYLITERALTX ], [ RTLSYM.ASSOCARRAYLITERALTX, RTLSYM.TRACEASSOCARRAYLITERALTX ], - [ RTLSYM.ARRAYCATT, RTLSYM.TRACEARRAYCATT ], - [ RTLSYM.ARRAYCATNTX, RTLSYM.TRACEARRAYCATNTX ], [ RTLSYM.ARRAYAPPENDCD, RTLSYM.TRACEARRAYAPPENDCD ], [ RTLSYM.ARRAYAPPENDWD, RTLSYM.TRACEARRAYAPPENDWD ], - [ RTLSYM.ARRAYAPPENDT, RTLSYM.TRACEARRAYAPPENDT ], - [ RTLSYM.ARRAYAPPENDCTX, RTLSYM.TRACEARRAYAPPENDCTX ], + [ RTLSYM.ARRAYSETLENGTHT, RTLSYM.TRACEARRAYSETLENGTHT ], [ RTLSYM.ARRAYSETLENGTHIT, RTLSYM.TRACEARRAYSETLENGTHIT ],