[mono/mono] daccd00b: Fix the amd64 build. Fix a warning.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/e4a37a7663f7...daccd00b0028

   Commit: daccd00b00280529bdcb3c9763a8c117282db667
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-11-01 13:40:54 GMT
      URL: https://github.com/mono/mono/commit/daccd00b00280529bdcb3c9763a8c117282db667

Fix the amd64 build. Fix a warning.

Changed paths:
  M mono/mini/iltests.il.in
  M mono/mini/mini-amd64.c

Modified: mono/mini/iltests.il.in
===================================================================
@@ -348,7 +348,7 @@ PASS:	ldc.i4.0
         IL_000a:  ret
     }
 
-	// Check that localloc can't be inlined
+	// Check that localloc cannot be inlined
 	.method static public int32 test_0_localloc_inline () cil managed {
 		.maxstack 16
 		.locals init (

Modified: mono/mini/mini-amd64.c
===================================================================
@@ -2230,6 +2230,7 @@
 {
 	MonoInst *arg, *in;
 	MonoMethodSignature *sig;
+	MonoType *sig_ret;
 	int i, n, stack_size;
 	CallInfo *cinfo;
 	ArgInfo *ainfo;
@@ -2241,6 +2242,8 @@
 
 	cinfo = get_call_info (cfg->generic_sharing_context, cfg->mempool, sig);
 
+	sig_ret = sig->ret;
+
 	if (COMPILE_LLVM (cfg)) {
 		/* We shouldn't be called in the llvm case */
 		cfg->disable_llvm = TRUE;


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches