From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Mon, 5 Sep 2016 18:12:13 +0000 (+0000)
Subject: Merge "Avoid excessive spill slots for slow paths."
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=86dc59ebe25cfe36d4edb39c2b7b2653f079448b;p=android-x86%2Fart.git

Merge "Avoid excessive spill slots for slow paths."
---

86dc59ebe25cfe36d4edb39c2b7b2653f079448b
diff --cc compiler/optimizing/code_generator.h
index 78a8afb15,072d8cf31..00a779ad9
--- a/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"