aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe/main/hipe.erl
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-02-21 17:31:03 +0100
committerGustav Simonsson <[email protected]>2012-02-21 17:33:48 +0100
commitc53915f5c4e45c84aadfda2cfb7aae56709f1522 (patch)
treebc972f9d525ba6f8c457489f9d336a1d64641a43 /lib/hipe/main/hipe.erl
parent520ddbc83ec87bcec262680bd915184182e3998e (diff)
parent34f76104e4ce731f6b2e0969ade5e92e2bfddeae (diff)
downloadotp-c53915f5c4e45c84aadfda2cfb7aae56709f1522.tar.gz
otp-c53915f5c4e45c84aadfda2cfb7aae56709f1522.tar.bz2
otp-c53915f5c4e45c84aadfda2cfb7aae56709f1522.zip
Merge branch 'ks/compile_info-fix' into maint
* ks/compile_info-fix: compiler: Fix discrepancy in compile_info OTP-9917
Diffstat (limited to 'lib/hipe/main/hipe.erl')
-rw-r--r--lib/hipe/main/hipe.erl6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index 309d847374..1be679a13f 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -574,12 +574,8 @@ file(File, Options) when is_atom(File) ->
disasm(File) ->
case beam_disasm:file(File) of
#beam_file{labeled_exports = LabeledExports,
- compile_info = CompInfo0,
+ compile_info = CompInfo,
code = BeamCode} ->
- 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;