Skip to content

Commit 09864e4

Browse files
dkorpelDennis Korpel
dkorpel
and
Dennis Korpel
authored
backend: Remove void initialization from code vars (dlang#21206)
Co-authored-by: Dennis Korpel <dennis@sarc.nl>
1 parent 5fdf5f3 commit 09864e4

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

‎compiler/src/dmd/backend/arm/cod2.d‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ void getoffset(ref CGstate cg, ref CodeBuilder cdb,elem* e,reg_t reg)
13751375
{
13761376
enum log = false;
13771377
if (log) printf("getoffset(e = %p, reg = %s)\n", e, regm_str(mask(reg)));
1378-
code cs = void;
1378+
code cs;
13791379
cs.Iflags = 0;
13801380
ubyte rex = 0;
13811381
cs.Irex = rex;
@@ -1417,7 +1417,7 @@ static if (0)
14171417
* LEA DI,s@TLSGD[RIP]
14181418
*/
14191419
//assert(reg == DI);
1420-
code css = void;
1420+
code css;
14211421
css.Irex = REX | REX_W;
14221422
css.Iop = LEA;
14231423
css.Irm = modregrm(0,reg,5);
@@ -1436,7 +1436,7 @@ static if (0)
14361436
*/
14371437
assert(reg == AX);
14381438
load_localgot(cdb);
1439-
code css = void;
1439+
code css;
14401440
css.Iflags = 0;
14411441
css.Iop = LEA; // LEA
14421442
css.Irex = 0;
@@ -1466,7 +1466,7 @@ static if (0)
14661466
stack = 1;
14671467
}
14681468

1469-
code css = void;
1469+
code css;
14701470
css.Irex = rex;
14711471
css.Iop = 0x8B;
14721472
css.Irm = modregrm(0, 0, BPRM);

‎compiler/src/dmd/backend/x86/cg87.d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3806,7 +3806,7 @@ void cload87(ref CodeBuilder cdb, elem* e, ref regm_t outretregs)
38063806
}
38073807

38083808
tym_t ty = tybasic(e.Ety);
3809-
code cs = void;
3809+
code cs;
38103810
uint mf;
38113811
uint sz;
38123812
ubyte ldop;

