[mono/mono] [2 commits] 644359eb: [sdb] Fix tests.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/7ab1185624db...fbd9fd71679f

   Commit: 644359eb5d95c060c171178f18dc03ca983c3d63
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-11-01 12:14:47 GMT
      URL: https://github.com/mono/mono/commit/644359eb5d95c060c171178f18dc03ca983c3d63

[sdb] Fix tests.

Changed paths:
  M mcs/class/Mono.Debugger.Soft/Test/dtest.cs

Modified: mcs/class/Mono.Debugger.Soft/Test/dtest.cs
===================================================================
@@ -1122,11 +1122,11 @@ public class DebuggerTests
 				Assert.AreEqual (2, attr.NamedArguments.Count);
 				Assert.AreEqual ("afield", attr.NamedArguments [0].Field.Name);
 				Assert.AreEqual ("bfield", attr.NamedArguments [1].Field.Name);
-			} else if (attr.Constructor.DeclaringType.Name == "ClassInterface") {
+			} else if (attr.Constructor.DeclaringType.Name == "ClassInterfaceAttribute") {
 				// inherited from System.Object
 				//} else if (attr.Constructor.DeclaringType.Name == "Serializable") {
 				// inherited from System.Object
-			} else if (attr.Constructor.DeclaringType.Name == "ComVisible") {
+			} else if (attr.Constructor.DeclaringType.Name == "ComVisibleAttribute") {
 				// inherited from System.Object
 			} else {
 				Assert.Fail (attr.Constructor.DeclaringType.Name);

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

[jit] Fix the processing of LLVM compiled method frames on x86. Fixes running corlib tests with LLVM.

Changed paths:
  M mono/mini/exceptions-x86.c

Modified: mono/mini/exceptions-x86.c
===================================================================
@@ -855,9 +855,19 @@ void win32_seh_set_handler(int type, MonoW32ExceptionHandler handler)
 		/* Adjust IP */
 		new_ctx->eip --;
 
-		if (*lmf && (MONO_CONTEXT_GET_BP (ctx) >= (gpointer)(*lmf)->ebp)) {
-			/* remove any unused lmf */
-			*lmf = (gpointer)(((gsize)(*lmf)->previous_lmf) & ~3);
+		if (*lmf && ((*lmf) != jit_tls->first_lmf)) {
+			gboolean is_tramp = ((guint32)((*lmf)->previous_lmf) & 1);
+			gpointer lmf_esp;
+
+			if (is_tramp)
+				/* lmf->esp is only set in trampoline frames */
+				lmf_esp = (gpointer)(*lmf)->esp;
+			else
+				/* In non-trampoline frames, ebp is the frame pointer */
+				lmf_esp = (gpointer)(*lmf)->ebp;
+			if (!is_tramp && MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->ebp)
+				/* remove any unused lmf */
+				*lmf = (gpointer)(((gsize)(*lmf)->previous_lmf) & ~3);
 		}
 
 		/* Pop arguments off the stack */


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