commit 9989b167ce5726950ab4c52f87a428eea7493bd6
author Nicolas Geoffray <ngeoffray@google.com> Thu Oct 13 13:42:30 2016 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Thu Oct 13 14:40:10 2016 +0100
tree 6e43803fcd7b6faf7c0466ac9d8b6277bee9a25a
parent 68f1128b3f98886ebe28c36e8a75f7a254db5431

Fix optimizing_cfi_test and arm64 code generation.

Change https://android-review.googlesource.com/#/c/287582/ broke it.

test: m test-art-host-gtest-optimizing_cfi_test
test: m test-art-target on angler
Change-Id: I7fc74a87ffa0b26b8e103b87a2ac1179bea2145a

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index b1e4f5c..f02b028 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -1052,6 +1052,8 @@
     // in the SSA graph.
     if (RequiresCurrentMethod()) {
       __ Str(kArtMethodRegister, MemOperand(sp, -frame_size, PreIndex));
+    } else {
+      __ Claim(frame_size);
     }
     GetAssembler()->cfi().AdjustCFAOffset(frame_size);
     GetAssembler()->SpillRegisters(GetFramePreservedCoreRegisters(),