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

Unified Diff: runtime/vm/os_macos.cc

Issue 1413643004: Fix CPU features detection and stack alignment assert on iOS (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Address CL concerns Created 5 years, 2 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
« runtime/vm/cpu_arm.cc ('K') | « runtime/vm/cpu_arm.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/os_macos.cc
diff --git a/runtime/vm/os_macos.cc b/runtime/vm/os_macos.cc
index aed5d33529bbc28a7e0268d76fc87dd3d80853e6..362ad0165764684b56b3b708d2a4dac9c60679ed 100644
--- a/runtime/vm/os_macos.cc
+++ b/runtime/vm/os_macos.cc
@@ -141,9 +141,19 @@ void OS::AlignedFree(void* ptr) {
intptr_t OS::ActivationFrameAlignment() {
+#if TARGET_OS_IOS
+#if TARGET_ARCH_ARM
+ // Even if we generate code that maintains a strong alignment, we cannot
+ // assert the stronger stack alignment because C++ code will not maintain it.
+ return 8;
+#elif TARGET_ARCH_ARM64
+ return 16;
+#endif
+#else // TARGET_OS_IOS
// OS X activation frames must be 16 byte-aligned; see "Mac OS X ABI
// Function Call Guide".
return 16;
+#endif // TARGET_OS_IOS
}
« runtime/vm/cpu_arm.cc ('K') | « runtime/vm/cpu_arm.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698