[mono/mono] [2 commits] 2fc3754d: Fix warnings.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/2594b363632d...f3b4e40281a6

   Commit: 2fc3754d2143b066714fc20a05074e23e9c86e8f
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-11-01 15:20:09 GMT
      URL: https://github.com/mono/mono/commit/2fc3754d2143b066714fc20a05074e23e9c86e8f

Fix warnings.

Changed paths:
  M mono/mini/alias-analysis.c
  M mono/mini/mini-amd64.c
  M mono/mini/mini-exceptions.c

Modified: mono/mini/alias-analysis.c
===================================================================
@@ -260,9 +260,11 @@
 	for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
 		for (ins = bb->code; ins; ins = ins->next) {
 			if (ins->opcode == OP_LDADDR) {
+				MonoInst *var;
+
 				if (cfg->verbose_level > 2) { printf ("Found op :"); mono_print_ins (ins); }
 
-				MonoInst *var = (MonoInst*)ins->inst_p0;
+				var = (MonoInst*)ins->inst_p0;
 				if (!(var->flags & MONO_INST_INDIRECT)) {
 					if (cfg->verbose_level) { printf ("Restoring :"); mono_print_ins (var); }
 					++adds;

Modified: mono/mini/mini-amd64.c
===================================================================
@@ -1208,11 +1208,12 @@
 {
 	CallInfo *c1, *c2;
 	gboolean res;
+	MonoType *callee_ret;
 
 	c1 = get_call_info (NULL, NULL, caller_sig);
 	c2 = get_call_info (NULL, NULL, callee_sig);
 	res = c1->stack_usage >= c2->stack_usage;
-	MonoType *callee_ret = callee_sig->ret;
+	callee_ret = callee_sig->ret;
 	if (callee_ret && MONO_TYPE_ISSTRUCT (callee_ret) && c2->ret.storage != ArgValuetypeInReg)
 		/* An address on the callee's stack is passed as the first argument */
 		res = FALSE;

Modified: mono/mini/mini-exceptions.c
===================================================================
@@ -878,7 +878,7 @@
 	MonoJitInfo *ji = NULL;
 	MonoContext ctx, new_ctx;
 	MonoDebugSourceLocation *location;
-	MonoMethod *jmethod, *actual_method;
+	MonoMethod *jmethod = NULL, *actual_method;
 	StackFrameInfo frame;
 	gboolean res;
 

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

Revert "[sgen] Use mono_class_has_parent () instead of mono_class_has_parent_fast () in one place."

This reverts commit 2594b363632d507e20dbc728f48bcb4bfef7295f.

Revert this as its wrong.

Changed paths:
  M mono/metadata/sgen-gc.c

Modified: mono/metadata/sgen-gc.c
===================================================================
@@ -896,7 +896,7 @@ struct _EphemeronLinkNode {
 	/* The object could be a proxy for an object in the domain
 	   we're deleting. */
 #ifndef DISABLE_REMOTING
-	if (mono_class_has_parent (vt->klass, mono_defaults.real_proxy_class)) {
+	if (mono_class_has_parent_fast (vt->klass, mono_defaults.real_proxy_class)) {
 		MonoObject *server = ((MonoRealProxy*)start)->unwrapped_server;
 
 		/* The server could already have been zeroed out, so


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