Fix some more pedantic compiler warnings.

Argument name shadows field name.
Lack of case statements for kMips64.

Change-Id: Ib3ca16f79a4d44ae80ef32f22cc79cbe9527f4f1

2 files changed, 8 insertions, 4 deletions

diff --git a/runtime/base/logging.h b/runtime/base/logging.h
index caeb946ff0..cf3e763f1e 100644
--- a/runtime/base/logging.h
+++ b/runtime/base/logging.h
@@ -151,7 +151,7 @@ namespace art {
 
 template <typename LHS, typename RHS>
 struct EagerEvaluator {
-  EagerEvaluator(LHS lhs, RHS rhs) : lhs(lhs), rhs(rhs) { }
+  EagerEvaluator(LHS l, RHS r) : lhs(l), rhs(r) { }
   LHS lhs;
   RHS rhs;
 };
@@ -163,9 +163,9 @@ struct EagerEvaluator {
 // protect you against combinations not explicitly listed below.
 #define EAGER_PTR_EVALUATOR(T1, T2) \
   template <> struct EagerEvaluator<T1, T2> { \
-    EagerEvaluator(T1 lhs, T2 rhs) \
-        : lhs(reinterpret_cast<const void*>(lhs)), \
-          rhs(reinterpret_cast<const void*>(rhs)) { } \
+    EagerEvaluator(T1 l, T2 r) \
+        : lhs(reinterpret_cast<const void*>(l)), \
+          rhs(reinterpret_cast<const void*>(r)) { } \
     const void* lhs; \
     const void* rhs; \
   }
diff --git a/runtime/instruction_set.h b/runtime/instruction_set.h
index ae8eeac54d..de6d0f47d9 100644
--- a/runtime/instruction_set.h
+++ b/runtime/instruction_set.h
@@ -56,6 +56,7 @@ static constexpr InstructionSet kRuntimeISA = kNone;
 static constexpr size_t kArmPointerSize = 4;
 static constexpr size_t kArm64PointerSize = 8;
 static constexpr size_t kMipsPointerSize = 4;
+static constexpr size_t kMips64PointerSize = 8;
 static constexpr size_t kX86PointerSize = 4;
 static constexpr size_t kX86_64PointerSize = 8;
 
@@ -93,6 +94,8 @@ static inline size_t GetInstructionSetPointerSize(InstructionSet isa) {
       return kX86_64PointerSize;
     case kMips:
       return kMipsPointerSize;
+    case kMips64:
+      return kMips64PointerSize;
     case kNone:
       LOG(FATAL) << "ISA kNone does not have pointer size.";
       return 0;
@@ -114,6 +117,7 @@ static inline bool Is64BitInstructionSet(InstructionSet isa) {
 
     case kArm64:
     case kX86_64:
+    case kMips64:
       return true;
 
     case kNone: