Merge "Avoid excessive spill slots for slow paths."

diff --cc compiler/optimizing/code_generator.cc
Simple merge

diff --cc compiler/optimizing/code_generator.h
index 78a8afb,072d8cf..00a779a
--- 1/compiler/optimizing/code_generator.h
--- 2/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@@ -22,7 -22,10 +22,8 @@@
  #include "base/arena_containers.h"
  #include "base/arena_object.h"
  #include "base/bit_field.h"
+ #include "base/bit_utils.h"
  #include "base/enums.h"
 -#include "compiled_method.h"
 -#include "driver/compiler_options.h"
  #include "globals.h"
  #include "graph_visualizer.h"
  #include "locations.h"

diff --cc compiler/optimizing/code_generator_arm.cc
Simple merge

diff --cc compiler/optimizing/code_generator_arm64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_mips.cc
Simple merge

diff --cc compiler/optimizing/code_generator_mips64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86_64.cc
Simple merge

diff --cc compiler/optimizing/intrinsics_arm.cc
Simple merge

diff --cc compiler/optimizing/intrinsics_x86.cc
Simple merge

diff --cc compiler/optimizing/intrinsics_x86_64.cc
Simple merge

diff --cc compiler/optimizing/ssa_liveness_analysis.h
Simple merge