s390: fix s390 debug build failures

Change-Id: I3aa30ac6a04b914cdd278a9c016467296a42ef8f
Reviewed-on: https://chromium-review.googlesource.com/1105058Reviewed-by: Joran Siu <joransiu@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#53854}

src/s390/assembler-s390.h

@@ -786,7 +786,6 @@ inline void rsy_format(Opcode op, int f1, int f2, int f3, int f4) {
 
 
 inline void rs_format(Opcode op, int f1, int f2, int f3, const int f4) {
-  DCHECK(is_uint12(d2));
   uint32_t code = getfield<uint32_t, 4, 0, 8>(op) |
                   getfield<uint32_t, 4, 8, 12>(f1) |
                   getfield<uint32_t, 4, 12, 16>(f2) |

src/s390/simulator-s390.cc

@@ -9221,7 +9221,7 @@ EVALUATE(STOC) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);            \
   intptr_t addr = static_cast<intptr_t>(b2_val) + d2;           \
   int32_t r3_val = get_low_register<int32_t>(r3);               \
-  DCHECK_EQ(target_addr & 0x3, 0);                              \
+  DCHECK_EQ(addr & 0x3, 0);                              \
   int32_t r1_val = op(reinterpret_cast<int32_t*>(addr),         \
                       r3_val, __ATOMIC_SEQ_CST);                \
   set_low_register(r1, r1_val);