aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2015-02-03 08:13:35 +0100
committerBjörn Gustavsson <bjorn@erlang.org>2015-02-03 08:13:35 +0100
commitc8bbf52191e3c87eedde061051eebcd02dbb7fd5 (patch)
tree79d5b18ff06548c6b42f969dd3c93a2998c7ad52 /bootstrap/lib
parent92a0424a0ece205072516e97086b5986986dca37 (diff)
parent0fee86f864a4ba2a7a363927a50c81c43994ca9a (diff)
downloadotp-c8bbf52191e3c87eedde061051eebcd02dbb7fd5.tar.gz
otp-c8bbf52191e3c87eedde061051eebcd02dbb7fd5.tar.bz2
otp-c8bbf52191e3c87eedde061051eebcd02dbb7fd5.zip
Merge branch 'maint'
* maint: Update primary bootstrap Be more careful about map patterns when evalutating element/2 Do not convert map patterns to map expressions Conflicts: bootstrap/lib/compiler/ebin/sys_core_fold.beam lib/compiler/test/match_SUITE.erl
Diffstat (limited to 'bootstrap/lib')
-rw-r--r--bootstrap/lib/compiler/ebin/sys_core_fold.beambin50312 -> 50220 bytes
-rw-r--r--bootstrap/lib/kernel/ebin/hipe_unified_loader.beambin13516 -> 13472 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
index a4cc323218..60ac13b7d1 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_fold.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
Binary files differ
diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
index 6df9ac9564..e6d96c6ecb 100644
--- a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
+++ b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
Binary files differ