From 9235e35937542be058f6f1fd7292a29cbb40ca92 Mon Sep 17 00:00:00 2001 From: vsadov Date: Sun, 14 Apr 2019 11:02:35 -0700 Subject: [PATCH] Adjust plug_size_to_fit to consider large alignment om ARM32 Commit migrated from https://github.com/dotnet/coreclr/commit/b56d39c5812db4780c818140083cf753aca8ca5a --- src/coreclr/src/gc/gc.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/coreclr/src/gc/gc.cpp b/src/coreclr/src/gc/gc.cpp index 9d909f1..f71a320 100644 --- a/src/coreclr/src/gc/gc.cpp +++ b/src/coreclr/src/gc/gc.cpp @@ -8842,6 +8842,10 @@ public: plug_size_to_fit += (pad_in_front ? Align(min_obj_size) : 0); #endif //SHORT_PLUGS +#ifdef RESPECT_LARGE_ALIGNMENT + plug_size_to_fit += switch_alignment_size(FALSE); +#endif //RESPECT_LARGE_ALIGNMENT + int plug_power2 = index_of_highest_set_bit (round_up_power2 (plug_size_to_fit + Align(min_obj_size))); ptrdiff_t i; uint8_t* new_address = 0; -- 2.7.4