Bug 1486882 - make TestPoisonArea work with aarch64 windows; r=Waldo
authorNathan Froyd <froydnj@mozilla.com>
Wed, 29 Aug 2018 14:47:49 -0400
changeset 491732 4ad9205ce6c1d673c65f97a6d02b21d86a28c29b
parent 491731 46011d6f389df1f1f41a862c73e59b1716e92e55
child 491733 034adef609b91e0c2dc2c353dcb5d5dc9ff18a40
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersWaldo
bugs1486882
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1486882 - make TestPoisonArea work with aarch64 windows; r=Waldo We already have the AArch64 return instruction; we just need to check for the Windows-specific preprocessor conditional.
mfbt/tests/TestPoisonArea.cpp
--- a/mfbt/tests/TestPoisonArea.cpp
+++ b/mfbt/tests/TestPoisonArea.cpp
@@ -152,17 +152,17 @@
 #endif
 
 #elif defined __s390__
 #define RETURN_INSTR 0x07fe0000 /* br %r14 */
 
 #elif defined __sh__
 #define RETURN_INSTR 0x0b000b00 /* rts; rts */
 
-#elif defined __aarch64__
+#elif defined __aarch64__ || defined _M_ARM64
 #define RETURN_INSTR 0xd65f03c0 /* ret */
 
 #elif defined __ia64
 struct ia64_instr { uint32_t mI[4]; };
 static const ia64_instr _return_instr =
   {{ 0x00000011, 0x00000001, 0x80000200, 0x00840008 }}; /* br.ret.sptk.many b0 */
 
 #define RETURN_INSTR _return_instr