diff options
| author | 2017-07-14 10:28:42 +0000 | |
|---|---|---|
| committer | 2017-07-14 10:28:42 +0000 | |
| commit | bac2bd1c2fbdd94f4d4dfe83d8451f655e875e36 (patch) | |
| tree | 58ba3b1d28348da478a44234820ab6c485f5ed37 /compiler/utils/assembler_thumb_test.cc | |
| parent | 06410c093de2b8a21bdbd7dfd9ce324fd4e95c3f (diff) | |
| parent | 6d729a789d3d7771e13d9445ee0be1d9d48a81b5 (diff) | |
Merge "Introduce a Marking Register in ARM code generation."
Diffstat (limited to 'compiler/utils/assembler_thumb_test.cc')
| -rw-r--r-- | compiler/utils/assembler_thumb_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/utils/assembler_thumb_test.cc b/compiler/utils/assembler_thumb_test.cc index 4e9b619979..759ed38601 100644 --- a/compiler/utils/assembler_thumb_test.cc +++ b/compiler/utils/assembler_thumb_test.cc @@ -1643,6 +1643,10 @@ void EmitAndCheck(JniAssemblerType* assembler, const char* testname) { #define __ assembler. TEST_F(ArmVIXLAssemblerTest, VixlJniHelpers) { + // Run the test only with Baker read barriers, as the expected + // generated code contains a Marking Register refresh instruction. + TEST_DISABLED_WITHOUT_BAKER_READ_BARRIERS(); + const bool is_static = true; const bool is_synchronized = false; const bool is_critical_native = false; |