aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-04-14 16:52:23 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-04-14 16:52:23 +0200
commitea133cb0014b90af8124a3439716f79166b2cdbe (patch)
tree619f91ed468281aa093be007361ff50479d4e013 /erts/emulator
parentdf9141050afb4ba45af21db1a9de499cf9b1be8f (diff)
parent1a191c166c446b21f515429fc9987e5a7add5ae5 (diff)
downloadotp-ea133cb0014b90af8124a3439716f79166b2cdbe.tar.gz
otp-ea133cb0014b90af8124a3439716f79166b2cdbe.tar.bz2
otp-ea133cb0014b90af8124a3439716f79166b2cdbe.zip
Merge branch 'egil/fix-maps-match_spec-return/OTP-12656'
* egil/fix-maps-match_spec-return/OTP-12656: erts: Fix building of Map result from match_specs
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_db_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 0bf562d937..0fb1c397c9 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -2153,8 +2153,8 @@ restart:
break;
case matchMkFlatMap:
n = *pc++;
- ehp = HAllocX(build_proc, 1 + MAP_HEADER_FLATMAP_SZ + n, HEAP_XTRA);
- t = *ehp++ = *--esp;
+ ehp = HAllocX(build_proc, MAP_HEADER_FLATMAP_SZ + n, HEAP_XTRA);
+ t = *--esp;
{
flatmap_t *m = (flatmap_t *)ehp;
m->thing_word = MAP_HEADER_FLATMAP;