diff options
| author | 2018-09-28 15:30:14 +0000 | |
|---|---|---|
| committer | 2018-09-28 15:30:14 +0000 | |
| commit | e5fb7eafdc471915d87dca9622a502dc0c46a769 (patch) | |
| tree | e94890608426e136bd30994343d8a70b17b16cf1 | |
| parent | 0de9c08aefc2465fd1d2fcedec3d3fa2164056fe (diff) | |
| parent | 25d88ba906b18ce2ca4ec1d9b7c23980b63a33ad (diff) | |
Merge "Inline ClassLinker::ResolveMethod"
| -rw-r--r-- | build/art.go | 3 | ||||
| -rw-r--r-- | runtime/class_linker.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build/art.go b/build/art.go index f3cd3cacad..0df46b13df 100644 --- a/build/art.go +++ b/build/art.go @@ -154,7 +154,8 @@ func hostFlags(ctx android.BaseContext) []string { if len(ctx.AConfig().SanitizeHost()) > 0 { // art/test/137-cfi/cfi.cc // error: stack frame size of 1944 bytes in function 'Java_Main_unwindInProcess' - hostFrameSizeLimit = 6400 + // error: stack frame size of 6520 bytes in function 'art::interpreter::ExecuteSwitchImplCpp' + hostFrameSizeLimit = 7400 } cflags = append(cflags, fmt.Sprintf("-Wframe-larger-than=%d", hostFrameSizeLimit), diff --git a/runtime/class_linker.h b/runtime/class_linker.h index e06a398089..0e276cd439 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -314,7 +314,10 @@ class ClassLinker { REQUIRES_SHARED(Locks::mutator_lock_); template <ResolveMode kResolveMode> - ArtMethod* ResolveMethod(Thread* self, uint32_t method_idx, ArtMethod* referrer, InvokeType type) + ALWAYS_INLINE ArtMethod* ResolveMethod(Thread* self, + uint32_t method_idx, + ArtMethod* referrer, + InvokeType type) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::dex_lock_, !Roles::uninterruptible_); ArtMethod* ResolveMethodWithoutInvokeType(uint32_t method_idx, |