Merge "Have the opt. compiler set the size of "empty" frames to zero."

1 files changed, 7 insertions, 4 deletions

diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h
index 6c78f10500..0310877f18 100644
--- a/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@ -238,6 +238,13 @@ class CodeGenerator {
 
   void AllocateLocations(HInstruction* instruction);
 
+  // Tells whether the stack frame of the compiled method is
+  // considered "empty", that is either actually having a size of zero,
+  // or just containing the saved return address register.
+  bool HasEmptyFrame() const {
+    return GetFrameSize() == (CallPushesPC() ? GetWordSize() : 0);
+  }
+
  protected:
   CodeGenerator(HGraph* graph,
                 size_t number_of_core_registers,
@@ -312,10 +319,6 @@ class CodeGenerator {
     return instruction_set == kX86 || instruction_set == kX86_64;
   }
 
-  bool HasEmptyFrame() const {
-    return GetFrameSize() == (CallPushesPC() ? GetWordSize() : 0);
-  }
-
   // Arm64 has its own type for a label, so we need to templatize this method
   // to share the logic.
   template <typename T>