Merge branch 'bjorn/compiler/options/OTP-9752'

* bjorn/compiler/options/OTP-9752:
  filename documentation: Recommend against using filename:find_src/1,2
  Teach filename:find_src/1,2 to handle slim or stripped BEAM files
  filename: Eliminate failing call to Mod:module_info(source_file)
  filename.erl:filter_options/1: Remove handling of dead options
  compiler: Don't include {cwd,_} in module_info(compile)
  compiler: Don't include source code options in module_info(compile)
  hipe: Teach hipe to handle slim or stripped BEAM files

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index e382085fa5..7694b2fd95 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -574,9 +574,13 @@ file(File, Options) when is_atom(File) ->
 disasm(File) ->
   case beam_disasm:file(File) of
     #beam_file{labeled_exports = LabeledExports,
-	       compile_info = CompInfo,
+	       compile_info = CompInfo0,
 	       code = BeamCode} ->
-      {options, CompOpts} = lists:keyfind(options, 1, CompInfo),
+      CompInfo = case CompInfo0 of
+		   none -> [];
+		   _ -> CompInfo0
+		 end,
+      CompOpts = proplists:get_value(options, CompInfo, []),
       HCompOpts = case lists:keyfind(hipe, 1, CompOpts) of
 		    {hipe, L} when is_list(L) -> L;
 		    {hipe, X} -> [X];