diff options
| author | 2016-08-31 17:49:55 +0000 | |
|---|---|---|
| committer | 2016-08-31 17:49:55 +0000 | |
| commit | 3d08238729dedecba73ddc0b42bc6bbf4806ecae (patch) | |
| tree | 92989553b03c704f79e2aae907b3b10479bc830e /compiler/jit/jit_compiler.h | |
| parent | 081e7a16c4fcbdb014441a236e12f58eb89ff99a (diff) | |
| parent | bdf7f1c3ab65ccb70f62db5ab31dba060632d458 (diff) | |
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED"
Diffstat (limited to 'compiler/jit/jit_compiler.h')
| -rw-r--r-- | compiler/jit/jit_compiler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/jit/jit_compiler.h b/compiler/jit/jit_compiler.h index 533dccf216..18e3155040 100644 --- a/compiler/jit/jit_compiler.h +++ b/compiler/jit/jit_compiler.h @@ -37,7 +37,7 @@ class JitCompiler { // Compilation entrypoint. Returns whether the compilation succeeded. bool CompileMethod(Thread* self, ArtMethod* method, bool osr) - SHARED_REQUIRES(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_); CompilerOptions* GetCompilerOptions() const { return compiler_options_.get(); @@ -59,7 +59,7 @@ class JitCompiler { // This is in the compiler since the runtime doesn't have access to the compiled method // structures. bool AddToCodeCache(ArtMethod* method, const CompiledMethod* compiled_method) - SHARED_REQUIRES(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_); DISALLOW_COPY_AND_ASSIGN(JitCompiler); }; |