diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-26 19:56:51 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-11-26 19:56:51 +0100 |
| commit | 4e91911aec363d21ea2d6ff7d5f8e1888b0aa8f9 (patch) | |
| tree | 5b151ec5340a85af698ae3bceb21a2a8ab390548 /erts/emulator/beam/bif.c | |
| parent | a89f1cd881396fc6445b7d790ee2f5b7ae5a6031 (diff) | |
| parent | 949de78331b9c4ecb9c628bb651cecb113790e2e (diff) | |
| download | otp-4e91911aec363d21ea2d6ff7d5f8e1888b0aa8f9.tar.gz otp-4e91911aec363d21ea2d6ff7d5f8e1888b0aa8f9.tar.bz2 otp-4e91911aec363d21ea2d6ff7d5f8e1888b0aa8f9.zip | |
Merge branch 'sverk/setnode-rename-bug/OTP-13076' into maint
* sverk/setnode-rename-bug/OTP-13076:
erts: Fix bug in setnode/2
erts: Remove ERTS_PSD_DIST_ENTRY
erts: Remove faulty ASSERT in erts_proc_*_refc
Diffstat (limited to 'erts/emulator/beam/bif.c')
| -rw-r--r-- | erts/emulator/beam/bif.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index 0bd46a2dae..a8cc19ee1f 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -4231,6 +4231,7 @@ BIF_RETTYPE list_to_pid_1(BIF_ALIST_1) goto bad; enp = erts_find_or_insert_node(dep->sysname, dep->creation); + ASSERT(enp != erts_this_node); etp = (ExternalThing *) HAlloc(BIF_P, EXTERNAL_THING_HEAD_SIZE + 1); etp->header = make_external_pid_header(1); |