commit 351dddf4025f07477161209e374741f089d97cb4
author Vladimir Marko <vmarko@google.com> Fri Dec 11 16:34:46 2015 +0000
committer Vladimir Marko <vmarko@google.com> Fri Dec 11 16:54:42 2015 +0000
tree d35406fe1e975369acf8f103d0ad5e0cf2313431
parent 58dcb021c3bd45718d0103844f4e6d55754e6501

Optimizing: Clean up after HRor.

Change-Id: I96bd7fa2e8bdccb87a3380d063dad0dd57fed9d7

compiler/optimizing/code_generator_arm.cc

diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc
index a941935..9fda838 100644
--- a/compiler/optimizing/code_generator_arm.cc
+++ b/compiler/optimizing/code_generator_arm.cc
@@ -3363,15 +3363,16 @@
     }
     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) {

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index b7efbe3..5205830 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -4243,6 +4243,7 @@
 
     default:
       LOG(FATAL) << "Unexpected rem type " << type;
+      UNREACHABLE();
   }
 }
 
@@ -4317,6 +4318,7 @@
 
     default:
       LOG(FATAL) << "Unimplemented local type " << field_type;
+      UNREACHABLE();
   }
 }
 

compiler/optimizing/code_generator_x86_64.cc

diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 610ce67..1fee192 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -3755,6 +3755,7 @@
     }
     default:
       LOG(FATAL) << "Unexpected operation type " << op->GetResultType();
+      UNREACHABLE();
   }
 }
 

compiler/optimizing/instruction_simplifier.cc

diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 6946265..e1b13c5 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -211,7 +211,7 @@
 
 // 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::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) {

test/542-bitfield-rotates/src/Main.java

diff --git a/test/542-bitfield-rotates/src/Main.java b/test/542-bitfield-rotates/src/Main.java
index 9ef5f93..f2bc153 100644
--- a/test/542-bitfield-rotates/src/Main.java
+++ b/test/542-bitfield-rotates/src/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2015 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.