summaryrefslogtreecommitdiff
path: root/compiler/compiler.h
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2016-02-05 16:51:53 +0000
committerNicolas Geoffray <ngeoffray@google.com>2016-02-05 17:11:54 +0000
commitb331febbab8e916680faba722cc84b66b84218a3 (patch)
tree35f985b021e476914bfe91492da23fee218014a7 /compiler/compiler.h
parent586996afc905518ed926e4680aab67bedabec9b7 (diff)
Revert "Revert "Implement on-stack replacement for arm/arm64/x86/x86_64.""
This reverts commit bd89a5c556324062b7d841843b039392e84cfaf4. Change-Id: I08d190431520baa7fcec8fbdb444519f25ac8d44
Diffstat (limited to 'compiler/compiler.h')
-rw-r--r--compiler/compiler.h3
1 files changed, 2 insertions, 1 deletions
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;
}