summaryrefslogtreecommitdiff
path: root/erts/emulator/beam
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'john/jit/fix-tracing-non-native-stack/OTP-18561' into maintJohn Högberg2023-05-111-6/+15
|\
| * jit: Fix tracing for non-native stackJohn Högberg2023-04-241-6/+15
* | Merge branch 'maint-25' into maintSverker Eriksson2023-05-051-1/+1
|\ \
| * | Update copyright yearErlang/OTP2023-05-041-1/+1
* | | Merge branch 'sverker/25/erts/hashmap-collision-nodes/OTP-18569' into maintSverker Eriksson2023-05-021-12/+7
|\ \ \
| * \ \ Merge branch 'sverker/24/erts/hashmap-collision-nodes/OTP-18569'Sverker Eriksson2023-04-271-12/+7
| |\ \ \
| | * | | erts: Remove dead codeSverker Eriksson2023-04-271-12/+7
* | | | | Merge branch 'rickard/creation-fix/25.3.1/OTP-18570' into maintRickard Green2023-04-303-0/+33
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'rickard/creation-fix/24.3.4/OTP-18570' into rickard/creation-fi...Rickard Green2023-04-293-0/+33
| |\ \ \ \
| | * \ \ \ Merge branch 'rickard/creation-fix/23.3.4/OTP-18570' into rickard/creation-fi...Rickard Green2023-04-293-0/+33
| | |\ \ \ \
| | | * | | | [erts] ensure no mix of external and internal identifiersRickard Green2023-04-293-0/+33
* | | | | | | Merge branch 'maint-25' into maintJakub Witczak2023-04-275-5/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update copyright yearErlang/OTP2023-04-257-7/+7
| * | | | | | Merge branch 'bjorn/erts/utf32/25/OTP-18560' into maint-25Erlang/OTP2023-04-253-0/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rickard/no-native-atomics-fix/GH-7114/OTP-18563' into maint-25Erlang/OTP2023-04-251-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rickard/mon-link-dbg-fix' into maint-25Erlang/OTP2023-04-251-6/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rickard/aliasmonitor-fix/25.3/OTP-18557' into maint-25Erlang/OTP2023-04-253-5/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-ic-dc-config-test/OTP-18554' into maint-25Erlang/OTP2023-04-251-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-overlapping-code-barriers-25/OTP-18553' into main...Erlang/OTP2023-04-251-6/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/driver-call-callback-fix/24.3.4/OTP-18525' into maint-25Erlang/OTP2023-04-251-16/+28
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/25/erts/hashmap-collision-nodes' into maintSverker Eriksson2023-04-2611-437/+736
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'sverker/24/erts/hashmap-collision-nodes' into sverker/25/erts/h...Sverker Eriksson2023-04-2611-437/+736
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | erts: Implement hashmap collision nodesSverker Eriksson2023-04-267-335/+623
| | * | | | | | | | | | | erts: Fix/optimize macro arityvalSverker Eriksson2023-04-261-1/+1
| | * | | | | | | | | | | erts: Simplify map hashingJohn Högberg2023-04-264-38/+39
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'bjorn/erts/utf32/25/OTP-18560' into maintBjörn Gustavsson2023-04-253-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Eliminate crash in matching of utf32 segmentBjörn Gustavsson2023-04-243-0/+14
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rickard/no-native-atomics-fix/GH-7114/OTP-18563' into maintRickard Green2023-04-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | [erts] Fix build without native atomicsRickard Green2023-04-241-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rickard/mon-link-dbg-fix' into maintRickard Green2023-04-241-6/+16
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | [erts] Fix debug functionalty for monitors/linksRickard Green2023-04-121-6/+16
| |/ / / / / / / /
* | | | | | | | | Merge branch 'maint-24' into maintJakub Witczak2023-04-212-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update copyright yearErlang/OTP2023-04-204-4/+4
| * | | | | | | | | Merge branch 'rickard/aliasmonitor-fix/24.3/OTP-18557' into maint-24Erlang/OTP2023-04-203-5/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sverker/dist-entry-bug-node-down/OTP-18243' into maint-24Erlang/OTP2023-04-201-10/+15
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/24.3.4.9/erts/decode-unsorted-smallmap-in-hashmap/OTP-1...Erlang/OTP2023-04-201-59/+61
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/23/erts/decode-unsorted-smallmap-in-hashmap/OTP-18343'Sverker Eriksson2023-03-231-59/+61
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/driver-call-callback-fix/24.3.4/OTP-18525' into maint-24Erlang/OTP2023-04-201-16/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Update copyright yearErlang/OTP2023-03-173-3/+3
| * | | | | | | | | | | | | Merge branch 'rickard/alias-cleanup-fix/24.3/GH-6947/OTP-18496' into maint-24Erlang/OTP2023-03-174-1/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rickard/aliasmonitor-fix/25.3/OTP-18557' into maintSverker Eriksson2023-04-193-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'rickard/aliasmonitor-fix/24.3/OTP-18557' into rickard/aliasmoni...Rickard Green2023-04-183-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | / / / / / / | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | [erts] Fix erroneous removal of alias from alias tableRickard Green2023-04-183-5/+8
| | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'john/erts/fix-ic-dc-config-test/OTP-18554' into maintJohn Högberg2023-04-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | erts: Fix ic/dc config tests and usageJohn Högberg2023-04-141-3/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'john/erts/fix-overlapping-code-barriers-25/OTP-18553' into maintJohn Högberg2023-04-111-6/+17
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | erts: Fix overlapping blocking code barriers in the same tickJohn Högberg2023-04-111-6/+17
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rickard/driver-call-callback-fix/24.3.4/OTP-18525' into maintRickard Green2023-03-231-16/+28
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Merge branch 'rickard/driver-call-callback-fix/23.3.4/OTP-18525' into rickard...Rickard Green2023-03-201-16/+28
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | [erts] Fix error case for driver call callbackRickard Green2023-03-201-16/+28
| | | |_|_|_|_|/ | | |/| | | | |