Add validate object, clean up stack indirect reference table.
Change-Id: Ifb329ae7d3bede3e95d48e6761cee1412a33d867
diff --git a/src/calling_convention_arm.cc b/src/calling_convention_arm.cc
index 143d83b..826f40d 100644
--- a/src/calling_convention_arm.cc
+++ b/src/calling_convention_arm.cc
@@ -72,10 +72,11 @@
size_t JniCallingConvention::FrameSize() {
// Method* and spill area size
size_t frame_data_size = kPointerSize + SpillAreaSize();
- // Handles plus 2 words for SHB header
- size_t handle_area_size = (HandleCount() + 2) * kPointerSize;
+ // References plus 2 words for SIRT header
+ size_t sirt_size = (ReferenceCount() + 2) * kPointerSize;
// Plus return value spill area size
- return RoundUp(frame_data_size + handle_area_size + SizeOfReturnValue(), 16);
+ return RoundUp(frame_data_size + sirt_size + SizeOfReturnValue(),
+ kStackAlignment);
}
size_t JniCallingConvention::ReturnPcOffset() {