summaryrefslogtreecommitdiff
path: root/runtime/entrypoints_order_test.cc
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2015-12-15 12:39:34 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-12-15 12:39:34 +0000
commit089ff4886aa9b5e7cec04d2ef5cdeb9d68e5dc43 (patch)
tree84ad42399e1055f3596d7df6f786d9f7b8605ee3 /runtime/entrypoints_order_test.cc
parentbd00c8226ebc28d2745ac4d0408b11c156771773 (diff)
parent7c1559a06041c9c299d5ab514d54b2102f204a84 (diff)
Merge "x86 Baker's read barrier fast path implementation."
Diffstat (limited to 'runtime/entrypoints_order_test.cc')
-rw-r--r--runtime/entrypoints_order_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc
index 391eb72e1c..dc9f14c5f2 100644
--- a/runtime/entrypoints_order_test.cc
+++ b/runtime/entrypoints_order_test.cc
@@ -318,7 +318,8 @@ class EntrypointsOrderTest : public CommonRuntimeTest {
sizeof(void*));
EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pNewStringFromStringBuilder, pReadBarrierJni,
sizeof(void*));
- EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pReadBarrierJni, pReadBarrierSlow, sizeof(void*));
+ EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pReadBarrierJni, pReadBarrierMark, sizeof(void*));
+ EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pReadBarrierMark, pReadBarrierSlow, sizeof(void*));
EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pReadBarrierSlow, pReadBarrierForRootSlow,
sizeof(void*));