Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: runtime/vm/simulator_arm.cc

Issue 1574393002: Fix simarm and simmips builds on Mac. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/vm/simulator_mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/simulator_arm.cc
diff --git a/runtime/vm/simulator_arm.cc b/runtime/vm/simulator_arm.cc
index e06300639ec9267851eadadf76b879c6cb025e3a..b65ae800890376851eca09c0d21c08c9edec0eee 100644
--- a/runtime/vm/simulator_arm.cc
+++ b/runtime/vm/simulator_arm.cc
@@ -1174,8 +1174,10 @@ uword Simulator::CompareExchange(uword* address,
uint32_t Simulator::CompareExchangeUint32(uint32_t* address,
uint32_t compare_value,
uint32_t new_value) {
- ASSERT(sizeof(uword) == sizeof(uint32_t));
- return CompareExchange(address, compare_value, new_value);
+ COMPILE_ASSERT(sizeof(uword) == sizeof(uint32_t));
+ return CompareExchange(reinterpret_cast<uword*>(address),
+ static_cast<uword>(compare_value),
+ static_cast<uword>(new_value));
}
« no previous file with comments | « no previous file | runtime/vm/simulator_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698