diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2009-04-27 02:27:03 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2009-04-27 02:27:03 +0400 |
| commit | 882733a116c4ba7de62cb51a58302bf9c37ae75e (patch) | |
| tree | 1532f1cfe2257d95249895e240c569c1961ddfbc | |
| parent | 5b5fbbd70e77637a0b10795da3718982e8b997f0 (diff) | |
2009-04-27 Zoltan Varga <vargaz@gmail.com>
* mini-llvm.c (mono_llvm_emit_method): Don't call LLVMGetParam on
a value.
* abcremoval.c (REPORT_ABC_REMOVAL): Don't output messages at verbose
level 1.
svn path=/trunk/mono/; revision=132690
| -rw-r--r-- | mono/mini/ChangeLog | 6 | ||||
| -rw-r--r-- | mono/mini/abcremoval.c | 2 | ||||
| -rw-r--r-- | mono/mini/mini-llvm.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index d7570c8a7df..6e692780923 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,11 @@ 2009-04-27 Zoltan Varga <vargaz@gmail.com> + * mini-llvm.c (mono_llvm_emit_method): Don't call LLVMGetParam on + a value. + + * abcremoval.c (REPORT_ABC_REMOVAL): Don't output messages at verbose + level 1. + * mini-codegen.c (mono_local_regalloc): Prevent sreg1/dreg to be allocated to the same register as a fixed sreg2. Fixes #497271. diff --git a/mono/mini/abcremoval.c b/mono/mini/abcremoval.c index 508d28ae614..adce4781db8 100644 --- a/mono/mini/abcremoval.c +++ b/mono/mini/abcremoval.c @@ -25,7 +25,7 @@ #define TRACE_ABC_REMOVAL (verbose_level > 2) -#define REPORT_ABC_REMOVAL (verbose_level > 0) +#define REPORT_ABC_REMOVAL (verbose_level > 1) /* * A little hack for the verbosity level. diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c index 4b544178f4e..056f7276eab 100644 --- a/mono/mini/mini-llvm.c +++ b/mono/mini/mini-llvm.c @@ -1928,7 +1928,7 @@ mono_llvm_emit_method (MonoCompile *cfg) g_assert (ins->inst_offset % size == 0); index = LLVMConstInt (LLVMInt32Type (), ins->inst_offset / size, FALSE); - callee = convert (ctx, LLVMBuildLoad (builder, LLVMBuildGEP (builder, convert (ctx, values [ins->inst_basereg], LLVMPointerType (IntPtrType (), 0)), &index, 1, get_tempname (ctx)), get_tempname (ctx)), LLVMPointerType (llvm_sig, 0)); + callee = convert (ctx, LLVMBuildLoad (builder, LLVMBuildGEP (builder, convert (ctx, values [ins->inst_basereg], LLVMPointerType (LLVMPointerType (IntPtrType (), 0), 0)), &index, 1, get_tempname (ctx)), get_tempname (ctx)), LLVMPointerType (llvm_sig, 0)); // FIXME: mono_arch_get_vcall_slot () can't decode the code // generated by LLVM @@ -1981,8 +1981,6 @@ mono_llvm_emit_method (MonoCompile *cfg) } else if (ainfo->storage == LLVMArgVtypeByVal) { g_assert (addresses [reg]); args [pindex] = addresses [reg]; - /* Add the byval attribute */ - LLVMAddAttribute (LLVMGetParam (callee, pindex), LLVMByValAttribute); pindexes [i] = pindex; pindex ++; } else { |