commit ed08bd41321b9347ce3b21e64a5084fb36234e9e
author Brian Carlstrom <bdc@google.com> Wed Mar 19 18:34:17 2014 -0700
committer Brian Carlstrom <bdc@google.com> Wed Mar 19 18:36:53 2014 -0700
tree b67d6c5bb88f9f3bb9d783fdce282d124ea148da
parent 6673338f41c5f2f134ae83219670d9f0b9e1a6e7

Fix test-art 083-compiler-regressions with work around

(cherry picked from commit cac04f21b35152c3f6e5c09b6699685255491b4a)

Change-Id: I99f66c7531a61f36328db607a961137a6345cbe0

runtime/stack.cc

diff --git a/runtime/stack.cc b/runtime/stack.cc
index f397afa..c33d1ab 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -279,7 +279,9 @@
       // 2 words Sirt overhead
       // 3+3 register spills
       // TODO: this seems architecture specific for the case of JNI frames.
-      const size_t kMaxExpectedFrameSize = (256 + 2 + 3 + 3) * sizeof(word);
+      // TODO: 083-compiler-regressions ManyFloatArgs shows this estimate is wrong.
+      // const size_t kMaxExpectedFrameSize = (256 + 2 + 3 + 3) * sizeof(word);
+      const size_t kMaxExpectedFrameSize = 2 * KB;
       CHECK_LE(frame_size, kMaxExpectedFrameSize);
       size_t return_pc_offset = method->GetReturnPcOffsetInBytes();
       CHECK_LT(return_pc_offset, frame_size);