diff options
| author | Sverker Eriksson <[email protected]> | 2014-04-01 14:51:25 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-04-01 14:51:25 +0200 |
| commit | 95432b67aed0d1f7dd7c2737efc0f80b610b3f14 (patch) | |
| tree | 1adda4a6fcf9b20b7097ebe8dfff25be82ce93f7 /lib/hipe/llvm/hipe_rtl_to_llvm.erl | |
| parent | 6a5e712203407e846905776d579f641ea39a38cf (diff) | |
| parent | f03a23984ddaf9edab26d7b7b6cf97af876e36c8 (diff) | |
| download | otp-95432b67aed0d1f7dd7c2737efc0f80b610b3f14.tar.gz otp-95432b67aed0d1f7dd7c2737efc0f80b610b3f14.tar.bz2 otp-95432b67aed0d1f7dd7c2737efc0f80b610b3f14.zip | |
Merge branch 'yiannist/erllvm-fixes'
* yiannist/erllvm-fixes:
Fix frame size adjustment of stack descriptors
Fix counting of arguments of closures
Check for required LLVM version or issue error
Diffstat (limited to 'lib/hipe/llvm/hipe_rtl_to_llvm.erl')
| -rw-r--r-- | lib/hipe/llvm/hipe_rtl_to_llvm.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/hipe/llvm/hipe_rtl_to_llvm.erl b/lib/hipe/llvm/hipe_rtl_to_llvm.erl index ba76e1d815..d7d8d1b049 100644 --- a/lib/hipe/llvm/hipe_rtl_to_llvm.erl +++ b/lib/hipe/llvm/hipe_rtl_to_llvm.erl @@ -430,12 +430,13 @@ trans_call_name(RtlCallName, Relocs, CallArgs, FinalArgs) -> case RtlCallName of PrimOp when is_atom(PrimOp) -> LlvmName = trans_prim_op(PrimOp), - Relocs1 = relocs_store(LlvmName, {call, {bif, PrimOp, length(CallArgs)}}, - Relocs), + Relocs1 = + relocs_store(LlvmName, {call, {bif, PrimOp, length(CallArgs)}}, Relocs), {"@" ++ LlvmName, [], Relocs1}; {M, F, A} when is_atom(M), is_atom(F), is_integer(A) -> - LlvmName = trans_mfa_name({M,F,A}), - Relocs1 = relocs_store(LlvmName, {call, {M,F,A}}, Relocs), + LlvmName = trans_mfa_name({M, F, A}), + Relocs1 = + relocs_store(LlvmName, {call, {M, F, length(CallArgs)}}, Relocs), {"@" ++ LlvmName, [], Relocs1}; Reg -> case hipe_rtl:is_reg(Reg) of |