commit 69489fad1e34c005fbe110bfae2a3c6bff879d4e
author Andreas Gampe <agampe@google.com> Thu Jun 08 18:03:25 2017 -0700
committer Andreas Gampe <agampe@google.com> Wed Jun 21 21:30:59 2017 -0700
tree 23c50305c52cf076cedd3bfd496a2adf0d1e46b3
parent 8979f71079ec18fa8d3c0915549ec03ee1fbadf5

ART: Fix old warnings

Fix Wconstant-conversion warnings.

Partially reverts commit df53be273509dd43725870fb20a2c7d71f7fbfd3.

Bug: 28149048
Bug: 29823425
Test: m
Test: m test-art-host
Change-Id: Ib377150690c0f2c2142e4b91f2144e2bcaa020ef

compiler/utils/arm/assembler_thumb2.cc

diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc
index d7096b3..abc36c6 100644
--- a/compiler/utils/arm/assembler_thumb2.cc
+++ b/compiler/utils/arm/assembler_thumb2.cc
@@ -324,7 +324,7 @@
 
 inline int16_t Thumb2Assembler::BEncoding16(int32_t offset, Condition cond) {
   DCHECK_ALIGNED(offset, 2);
-  int16_t encoding = B15 | B14;
+  int16_t encoding = static_cast<int16_t>(B15 | B14);
   if (cond != AL) {
     DCHECK(IsInt<9>(offset));
     encoding |= B12 |  (static_cast<int32_t>(cond) << 8) | ((offset >> 1) & 0xff);

compiler/utils/mips/assembler_mips_test.cc

diff --git a/compiler/utils/mips/assembler_mips_test.cc b/compiler/utils/mips/assembler_mips_test.cc
index c24e1b1..0917530 100644
--- a/compiler/utils/mips/assembler_mips_test.cc
+++ b/compiler/utils/mips/assembler_mips_test.cc
@@ -2851,7 +2851,7 @@
   // Account for 5 extra instructions: ori, addu, lw, jalr, addiu.
   uint32_t offset_forward = (kAdduCount1 + 5) * sizeof(uint32_t);
   // Account for 5 extra instructions: subu, addiu, sw, nal, lui.
-  uint32_t offset_back = -(kAdduCount1 + 5) * sizeof(uint32_t);
+  uint32_t offset_back = static_cast<uint32_t>(-(kAdduCount1 + 5) * sizeof(uint32_t));
 
   std::ostringstream oss;
   oss <<