Skip to content

Commit 8f41c91

Browse files
alexmarkovCommit Queue
authored andcommitted
[vm] Fix msvc build
Use standard constant instead of gcc/clang specific extension. TEST=ci Change-Id: I4b6a8e2ad62f180bebac39c90fff62cd60857d2d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/444440 Reviewed-by: Alexander Aprelev <[email protected]> Commit-Queue: Alexander Markov <[email protected]>
1 parent 1265d25 commit 8f41c91

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

runtime/vm/compiler/assembler/assembler_arm64.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ void Assembler::TsanLoadAcquire(Register dst, Register addr, OperandSize size) {
296296
ReserveAlignedFrameSpace(0);
297297

298298
MoveRegister(R0, addr);
299-
LoadImmediate(R1, __ATOMIC_ACQUIRE);
299+
LoadImmediate(R1, static_cast<int64_t>(std::memory_order_acquire));
300300

301301
mov(CSP, SP);
302302
switch (size) {
@@ -337,7 +337,7 @@ void Assembler::TsanStoreRelease(Register src,
337337
MoveRegister(R0, addr);
338338
MoveRegister(R1, src);
339339
}
340-
LoadImmediate(R2, __ATOMIC_RELEASE);
340+
LoadImmediate(R2, static_cast<int64_t>(std::memory_order_release));
341341

342342
switch (size) {
343343
case kEightBytes:

runtime/vm/compiler/assembler/assembler_riscv.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3105,7 +3105,7 @@ void Assembler::TsanLoadAcquire(Register dst,
31053105
ReserveAlignedFrameSpace(0);
31063106

31073107
AddImmediate(A0, addr.base(), addr.offset());
3108-
LoadImmediate(A1, __ATOMIC_ACQUIRE);
3108+
LoadImmediate(A1, static_cast<intx_t>(std::memory_order_acquire));
31093109

31103110
switch (size) {
31113111
case kEightBytes:
@@ -3156,7 +3156,7 @@ void Assembler::TsanStoreRelease(Register src,
31563156
AddImmediate(A0, addr.base(), addr.offset());
31573157
MoveRegister(A1, src);
31583158
}
3159-
LoadImmediate(A2, __ATOMIC_RELEASE);
3159+
LoadImmediate(A2, static_cast<intx_t>(std::memory_order_release));
31603160

31613161
switch (size) {
31623162
case kEightBytes:

runtime/vm/compiler/assembler/assembler_x64.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,7 +2135,8 @@ void Assembler::TsanLoadAcquire(Register dst, Address addr, OperandSize size) {
21352135
ReserveAlignedFrameSpace(0);
21362136

21372137
leaq(CallingConventions::kArg1Reg, addr);
2138-
LoadImmediate(CallingConventions::kArg2Reg, __ATOMIC_ACQUIRE);
2138+
LoadImmediate(CallingConventions::kArg2Reg,
2139+
static_cast<int64_t>(std::memory_order_acquire));
21392140

21402141
switch (size) {
21412142
case kEightBytes:
@@ -2182,7 +2183,8 @@ void Assembler::TsanStoreRelease(Register src, Address addr, OperandSize size) {
21822183
leaq(CallingConventions::kArg1Reg, addr);
21832184
MoveRegister(CallingConventions::kArg2Reg, src);
21842185
}
2185-
LoadImmediate(CallingConventions::kArg3Reg, __ATOMIC_RELEASE);
2186+
LoadImmediate(CallingConventions::kArg3Reg,
2187+
static_cast<int64_t>(std::memory_order_release));
21862188

21872189
switch (size) {
21882190
case kEightBytes:

0 commit comments

Comments
 (0)