From b331febbab8e916680faba722cc84b66b84218a3 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 5 Feb 2016 16:51:53 +0000 Subject: Revert "Revert "Implement on-stack replacement for arm/arm64/x86/x86_64."" This reverts commit bd89a5c556324062b7d841843b039392e84cfaf4. Change-Id: I08d190431520baa7fcec8fbdb444519f25ac8d44 --- compiler/compiler.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/compiler.h') diff --git a/compiler/compiler.h b/compiler/compiler.h index 3a9ce1bc0e..97c60de8c0 100644 --- a/compiler/compiler.h +++ b/compiler/compiler.h @@ -64,7 +64,8 @@ class Compiler { virtual bool JitCompile(Thread* self ATTRIBUTE_UNUSED, jit::JitCodeCache* code_cache ATTRIBUTE_UNUSED, - ArtMethod* method ATTRIBUTE_UNUSED) + ArtMethod* method ATTRIBUTE_UNUSED, + bool osr ATTRIBUTE_UNUSED) SHARED_REQUIRES(Locks::mutator_lock_) { return false; } -- cgit v1.2.3-59-g8ed1b