aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-05-17 15:10:34 +0200
committerLukas Larsson <[email protected]>2016-05-17 15:10:34 +0200
commit08829107836e959e3ca619f591e07f8f912cafbc (patch)
tree3fd78de56814bf6624306ef9646f4cdbc151c063 /erts/emulator/beam
parent28f5de6eb21a4798b7033dc9d94e7b787fd4c0ce (diff)
parent0f04b36c15acd592a650936b039997feeb37a639 (diff)
downloadotp-08829107836e959e3ca619f591e07f8f912cafbc.tar.gz
otp-08829107836e959e3ca619f591e07f8f912cafbc.tar.bz2
otp-08829107836e959e3ca619f591e07f8f912cafbc.zip
Merge branch 'lukas/erts/max_heap_fix_erllvm/OTP-13174'
* lukas/erts/max_heap_fix_erllvm/OTP-13174: erts: Move max_heap_size field so that ErLLVM works again
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_process.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 2801947613..2fc6dfe194 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -960,7 +960,6 @@ struct process {
Uint heap_sz; /* Size of heap in words */
Uint min_heap_size; /* Minimum size of heap (in words). */
Uint min_vheap_size; /* Minimum size of virtual heap (in words). */
- Uint max_heap_size; /* Maximum size of heap (in words). */
#if !defined(NO_FPE_SIGNALS) || defined(HIPE)
volatile unsigned long fp_exception;
@@ -1061,6 +1060,7 @@ struct process {
Eterm *old_hend; /* Heap pointers for generational GC. */
Eterm *old_htop;
Eterm *old_heap;
+ Uint max_heap_size; /* Maximum size of heap (in words). */
Uint16 gen_gcs; /* Number of (minor) generational GCs. */
Uint16 max_gen_gcs; /* Max minor gen GCs before fullsweep. */
ErlOffHeap off_heap; /* Off-heap data updated by copy_struct(). */