diff options
| author | Sverker Eriksson <[email protected]> | 2016-07-05 19:09:16 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-07-05 19:09:16 +0200 |
| commit | a94f909586a7b69ba2f4539f4c40e3600cf705d2 (patch) | |
| tree | dbc999e7120a41fe7acb41f6d1b4afb001318cc3 /erts/emulator/hipe/hipe_process.h | |
| parent | 04bb724a572c78d775df2ec12a1694870369c3b4 (diff) | |
| parent | 520654d49d9f1c1548dc2a5800c7330001cd3064 (diff) | |
| download | otp-a94f909586a7b69ba2f4539f4c40e3600cf705d2.tar.gz otp-a94f909586a7b69ba2f4539f4c40e3600cf705d2.tar.bz2 otp-a94f909586a7b69ba2f4539f4c40e3600cf705d2.zip | |
Merge branch 'hipe-trap-gc/PR-1116/OTP-13724' into maint
* hipe-trap-gc/PR-1116:
hipe: Fix bug in trap frame allocation wrappers
hipe: Add assertion for gc in bif without wrapper
Diffstat (limited to 'erts/emulator/hipe/hipe_process.h')
| -rw-r--r-- | erts/emulator/hipe/hipe_process.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_process.h b/erts/emulator/hipe/hipe_process.h index 21c4239753..a8d5972280 100644 --- a/erts/emulator/hipe/hipe_process.h +++ b/erts/emulator/hipe/hipe_process.h @@ -52,6 +52,9 @@ struct hipe_process_state { #if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP) void (*bif_callee)(void); /* When calling BIF's via debug wrapper */ #endif +#ifdef DEBUG + UWord gc_is_unsafe; /* Nonzero when GC-required state is on stack */ +#endif }; extern void hipe_arch_print_pcb(struct hipe_process_state *p); @@ -68,6 +71,9 @@ static __inline__ void hipe_init_process(struct hipe_process_state *p) p->nra = NULL; #endif p->narity = 0; +#ifdef DEBUG + p->gc_is_unsafe = 0; +#endif } static __inline__ void hipe_delete_process(struct hipe_process_state *p) |