| commit | 1cc71ebf333ca323ae0e130fefbce4593e385c10 | [log] [tgz] |
|---|---|---|
| author | Hiroshi Yamauchi <yamauchi@google.com> | Thu May 07 10:47:27 2015 -0700 |
| committer | Hiroshi Yamauchi <yamauchi@google.com> | Thu May 07 11:28:08 2015 -0700 |
| tree | e94897ebb36a21f1c276fc69c44f6a3522cbe093 | |
| parent | 35b6625c21e9304dd79700f4ff1c26a7e30d2b2d [diff] [blame] |
Insert a read barrier in the JNI bridge. Bug: 20720510 Bug: 12687968 Change-Id: Ia9edb614853bad45ec25d6e2142361a8bda1eccf
diff --git a/runtime/arch/x86/entrypoints_init_x86.cc b/runtime/arch/x86/entrypoints_init_x86.cc index a371632..737f4d1 100644 --- a/runtime/arch/x86/entrypoints_init_x86.cc +++ b/runtime/arch/x86/entrypoints_init_x86.cc
@@ -138,6 +138,9 @@ // Deoptimize qpoints->pDeoptimize = art_quick_deoptimize_from_compiled_slow_path; + + // Read barrier + qpoints->pReadBarrierJni = ReadBarrierJni; }; } // namespace art