[mono/mono] 382210f9: [jit] Pair of fixes from last merge.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/98d59927c633...382210f92746

   Commit: 382210f92746d3ff36c6693a8dca609a9409bbb7
   Author: Rodrigo Kumpera <[email protected]> (kumpera)
     Date: 2013-10-31 23:44:40 GMT
      URL: https://github.com/mono/mono/commit/382210f92746d3ff36c6693a8dca609a9409bbb7

[jit] Pair of fixes from last merge.

Changed paths:
  M mono/mini/method-to-ir.c
  M mono/mini/mini-amd64.c

Modified: mono/mini/method-to-ir.c
===================================================================
@@ -4469,7 +4469,7 @@
 			if (!vtable)
 				return FALSE;
 			mono_runtime_class_init (vtable);
-		} if (method->klass->flags & TYPE_ATTRIBUTE_BEFORE_FIELD_INIT) {
+		} else if (method->klass->flags & TYPE_ATTRIBUTE_BEFORE_FIELD_INIT) {
 			if (cfg->run_cctors && method->klass->has_cctor) {
 				/*FIXME it would easier and lazier to just use mono_class_try_get_vtable */
 				if (!method->klass->runtime_info)

Modified: mono/mini/mini-amd64.c
===================================================================
@@ -2838,9 +2838,9 @@
 	MonoMethodSignature *sig = dinfo->sig;
 	guint8 *ret = ((DynCallArgs*)buf)->ret;
 	mgreg_t res = ((DynCallArgs*)buf)->res;
-	MonoType *sig_ret = sig->ret;
+	MonoType *sig_ret = mono_type_get_underlying_type (sig->ret);
 
-	switch (mono_type_get_underlying_type (sig_ret)->type) {
+	switch (sig_ret->type) {
 	case MONO_TYPE_VOID:
 		*(gpointer*)ret = NULL;
 		break;


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