diff options
author | Lukas Larsson <[email protected]> | 2012-06-04 11:34:42 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2012-06-04 11:34:42 +0200 |
commit | 9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (patch) | |
tree | 94058c8df73356197dca04da701d5b0402d12b59 /lib/hipe/main/hipe.erl | |
parent | 9d590cf3db1210882c82a82381a07ae8f9535f79 (diff) | |
parent | 5c2dad487e6af1a48fa3a1f3d985b6b891788bde (diff) | |
download | otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.tar.gz otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.tar.bz2 otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.zip |
Merge branch 'bjorn/remove-hybrid-heap/OTP-10105' into maint
* bjorn/remove-hybrid-heap/OTP-10105:
Remove stale code for hybrid heap and incremental GC
Remove the hipe_bifs:show_message_area/0 BIF
Remove support for erlang:system_info(global_heaps_size)
Remove the erlang:garbage_collect_message_area/0 BIF
Remove workarounds for hybrid and shared heaps in test suites
Diffstat (limited to 'lib/hipe/main/hipe.erl')
-rw-r--r-- | lib/hipe/main/hipe.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl index c73db872ac..b2789978a4 100644 --- a/lib/hipe/main/hipe.erl +++ b/lib/hipe/main/hipe.erl @@ -482,12 +482,7 @@ compile(Name, File, Opts0) when is_atom(Name) -> compile_core(Name, Core0, File, Opts) -> Core = cerl:from_records(Core0), - Core1 = case (erlang:system_info(heap_type) =:= hybrid) - andalso proplists:get_bool(hybrid, Opts) of - true -> cerl_hybrid_transform:transform(Core, Opts); - false -> Core - end, - compile(Name, Core1, File, Opts). + compile(Name, Core, File, Opts). %% @spec compile(Name, Core, File, options()) -> %% {ok, {Target, Binary}} | {error, Reason} |