hipe_llvm: Syntax compatibility with 3.7-3.8

3 files changed, 55 insertions, 21 deletions

diff --git a/lib/hipe/llvm/hipe_llvm.erl b/lib/hipe/llvm/hipe_llvm.erl
index 5e33731a2b..b2997f2d92 100644
--- a/lib/hipe/llvm/hipe_llvm.erl
+++ b/lib/hipe/llvm/hipe_llvm.erl
@@ -234,7 +234,7 @@
     function_arg_type_list/1
   ]).
 
--export([pp_ins_list/2, pp_ins/2]).
+-export([pp_ins_list/3, pp_ins/3]).
 
 
 %%-----------------------------------------------------------------------------
@@ -765,13 +765,17 @@ function_arg_type_list(#llvm_fun{arg_type_list=Arg_type_list}) ->
 %% Pretty-printer Functions
 %%----------------------------------------------------------------------------
 
-%% @doc Pretty-print a list of LLVM instructions to a Device.
-pp_ins_list(_Dev, []) -> ok;
-pp_ins_list(Dev, [I|Is]) ->
-  pp_ins(Dev, I),
-  pp_ins_list(Dev, Is).
+-type llvm_version() :: {Major :: integer(), Minor :: integer()}.
 
-pp_ins(Dev, I) ->
+%% @doc Pretty-print a list of LLVM instructions to a Device, using syntax
+%% compatible with LLVM v. Major.Minor
+-spec pp_ins_list(file:io_device(), llvm_version(), [llvm_instr()]) -> ok.
+pp_ins_list(_Dev, _Ver, []) -> ok;
+pp_ins_list(Dev, Ver={_,_}, [I|Is]) ->
+  pp_ins(Dev, Ver, I),
+  pp_ins_list(Dev, Ver, Is).
+
+pp_ins(Dev, Ver, I) ->
   case indent(I) of
     true  -> write(Dev, "  ");
     false -> ok
@@ -861,6 +865,10 @@ pp_ins(Dev, I) ->
         true -> write(Dev, "volatile ");
         false -> ok
       end,
+      case Ver >= {3,7} of false -> ok; true ->
+	  pp_type(Dev, pointer_type(load_p_type(I))),
+	  write(Dev, ", ")
+      end,
       pp_type(Dev, load_p_type(I)),
       write(Dev, [" ", load_pointer(I), " "]),
       case load_alignment(I) of
@@ -897,6 +905,10 @@ pp_ins(Dev, I) ->
         true -> write(Dev, "inbounds ");
         false -> ok
       end,
+      case Ver >= {3,7} of false -> ok; true ->
+	  pp_type(Dev, pointer_type(getelementptr_p_type(I))),
+	  write(Dev, ", ")
+      end,
       pp_type(Dev, getelementptr_p_type(I)),
       write(Dev, [" ", getelementptr_value(I)]),
       pp_typed_idxs(Dev, getelementptr_typed_idxs(I)),
@@ -958,12 +970,16 @@ pp_ins(Dev, I) ->
       pp_args(Dev, fun_def_arglist(I)),
       write(Dev, ") "),
       pp_options(Dev, fun_def_fn_attrs(I)),
+      case Ver >= {3,7} of false -> ok; true ->
+	  write(Dev, "personality i32 (i32, i64, i8*,i8*)* "
+		"@__gcc_personality_v0 ")
+      end,
       case fun_def_align(I) of
         [] -> ok;
         N -> write(Dev, ["align ", N])
       end,
       write(Dev, "{\n"),
-      pp_ins_list(Dev, fun_def_body(I)),
+      pp_ins_list(Dev, Ver, fun_def_body(I)),
       write(Dev, "}\n");
     #llvm_fun_decl{} ->
       write(Dev, "declare "),
@@ -992,8 +1008,12 @@ pp_ins(Dev, I) ->
       pp_type(Dev, const_decl_type(I)),
       write(Dev, [" ", const_decl_value(I), "\n"]);
     #llvm_landingpad{} ->
-      write(Dev, "landingpad { i8*, i32 } personality i32 (i32, i64, i8*,i8*)*
-            @__gcc_personality_v0 cleanup\n");
+      write(Dev, "landingpad { i8*, i32 } "),
+      case Ver < {3,7} of false -> ok; true ->
+	  write(Dev, "personality i32 (i32, i64, i8*,i8*)* "
+		"@__gcc_personality_v0 ")
+      end,
+      write(Dev, "cleanup\n");
     #llvm_asm{} ->
       write(Dev, [asm_instruction(I), "\n"]);
     #llvm_adj_stack{} ->
@@ -1002,9 +1022,12 @@ pp_ins(Dev, I) ->
       pp_type(Dev, adj_stack_type(I)),
       write(Dev, [" ", adj_stack_offset(I),")\n"]);
     #llvm_branch_meta{} ->
-      write(Dev, ["!", branch_meta_id(I), " = metadata !{metadata !\"branch_weights\",
-          i32 ", branch_meta_true_weight(I), ", i32 ",
-          branch_meta_false_weight(I), "}\n"]);
+      write(Dev, ["!", branch_meta_id(I), " = "]),
+      if Ver <  {3,6} -> write(Dev, "metadata !{metadata ");
+	 Ver >= {3,6} -> write(Dev, "!{ ")
+      end,
+      write(Dev, ["!\"branch_weights\", i32 ", branch_meta_true_weight(I),
+		  ", i32 ", branch_meta_false_weight(I), "}\n"]);
     Other ->
       exit({?MODULE, pp_ins, {"Unknown LLVM instruction", Other}})
   end.
diff --git a/lib/hipe/llvm/hipe_llvm_main.erl b/lib/hipe/llvm/hipe_llvm_main.erl
index 3c24425828..ac1f49c73b 100644
--- a/lib/hipe/llvm/hipe_llvm_main.erl
+++ b/lib/hipe/llvm/hipe_llvm_main.erl
@@ -78,7 +78,8 @@ compile_with_llvm(FunName, Arity, LLVMCode, Options, UseBuffer) ->
       false -> []
     end,
   {ok, File_llvm} = file:open(Dir ++ Filename ++ ".ll", OpenOpts),
-  hipe_llvm:pp_ins_list(File_llvm, LLVMCode),
+  Ver = hipe:get_llvm_version(), %% Should probably cache this
+  hipe_llvm:pp_ins_list(File_llvm, Ver, LLVMCode),
   %% delayed_write can cause file:close not to do a close, hence the two calls
   ok = file:close(File_llvm),
   __ = file:close(File_llvm),
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index 0e32da1d36..01b7f34b3c 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -200,8 +200,9 @@
 	 compile/4,
 	 compile_core/4,
  	 file/1,
- 	 file/2,
-        llvm_support_available/0,
+	 file/2,
+	 get_llvm_version/0,
+	 llvm_support_available/0,
 	 load/1,
 	 help/0,
 	 help_hiper/0,
@@ -1538,18 +1539,27 @@ check_options(Opts) ->
 -spec llvm_support_available() -> boolean().
 
 llvm_support_available() ->
-  get_llvm_version() >= 3.4.
+  get_llvm_version() >= {3,4}.
 
+-type llvm_version() :: {Major :: integer(), Minor :: integer()}.
+
+-spec get_llvm_version() -> llvm_version() | {0, 0}.
 get_llvm_version() ->
   OptStr = os:cmd("opt -version"),
   SubStr = "LLVM version ", N = length(SubStr),
   case string:str(OptStr, SubStr) of
      0 -> % No opt available
-       0.0;
+       {0, 0};
      S ->
-       case string:to_float(string:sub_string(OptStr, S + N)) of
-         {error, _} -> 0.0; %XXX: Assumes no revision numbers in versioning
-         {Float, _} -> Float
+       case string:tokens(string:sub_string(OptStr, S + N), ".") of
+	 [MajorS, MinorS | _] ->
+	   case {string:to_integer(MajorS), string:to_integer(MinorS)} of
+	     {{Major, ""}, {Minor, _}}
+	       when is_integer(Major), is_integer(Minor) ->
+	       {Major, Minor};
+	     _ -> {0, 0}
+	   end;
+	 _ -> {0, 0} %XXX: Assumes no revision numbers in versioning
        end
   end.