diff --git a/build/art.go b/build/art.go
index f3cd3ca..0df46b1 100644
--- a/build/art.go
+++ b/build/art.go
@@ -154,7 +154,8 @@
 	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 e06a398..0e276cd 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -314,7 +314,10 @@
       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,