diff options
author | Koundinya Veluri <kouvel@microsoft.com> | 2016-04-14 19:52:55 -0700 |
---|---|---|
committer | Koundinya Veluri <kouvel@microsoft.com> | 2016-04-15 01:26:36 -0700 |
commit | faa782a20b738a9c9921bf54c29c229f4078748d (patch) | |
tree | adaeee4a5de61d32e2f4e1adaae585b9547df0fa /src/gc/gcpriv.h | |
parent | 3ad8f15af54add9dcc3ecb8b89f3b9a82c65bef3 (diff) | |
download | coreclr-faa782a20b738a9c9921bf54c29c229f4078748d.tar.gz coreclr-faa782a20b738a9c9921bf54c29c229f4078748d.tar.bz2 coreclr-faa782a20b738a9c9921bf54c29c229f4078748d.zip |
Fix assertion failure on ARM
StompWriteBarrierEphemeral may be called on the init path, where the runtime is technically not suspended, but has not started yet. Added a check for g_fEEInit in the call.
Diffstat (limited to 'src/gc/gcpriv.h')
-rw-r--r-- | src/gc/gcpriv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gc/gcpriv.h b/src/gc/gcpriv.h index bfb6f8146d..64f37c5d35 100644 --- a/src/gc/gcpriv.h +++ b/src/gc/gcpriv.h @@ -1663,7 +1663,7 @@ protected: PER_HEAP void reset_write_watch (BOOL concurrent_p); PER_HEAP - void adjust_ephemeral_limits (); + void adjust_ephemeral_limits (bool is_runtime_suspended); PER_HEAP void make_generation (generation& gen, heap_segment* seg, uint8_t* start, uint8_t* pointer); |