Merge pull request #2392 from fenollp/nohipe

drop deprecated HiPE compilation

(cherry picked from commit b7cbd44)

Makefile

@@ -64,24 +64,6 @@ define PROJECT_ENV
 	                          {exit_on_close, false}
 	                         ]},
 	    {halt_on_upgrade_failure, true},
-	    {hipe_compile, false},
-	    %% see bug 24513 [in legacy Bugzilla] for how this list was created
-	    {hipe_modules,
-	     [rabbit_reader, rabbit_channel, gen_server2, rabbit_exchange,
-	      rabbit_command_assembler, rabbit_framing_amqp_0_9_1, rabbit_basic,
-	      rabbit_event, lists, queue, priority_queue, rabbit_router,
-	      rabbit_trace, rabbit_misc, rabbit_binary_parser,
-	      rabbit_exchange_type_direct, rabbit_guid, rabbit_net,
-	      rabbit_amqqueue_process, rabbit_variable_queue,
-	      rabbit_binary_generator, rabbit_writer, delegate, gb_sets, lqueue,
-	      sets, orddict, rabbit_amqqueue, rabbit_limiter, gb_trees,
-	      rabbit_queue_index, rabbit_exchange_decorator, gen, dict, ordsets,
-	      file_handle_cache, rabbit_msg_store, array,
-	      rabbit_msg_store_ets_index, rabbit_msg_file,
-	      rabbit_exchange_type_fanout, rabbit_exchange_type_topic, mnesia,
-	      mnesia_lib, rpc, mnesia_tm, qlc, sofs, proplists, credit_flow,
-	      pmon, ssl_connection, tls_connection, ssl_record, tls_record,
-	      gen_fsm, ssl]},
 	    {ssl_apps, [asn1, crypto, public_key, ssl]},
 	    %% see rabbitmq-server#114
 	    {mirroring_flow_control, true},

docs/rabbitmq.conf.example

@@ -466,12 +466,6 @@
 ## NB: Change these only if you understand what you are doing!
 ##
 
-## Explicitly enable/disable hipe compilation. This option is deprecated
-## because HiPE supported has been
-## effectively discontinued in Erlang 22.
-##
-# hipe_compile = false
-
 ## Timeout used when waiting for Mnesia tables in a cluster to
 ## become available.
 ##

docs/rabbitmqctl.8

@@ -2084,29 +2084,6 @@ to the connected client:
 .Pp
 Evaluates an Erlang expression on the target node
 .\" ------------------------------------------------------------------
-.It Cm hipe_compile Ar directory
-.Pp
-Performs HiPE-compilation and caches resulting
-.Pa .beam Ns -files in the given directory.
-.Pp
-Parent directories are created if necessary.
-Any existing
-.Pa .beam
-files from the directory are automatically deleted prior to compilation.
-.Pp
-To use this precompiled files, you should set
-.Ev RABBITMQ_SERVER_CODE_PATH
-environment variable to directory specified in
-.Cm hipe_compile
-invocation.
-.Pp
-For example, to HiPE-compile modules and store them to
-.Pa /tmp/rabbit-hipe/ebin
-directory:
-.sp
-.Dl rabbitmqctl hipe_compile /tmp/rabbit-hipe/ebin
-.El
-.\" ------------------------------------------------------------------
 .\" ## Queue Operations
 .\" ------------------------------------------------------------------
 .Ss Queue Operations

priv/schema/rabbit.schema

@@ -1070,6 +1070,8 @@ end}.
 %% Explicitly enable/disable hipe compilation.
 %%
 %% {hipe_compile, true},
+%%
+%% DEPRECATED: this is a no-op and is kept only to allow old configs.
 
 {mapping, "hipe_compile", "rabbit.hipe_compile",
     [{datatype, {enum, [true, false]}}]}.

src/rabbit.erl

@@ -353,15 +353,7 @@ run_prelaunch_second_phase() ->
     %% 3. Logging.
     ok = rabbit_prelaunch_logging:setup(Context),
 
-    case IsInitialPass of
-        true ->
-            %% 4. HiPE compilation.
-            ok = rabbit_prelaunch_hipe:setup(Context);
-        false ->
-            ok
-    end,
-
-    %% 5. Clustering.
+    %% 4. Clustering.
     ok = rabbit_prelaunch_cluster:setup(Context),
 
     %% Start Mnesia now that everything is ready.