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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index d7570c8a7df049afa62d5347d237cc455487a841..6e692780923b82ee64b7612040a98cac3a1a17c9 100644 (file)
--- 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 508d28ae61429ce892935c5245e8e7d3bb537bb9..adce4781db8cca4ce775ea74d4eda20fa5c82283 100644 (file)
--- 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 4b544178f4e72bb80c12b8b2ccfe6b9b78582f08..056f7276eabea0bfd22fb8150b7900be18acf393 100644 (file)
--- 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 {