From aec8f930571ce10d6ce9a4249c45866a7f213397 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Wed, 18 Mar 2015 10:42:22 +0000
Subject: StackMap: Always load and store unalign.

Now that we can have a mix of Quick and Optimized code in an .oat
file, a CodeInfo object is not necessarily word aligned.

Change-Id: Ic6c5d1a2c6e20363436726a0708b0764b5a76caf
---
 runtime/stack_map.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'runtime/stack_map.h')

diff --git a/runtime/stack_map.h b/runtime/stack_map.h
index 0db589f..961772c 100644
--- a/runtime/stack_map.h
+++ b/runtime/stack_map.h
@@ -632,27 +632,27 @@ class CodeInfo {
   }
 
   uint32_t GetOverallSize() const {
-    return region_.Load<uint32_t>(kOverallSizeOffset);
+    return region_.LoadUnaligned<uint32_t>(kOverallSizeOffset);
   }
 
   void SetOverallSize(uint32_t size) {
-    region_.Store<uint32_t>(kOverallSizeOffset, size);
+    region_.StoreUnaligned<uint32_t>(kOverallSizeOffset, size);
   }
 
   uint32_t GetStackMaskSize() const {
-    return region_.Load<uint32_t>(kStackMaskSizeOffset);
+    return region_.LoadUnaligned<uint32_t>(kStackMaskSizeOffset);
   }
 
   void SetStackMaskSize(uint32_t size) {
-    region_.Store<uint32_t>(kStackMaskSizeOffset, size);
+    region_.StoreUnaligned<uint32_t>(kStackMaskSizeOffset, size);
   }
 
   size_t GetNumberOfStackMaps() const {
-    return region_.Load<uint32_t>(kNumberOfStackMapsOffset);
+    return region_.LoadUnaligned<uint32_t>(kNumberOfStackMapsOffset);
   }
 
   void SetNumberOfStackMaps(uint32_t number_of_stack_maps) {
-    region_.Store<uint32_t>(kNumberOfStackMapsOffset, number_of_stack_maps);
+    region_.StoreUnaligned<uint32_t>(kNumberOfStackMapsOffset, number_of_stack_maps);
   }
 
   // Get the size of one stack map of this CodeInfo object, in bytes.
-- 
cgit v1.1