Merge "Revert "Inline ClassLinker::ResolveMethod""
diff --git a/build/art.go b/build/art.go
index 0df46b1..f3cd3ca 100644
--- a/build/art.go
+++ b/build/art.go
@@ -154,8 +154,7 @@
if len(ctx.AConfig().SanitizeHost()) > 0 {
// art/test/137-cfi/cfi.cc
// error: stack frame size of 1944 bytes in function 'Java_Main_unwindInProcess'
- // error: stack frame size of 6520 bytes in function 'art::interpreter::ExecuteSwitchImplCpp'
- hostFrameSizeLimit = 7400
+ hostFrameSizeLimit = 6400
}
cflags = append(cflags,
fmt.Sprintf("-Wframe-larger-than=%d", hostFrameSizeLimit),
diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index a48dfaf..cc17d57 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -316,10 +316,7 @@
REQUIRES_SHARED(Locks::mutator_lock_);
template <ResolveMode kResolveMode>
- ALWAYS_INLINE ArtMethod* ResolveMethod(Thread* self,
- uint32_t method_idx,
- ArtMethod* referrer,
- InvokeType type)
+ 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,