diff options
| author | Sverker Eriksson <[email protected]> | 2015-09-07 14:44:38 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-09-07 14:44:38 +0200 |
| commit | 0b629b6dcbedc1c889843cde784696353db32dba (patch) | |
| tree | 66ef2869a669f65f0219d0c9810c965ecdc82e35 /erts/emulator/beam/utils.c | |
| parent | c4dcde5c694b9795f58563cf72c0701af30ed866 (diff) | |
| parent | 6e75676652d87d78041a9db11b088b33ad7ef672 (diff) | |
| download | otp-0b629b6dcbedc1c889843cde784696353db32dba.tar.gz otp-0b629b6dcbedc1c889843cde784696353db32dba.tar.bz2 otp-0b629b6dcbedc1c889843cde784696353db32dba.zip | |
Merge branch 'sverk/trace-process_dump-matchstate' into maint
* sverk/trace-process_dump-matchstate:
erts: Add testcase for tracing whith 'process_dump'
erts: Fix bug when tracing with 'process_dump'
OTP-12968
Diffstat (limited to 'erts/emulator/beam/utils.c')
| -rw-r--r-- | erts/emulator/beam/utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index 342e91e983..e9d7c91ac9 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -844,7 +844,6 @@ Uint32 make_hash(Eterm term_arg) Eterm hash = 0; unsigned op; - /* Must not collide with the real tag_val_def's: */ #define MAKE_HASH_TUPLE_OP (FIRST_VACANT_TAG_DEF) #define MAKE_HASH_TERM_ARRAY_OP (FIRST_VACANT_TAG_DEF+1) #define MAKE_HASH_CDR_PRE_OP (FIRST_VACANT_TAG_DEF+2) |