Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 23 insertions, 12 deletions

diff --git a/erts/preloaded/src/add_abstract_code b/erts/preloaded/src/add_abstract_code
index e670156d21..943987872e 100644
--- a/erts/preloaded/src/add_abstract_code
+++ b/erts/preloaded/src/add_abstract_code
@@ -4,18 +4,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -27,8 +28,18 @@
 main([BeamFile,AbstrFile]) ->
     {ok,_,Chunks0} = beam_lib:all_chunks(BeamFile),
     {ok,Abstr} = file:consult(AbstrFile),
-    Chunks = lists:keyreplace("Abst", 1, Chunks0,
-			      {"Abst",term_to_binary({raw_abstract_v1,Abstr})}),
+    Chunks1 = lists:keyreplace("Abst", 1, Chunks0,
+			       {"Abst",term_to_binary({raw_abstract_v1,Abstr})}),
+    {"CInf",CInf0} = lists:keyfind("CInf", 1, Chunks1),
+    CInf = fix_options(CInf0),
+    Chunks = lists:keyreplace("CInf", 1, Chunks1, {"CInf",CInf}),
     {ok,Module} = beam_lib:build_module(Chunks),
     ok = file:write_file(BeamFile, Module),
     init:stop().
+
+fix_options(CInf0) ->
+    CInf1 = binary_to_term(CInf0),
+    {options,Opts0} = lists:keyfind(options, 1, CInf1),
+    Opts = Opts0 -- [from_asm],
+    CInf = lists:keyreplace(options, 1, CInf1, {options,Opts}),
+    term_to_binary(CInf).