Reverts refactoring of CPU feature detection for

runtime/vm/flow_graph_compiler_arm.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/compiler.h"
-#include "vm/cpu.h"
 #include "vm/dart_entry.h"
 #include "vm/deopt_instructions.h"
 #include "vm/il_printer.h"
 #include "vm/locations.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 
@@ skipping 15 matching lines @@
   }
 }
 
 
 bool FlowGraphCompiler::SupportsUnboxedMints() {
   return false;
 }
 
 
 bool FlowGraphCompiler::SupportsUnboxedFloat32x4() {
-  return TargetCPUFeatures::neon_supported() && FLAG_enable_simd_inline;
+  return CPUFeatures::neon_supported() && FLAG_enable_simd_inline;
 }
 
 
 bool FlowGraphCompiler::SupportsSinCos() {
   return false;
 }
 
 
 RawDeoptInfo* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler,
                                                  DeoptInfoBuilder* builder,
@@ skipping 653 matching lines @@
   __ Drop(6);
   __ Pop(R0);
 
   __ Bind(&is_assignable);
   // Restore instantiator (R2) and its type arguments (R1).
   __ PopList((1 << R1) | (1 << R2));
 }
 
 
 void FlowGraphCompiler::EmitInstructionEpilogue(Instruction* instr) {
-  if (is_optimizing()) {
-    return;
-  }
+  if (is_optimizing()) return;
   Definition* defn = instr->AsDefinition();
   if ((defn != NULL) && defn->is_used()) {
     __ Push(defn->locs()->out().reg());
   }
 }
 
 
 // Input parameters:
 //   R4: arguments descriptor array.
 void FlowGraphCompiler::CopyParameters() {
@@ skipping 1088 matching lines @@
   DRegister dreg = EvenDRegisterOf(reg);
   __ vldrd(dreg, Address(SP, kDoubleSize, Address::PostIndex));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM