diff options
| author | Lukas Larsson <[email protected]> | 2016-10-12 16:29:01 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-10-12 16:29:01 +0200 |
| commit | 885599a603fdf33f04125b6052f73d7c8e193d70 (patch) | |
| tree | 9b0fd2da5ab637fa9f228a4384021a3312bc5d2a /erts/emulator/beam/error.h | |
| parent | 83801d03ae4e3e157862eb51179c4c154795f976 (diff) | |
| parent | c283f299551d53b62027ae1a8b189285c57573e8 (diff) | |
| download | otp-885599a603fdf33f04125b6052f73d7c8e193d70.tar.gz otp-885599a603fdf33f04125b6052f73d7c8e193d70.tar.bz2 otp-885599a603fdf33f04125b6052f73d7c8e193d70.zip | |
Merge branch 'lukas/erts/beam_func_info_struct/OTP-13821'
* lukas/erts/beam_func_info_struct/OTP-13821:
erts: Fix some dtrace related compile issues
erts: Refactor rename Export.code[] to Export.beam[]
erts: Improve printouts for some etp commands
erts: Fix erts_debug:df with new func_info
erts: Refactor find_function_from_pc to return MFA
erts: Refactor out func_info into struct
Diffstat (limited to 'erts/emulator/beam/error.h')
| -rw-r--r-- | erts/emulator/beam/error.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/error.h b/erts/emulator/beam/error.h index 6c33b12dd0..e431c3051b 100644 --- a/erts/emulator/beam/error.h +++ b/erts/emulator/beam/error.h @@ -21,6 +21,8 @@ #ifndef __ERROR_H__ #define __ERROR_H__ +#include "code_ix.h" + /* * There are three primary exception classes: * @@ -197,7 +199,7 @@ struct StackTrace { Eterm header; /* bignum header - must be first in struct */ Eterm freason; /* original exception reason is saved in the struct */ BeamInstr* pc; - BeamInstr* current; + ErtsCodeMFA* current; int depth; /* number of saved pointers in trace[] */ BeamInstr *trace[1]; /* varying size - must be last in struct */ }; |