| Index: src/s390/macro-assembler-s390.cc
|
| diff --git a/src/s390/macro-assembler-s390.cc b/src/s390/macro-assembler-s390.cc
|
| index e22cea9ba2c8eeee8519a97faff965bf3003e1c9..519cc4ac1b3f92f107301a7e516810f7ab690cc6 100644
|
| --- a/src/s390/macro-assembler-s390.cc
|
| +++ b/src/s390/macro-assembler-s390.cc
|
| @@ -5215,12 +5215,12 @@ void MacroAssembler::ShiftRight(Register dst, Register src,
|
|
|
| // Shift right logical for 32-bit integer types.
|
| void MacroAssembler::ShiftRight(Register dst, Register src, Register val) {
|
| - DCHECK(!dst.is(val)); // The lr/srl path clobbers val.
|
| if (dst.is(src)) {
|
| srl(dst, val);
|
| } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
|
| srlk(dst, src, val);
|
| } else {
|
| + DCHECK(!dst.is(val)); // The lr/srl path clobbers val.
|
| lr(dst, src);
|
| srl(dst, val);
|
| }
|
| @@ -5241,12 +5241,12 @@ void MacroAssembler::ShiftLeftArith(Register dst, Register src,
|
|
|
| // Shift left arithmetic for 32-bit integer types.
|
| void MacroAssembler::ShiftLeftArith(Register dst, Register src, Register val) {
|
| - DCHECK(!dst.is(val)); // The lr/sla path clobbers val.
|
| if (dst.is(src)) {
|
| sla(dst, val);
|
| } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
|
| slak(dst, src, val);
|
| } else {
|
| + DCHECK(!dst.is(val)); // The lr/sla path clobbers val.
|
| lr(dst, src);
|
| sla(dst, val);
|
| }
|
| @@ -5267,12 +5267,12 @@ void MacroAssembler::ShiftRightArith(Register dst, Register src,
|
|
|
| // Shift right arithmetic for 32-bit integer types.
|
| void MacroAssembler::ShiftRightArith(Register dst, Register src, Register val) {
|
| - DCHECK(!dst.is(val)); // The lr/sra path clobbers val.
|
| if (dst.is(src)) {
|
| sra(dst, val);
|
| } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
|
| srak(dst, src, val);
|
| } else {
|
| + DCHECK(!dst.is(val)); // The lr/sra path clobbers val.
|
| lr(dst, src);
|
| sra(dst, val);
|
| }
|
|
|