Merge "Always inline some methods related to StackMap."
diff --git a/runtime/memory_region.h b/runtime/memory_region.h
index f018c1f..fe3f917 100644
--- a/runtime/memory_region.h
+++ b/runtime/memory_region.h
@@ -148,14 +148,14 @@
void CopyFrom(size_t offset, const MemoryRegion& from) const;
// Compute a sub memory region based on an existing one.
- MemoryRegion Subregion(uintptr_t offset, uintptr_t size_in) const {
+ ALWAYS_INLINE MemoryRegion Subregion(uintptr_t offset, uintptr_t size_in) const {
CHECK_GE(this->size(), size_in);
CHECK_LE(offset, this->size() - size_in);
return MemoryRegion(reinterpret_cast<void*>(start() + offset), size_in);
}
// Compute an extended memory region based on an existing one.
- void Extend(const MemoryRegion& region, uintptr_t extra) {
+ ALWAYS_INLINE void Extend(const MemoryRegion& region, uintptr_t extra) {
pointer_ = region.pointer();
size_ = (region.size() + extra);
}
diff --git a/runtime/stack_map.h b/runtime/stack_map.h
index 15d7816..13886f2 100644
--- a/runtime/stack_map.h
+++ b/runtime/stack_map.h
@@ -1127,7 +1127,7 @@
GetDexRegisterLocationCatalogSize(encoding)));
}
- StackMap GetStackMapAt(size_t i, const CodeInfoEncoding& encoding) const {
+ ALWAYS_INLINE StackMap GetStackMapAt(size_t i, const CodeInfoEncoding& encoding) const {
size_t stack_map_size = encoding.stack_map_size_in_bytes;
return StackMap(GetStackMaps(encoding).Subregion(i * stack_map_size, stack_map_size));
}
@@ -1288,7 +1288,7 @@
}
private:
- MemoryRegion GetStackMaps(const CodeInfoEncoding& encoding) const {
+ ALWAYS_INLINE MemoryRegion GetStackMaps(const CodeInfoEncoding& encoding) const {
return region_.size() == 0
? MemoryRegion()
: region_.Subregion(GetStackMapsOffset(encoding), GetStackMapsSize(encoding));