summaryrefslogtreecommitdiff
path: root/compiler/compiler.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-02-05 17:25:17 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-02-05 17:25:17 +0000
commit9fba3f67a0792ad5eeb495e489d11a87211c318f (patch)
tree7204ab0951b14fa2536fe33d974e413a3cbe87a5 /compiler/compiler.h
parent0f638c64686c03256c949051331b0838c9888a2a (diff)
parentb331febbab8e916680faba722cc84b66b84218a3 (diff)
Merge "Revert "Revert "Implement on-stack replacement for arm/arm64/x86/x86_64."""
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;
}