Skip to content

Commit cac375a

Browse files
aamCommit Queue
authored andcommitted
Revert "[vm] Fix clobbered THR/R14 in StoreReleaseLoadAcquire[1204] tests."
This reverts commit e08ce93. Reason for revert: broken bot Original change's description: > [vm] Fix clobbered THR/R14 in StoreReleaseLoadAcquire[1204] tests. > > TEST=ci > Change-Id: I8297d630b47c422b420d3d3bc8d2a6876d446eaf > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/397421 > Commit-Queue: Ryan Macnak <[email protected]> > Reviewed-by: Alexander Aprelev <[email protected]> Change-Id: Ib7ffbc3fb6ac59918636d75e302f0a09095e5b2d No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/397402 Commit-Queue: Ryan Macnak <[email protected]> Reviewed-by: Ryan Macnak <[email protected]>
1 parent e08ce93 commit cac375a

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

runtime/vm/compiler/assembler/assembler_x64_test.cc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6229,10 +6229,12 @@ IMMEDIATE_TEST(AddrImmRAXByte,
62296229
__ popq(RAX))
62306230

62316231
ASSEMBLER_TEST_GENERATE(StoreReleaseLoadAcquire, assembler) {
6232-
// On TSAN builds StoreRelease/LoadAcquire will do a runtime
6233-
// call to tell TSAN about our action.
6234-
__ pushq(THR);
6235-
__ MoveRegister(THR, CallingConventions::kArg2Reg);
6232+
if (FLAG_target_thread_sanitizer) {
6233+
// On TSAN builds StoreRelease/LoadAcquire will do a runtime
6234+
// call to tell TSAN about our action.
6235+
__ MoveRegister(THR, CallingConventions::kArg2Reg);
6236+
}
6237+
62366238
__ pushq(RCX);
62376239
__ xorq(RCX, RCX);
62386240
__ pushq(RCX);
@@ -6297,7 +6299,6 @@ ASSEMBLER_TEST_GENERATE(StoreReleaseLoadAcquire, assembler) {
62976299
__ LoadAcquireFromOffset(CallingConventions::kReturnReg, RSP, 0);
62986300
__ popq(RCX);
62996301
__ popq(RCX);
6300-
__ popq(THR);
63016302
__ ret();
63026303
}
63036304

@@ -6307,10 +6308,12 @@ ASSEMBLER_TEST_RUN(StoreReleaseLoadAcquire, test) {
63076308
}
63086309

63096310
ASSEMBLER_TEST_GENERATE(StoreReleaseLoadAcquire1024, assembler) {
6310-
// On TSAN builds StoreRelease/LoadAcquire will do a runtime
6311-
// call to tell TSAN about our action.
6312-
__ pushq(THR);
6313-
__ MoveRegister(THR, CallingConventions::kArg2Reg);
6311+
if (FLAG_target_thread_sanitizer) {
6312+
// On TSAN builds StoreRelease/LoadAcquire will do a runtime
6313+
// call to tell TSAN about our action.
6314+
__ MoveRegister(THR, CallingConventions::kArg2Reg);
6315+
}
6316+
63146317
__ pushq(RCX);
63156318
__ xorq(RCX, RCX);
63166319
__ pushq(RCX);
@@ -6320,7 +6323,6 @@ ASSEMBLER_TEST_GENERATE(StoreReleaseLoadAcquire1024, assembler) {
63206323
__ addq(RSP, Immediate(1024));
63216324
__ popq(RCX);
63226325
__ popq(RCX);
6323-
__ popq(THR);
63246326
__ ret();
63256327
}
63266328

0 commit comments

Comments
 (0)