summaryrefslogtreecommitdiff
path: root/compiler/compiler.h
diff options
context:
space:
mode:
author David Brazdil <dbrazdil@google.com> 2016-02-05 15:47:16 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-02-05 15:47:16 +0000
commit11aa3f5c5efd5ce8e761dfd76378a91d9f8dc42b (patch)
tree746ab81bbc05e03fb918ca32cc8d5b296d083113 /compiler/compiler.h
parent7ac9aeb501520089334c7b9e0deca1e089945bc8 (diff)
parentbd89a5c556324062b7d841843b039392e84cfaf4 (diff)
Merge "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, 1 insertions, 2 deletions
diff --git a/compiler/compiler.h b/compiler/compiler.h
index 97c60de8c0..3a9ce1bc0e 100644
--- a/compiler/compiler.h
+++ b/compiler/compiler.h
@@ -64,8 +64,7 @@ class Compiler {
virtual bool JitCompile(Thread* self ATTRIBUTE_UNUSED,
jit::JitCodeCache* code_cache ATTRIBUTE_UNUSED,
- ArtMethod* method ATTRIBUTE_UNUSED,
- bool osr ATTRIBUTE_UNUSED)
+ ArtMethod* method ATTRIBUTE_UNUSED)
SHARED_REQUIRES(Locks::mutator_lock_) {
return false;
}