From 2d34363405f327e4883876f8917b6eeb127f5b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 22 Nov 2017 15:53:29 +0100
Subject: Fix broken to_dis after merge from maint to master

d8d07a7593d811 that added the to_dis option to the compiler no longer
works when merged to master.  That is because of 79f28cfd8df1b7
that removed some unused code in erts_debug.

Fix this by adding a new function erts_debug:dis_to_file/2 and
use it from compile module where we have access to the filename
(in beam_listing we only have an opened file).
---
 lib/compiler/src/beam_listing.erl | 13 -------------
 lib/compiler/src/compile.erl      | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'lib/compiler/src')

diff --git a/lib/compiler/src/beam_listing.erl b/lib/compiler/src/beam_listing.erl
index d1d00017e9..73c6501fe5 100644
--- a/lib/compiler/src/beam_listing.erl
+++ b/lib/compiler/src/beam_listing.erl
@@ -54,19 +54,6 @@ module(Stream, {Mod,Exp,Attr,Code,NumLabels}) ->
 			[Name, Arity, Entry]),
 	      io:put_chars(Stream, format_asm(Asm))
       end, Code);
-module(Stream, Code) when is_binary(Code) ->
-    #beam_file{ module = Module, compile_info = CInfo } = beam_disasm:file(Code),
-    Loaded = code:is_loaded(Module),
-    Sticky = code:is_sticky(Module),
-    [code:unstick_mod(Module) || Sticky],
-
-    {module, Module} = code:load_binary(Module, proplists:get_value(source, CInfo), Code),
-    ok = erts_debug:df(Stream, Module),
-
-    %% Restore loaded module
-    _ = [{module, Module} = code:load_file(Module) || Loaded =/= false],
-    [code:stick_mod(Module) || Sticky],
-    ok;
 module(Stream, [_|_]=Fs) ->
     %% Form-based abstract format.
     foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Fs).
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index f7beed430c..327fecf0e6 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -787,7 +787,7 @@ asm_passes() ->
      | binary_passes()].
 
 binary_passes() ->
-    [{iff,'to_dis',{listing,"dis"}},
+    [{iff,'to_dis',?pass(to_dis)},
      {native_compile,fun test_native/1,fun native_compile/2},
      {unless,binary,?pass(save_binary,not_werror)}
     ].
@@ -1766,6 +1766,21 @@ listing(LFun, Ext, Code, St) ->
 	    {error,St#compile{errors=St#compile.errors ++ Es}}
     end.
 
+to_dis(Code, #compile{module=Module,ofile=Outfile}=St) ->
+    Loaded = code:is_loaded(Module),
+    Sticky = code:is_sticky(Module),
+    _ = [code:unstick_mod(Module) || Sticky],
+
+    {module,Module} = code:load_binary(Module, "", Code),
+    DestDir = filename:dirname(Outfile),
+    DisFile = filename:join(DestDir, atom_to_list(Module) ++ ".dis"),
+    ok = erts_debug:dis_to_file(Module, DisFile),
+
+    %% Restore loaded module
+    _ = [{module, Module} = code:load_file(Module) || Loaded =/= false],
+    [code:stick_mod(Module) || Sticky],
+    {ok,Code,St}.
+
 output_encoding(F, #compile{encoding = none}) ->
     ok = io:setopts(F, [{encoding, epp:default_encoding()}]);
 output_encoding(F, #compile{encoding = Encoding}) ->
-- 
cgit v1.2.3