Merge "StackMap: Always load and store unalign."

1 files changed, 2 insertions, 2 deletions

diff --git a/compiler/optimizing/stack_map_stream.h b/compiler/optimizing/stack_map_stream.h
index 63a02862b4..e1a5afe0e7 100644
--- a/compiler/optimizing/stack_map_stream.h
+++ b/compiler/optimizing/stack_map_stream.h
@@ -105,8 +105,8 @@ class StackMapStream : public ValueObject {
         + ComputeStackMapsSize()
         + ComputeDexRegisterMapsSize()
         + ComputeInlineInfoSize();
-    // On ARM, CodeInfo data must be 4-byte aligned.
-    return RoundUp(size, kWordAlignment);
+    // Note: use RoundUp to word-size here if you want CodeInfo objects to be word aligned.
+    return size;
   }
 
   size_t ComputeStackMaskSize() const {