4 files changed, 8 insertions, 4 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc
index a941935446..9fda83840c 100644
--- a/compiler/optimizing/code_generator_arm.cc
+++ b/compiler/optimizing/code_generator_arm.cc
@@ -3363,15 +3363,16 @@ void InstructionCodeGeneratorARM::HandleRotate(HRor* ror) {
     }
     default:
       LOG(FATAL) << "Unexpected operation type " << type;
+      UNREACHABLE();
   }
 }
 
 void LocationsBuilderARM::VisitRor(HRor* op) {
-    HandleRotate(op);
+  HandleRotate(op);
 }
 
 void InstructionCodeGeneratorARM::VisitRor(HRor* op) {
-    HandleRotate(op);
+  HandleRotate(op);
 }
 
 void LocationsBuilderARM::HandleShift(HBinaryOperation* op) {
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index b7efbe351c..52058302be 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -4243,6 +4243,7 @@ void InstructionCodeGeneratorARM64::VisitRem(HRem* rem) {
 
     default:
       LOG(FATAL) << "Unexpected rem type " << type;
+      UNREACHABLE();
   }
 }
 
@@ -4317,6 +4318,7 @@ void LocationsBuilderARM64::VisitStoreLocal(HStoreLocal* store) {
 
     default:
       LOG(FATAL) << "Unimplemented local type " << field_type;
+      UNREACHABLE();
   }
 }
 
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 610ce6741a..1fee192e36 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -3755,6 +3755,7 @@ void InstructionCodeGeneratorX86_64::HandleShift(HBinaryOperation* op) {
     }
     default:
       LOG(FATAL) << "Unexpected operation type " << op->GetResultType();
+      UNREACHABLE();
   }
 }
 
diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 6946265abe..e1b13c5087 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -211,7 +211,7 @@ bool InstructionSimplifierVisitor::ReplaceRotateWithRor(HBinaryOperation* op,
 
 // Try to replace a binary operation flanked by one UShr and one Shl with a bitfield rotation.
 bool InstructionSimplifierVisitor::TryReplaceWithRotate(HBinaryOperation* op) {
-  // This simplification is currently supported on ARM and ARM64.
+  // This simplification is currently supported on x86, x86_64, ARM and ARM64.
   // TODO: Implement it for MIPS/64.
   const InstructionSet instruction_set = GetGraph()->GetInstructionSet();
   switch (instruction_set) {
@@ -1268,7 +1268,7 @@ void InstructionSimplifierVisitor::SimplifyStringEquals(HInvoke* instruction) {
 void InstructionSimplifierVisitor::SimplifyRotate(HInvoke* invoke, bool is_left) {
   DCHECK(invoke->IsInvokeStaticOrDirect());
   DCHECK_EQ(invoke->GetOriginalInvokeType(), InvokeType::kStatic);
-  // This simplification is currently supported on ARM and ARM64.
+  // This simplification is currently supported on x86, x86_64, ARM and ARM64.
   // TODO: Implement it for MIPS/64.
   const InstructionSet instruction_set = GetGraph()->GetInstructionSet();
   switch (instruction_set) {