‎compiler/src/dmd/backend/x86/cgxmm.d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ void cloadxmm(ref CodeBuilder cdb, elem* e, ref regm_t pretregs)
19201920
if (pretregs == (mXMM0 | mXMM1) &&
19211921
e.Eoper != OPconst)
19221922
{
1923-
code cs = void;
1923+
code cs;
19241924
tym_t tym = tybasic(e.Ety);
19251925
tym_t ty = tym == TYcdouble ? TYdouble : TYfloat;
19261926
opcode_t opmv = xmmload(tym, xmmIsAligned(e));

‎compiler/src/dmd/backend/x86/cod2.d‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void cdorth(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
285285
// Handle the case of (var & const)
286286
if (e2.Eoper == OPconst && el_signx32(e2))
287287
{
288-
code cs = void;
288+
code cs;
289289
cs.Iflags = 0;
290290
cs.Irex = 0;
291291
getlvalue(cdb,cs,e1,0);
@@ -324,7 +324,7 @@ void cdorth(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
324324
regm_t retregs;
325325
if (isregvar(e2,retregs,reg))
326326
{
327-
code cs = void;
327+
code cs;
328328
cs.Iflags = 0;
329329
cs.Irex = 0;
330330
getlvalue(cdb,cs,e1,0);
@@ -340,7 +340,7 @@ void cdorth(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
340340
}
341341
}
342342

343-
code cs = void;
343+
code cs;
344344
cs.Iflags = 0;
345345
cs.Irex = 0;
346346

@@ -370,7 +370,7 @@ void cdorth(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
370370
{
371371
const inc = e.Ecount != 0;
372372
nest += inc;
373-
code csx = void;
373+
code csx;
374374
getlvalue(cdb,csx,e,0);
375375
nest -= inc;
376376
const regx = allocreg(cdb,pretregs,ty);
@@ -943,7 +943,7 @@ void cdmul(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
943943
const uint grex = rex << 16;
944944
const OPER opunslng = I16 ? OPu16_32 : OPu32_64;
945945

946-
code cs = void;
946+
code cs;
947947
cs.Iflags = 0;
948948
cs.Irex = 0;
949949

@@ -1331,7 +1331,7 @@ void cddiv(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
13311331
const ubyte rex = (I64 && sz == 8) ? REX_W : 0;
13321332
const uint grex = rex << 16;
13331333

1334-
code cs = void;
1334+
code cs;
13351335
cs.Iflags = 0;
13361336
cs.IFL2 = FL.unde;
13371337
cs.Irex = 0;
@@ -4756,7 +4756,7 @@ void getoffset(ref CGstate cg, ref CodeBuilder cdb,elem* e,reg_t reg)
47564756
return dmd.backend.arm.cod2.getoffset(cg, cdb, e, reg);
47574757

47584758
//printf("getoffset(e = %p, reg = %s)\n", e, regm_str(mask(reg)));
4759-
code cs = void;
4759+
code cs;
47604760
cs.Iflags = 0;
47614761
ubyte rex = 0;
47624762
cs.Irex = rex;
@@ -4783,7 +4783,7 @@ void getoffset(ref CGstate cg, ref CodeBuilder cdb,elem* e,reg_t reg)
47834783
* LEA DI,s@TLSGD[RIP]
47844784
*/
47854785
//assert(reg == DI);
4786-
code css = void;
4786+
code css;
47874787
css.Irex = REX | REX_W;
47884788
css.Iop = LEA;
47894789
css.Irm = modregrm(0,reg,5);
@@ -4802,7 +4802,7 @@ void getoffset(ref CGstate cg, ref CodeBuilder cdb,elem* e,reg_t reg)
48024802
*/
48034803
assert(reg == AX);
48044804
load_localgot(cdb);
4805-
code css = void;
4805+
code css;
48064806
css.Iflags = 0;
48074807
css.Iop = LEA; // LEA
48084808
css.Irex = 0;
@@ -4832,7 +4832,7 @@ void getoffset(ref CGstate cg, ref CodeBuilder cdb,elem* e,reg_t reg)
48324832
stack = 1;
48334833
}
48344834

4835-
code css = void;
4835+
code css;
48364836
css.Irex = rex;
48374837
css.Iop = 0x8B;
48384838
css.Irm = modregrm(0, 0, BPRM);
@@ -5216,7 +5216,7 @@ void cdpost(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
52165216
}
52175217

52185218
//printf("cdpost(pretregs = %s)\n", regm_str(pretregs));
5219-
code cs = void;
5219+
code cs;
52205220
const op = e.Eoper; // OPxxxx
52215221
if (pretregs == 0) // if nothing to return
52225222
{
@@ -5384,7 +5384,7 @@ if (config.exe & EX_windos)
53845384
}
53855385
else if (sz <= REGSIZE || tyfv(tyml))
53865386
{
5387-
code cs2 = void;
5387+
code cs2;
53885388

53895389
cs.Iop = 0x8B ^ isbyte;
53905390
regm_t retregs = possregs & ~idxregs & pretregs;

‎compiler/src/dmd/backend/x86/cod3.d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6546,7 +6546,7 @@ private void pinholeopt_unittest()
65466546
for (int i = 0; i < tests.length; i++)
65476547
{ CS* pin = &tests[i][0];
65486548
CS* pout = &tests[i][1];
6549-
code cs = void;
6549+
code cs;
65506550
memset(&cs, 0, cs.sizeof);
65516551
if (pin.model)
65526552
{

‎compiler/src/dmd/backend/x86/cod4.d‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,7 @@ void cddivass(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
17261726
return;
17271727
}
17281728

1729-
code cs = void;
1729+
code cs;
17301730

17311731
//printf("cddivass(e=%p, pretregs = %s)\n",e,regm_str(pretregs));
17321732
char uns = tyuns(tyml) || tyuns(e2.Ety);
@@ -1864,7 +1864,7 @@ void cddivass(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
18641864
ulong m;
18651865
int shpre;
18661866
int shpost;
1867-
code cs = void;
1867+
code cs;
18681868

18691869
if (udiv_coefficients(sz * 8, e2factor, &shpre, &m, &shpost))
18701870
{
@@ -3752,7 +3752,7 @@ void cdshtlng(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
37523752
else if (e1.Eoper == OPvar ||
37533753
(e1.Eoper == OPind && !e1.Ecount))
37543754
{
3755-
code cs = void;
3755+
code cs;
37563756

37573757
if (I32 && op == OPu16_32 && config.flags4 & CFG4speed)
37583758
goto L2;
@@ -4545,7 +4545,7 @@ void cdbscan(ref CGstate cg, ref CodeBuilder cdb, elem* e, ref regm_t pretregs)
45454545
const tyml = tybasic(e.E1.Ety);
45464546
const sz = _tysize[tyml];
45474547
assert(sz == 2 || sz == 4 || sz == 8);
4548-
code cs = void;
4548+
code cs;
45494549

45504550
if ((e.E1.Eoper == OPind && !e.E1.Ecount) || e.E1.Eoper == OPvar)
45514551
{
@@ -4606,7 +4606,7 @@ void cdpopcnt(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
46064606
const sz = _tysize[tyml];
46074607
assert(sz == 2 || sz == 4 || (sz == 8 && I64)); // no byte op
46084608

4609-
code cs = void;
4609+
code cs;
46104610
if ((e.E1.Eoper == OPind && !e.E1.Ecount) || e.E1.Eoper == OPvar)
46114611
{
46124612
getlvalue(cdb, cs, e.E1, 0, RM.load); // get addressing mode
@@ -4748,7 +4748,7 @@ void cdcmpxchg(ref CGstate cg, ref CodeBuilder cdb, elem* e, ref regm_t pretregs
47484748
regm_t retregs = mCX|mBX;
47494749
scodelem(cgstate,cdb,e2.E2,retregs,mDX|mAX,false); // [CX,BX] = e2.E2
47504750

4751-
code cs = void;
4751+
code cs;
47524752
getlvalue(cdb,cs,e1,mCX|mBX|mAX|mDX); // get EA
47534753

47544754
getregs(cdb,mDX|mAX); // CMPXCHG destroys these regs
@@ -4775,7 +4775,7 @@ void cdcmpxchg(ref CGstate cg, ref CodeBuilder cdb, elem* e, ref regm_t pretregs
47754775
regm_t retregs = (ALLREGS | mBP) & ~mAX;
47764776
scodelem(cgstate,cdb,e2.E2,retregs,mAX,false); // load rvalue in reg
47774777

4778-
code cs = void;
4778+
code cs;
47794779
getlvalue(cdb,cs,e1,mAX | retregs); // get EA
47804780

47814781
getregs(cdb,mAX); // CMPXCHG destroys AX
@@ -4842,7 +4842,7 @@ void cdprefetch(ref CGstate cg, ref CodeBuilder cdb, elem* e, ref regm_t pretreg
48424842

48434843
freenode(e.E2);
48444844

4845-
code cs = void;
4845+
code cs;
48464846
getlvalue(cdb,cs,e1,0);
48474847
cs.Iop = op;
48484848
cs.Irm |= modregrm(0,reg,0);

0 commit comments

Comments
 (0)