X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fexceptions.cs;h=6971d0e681a3b3174ef1c5a62717f986be9344bc;hb=f5d084e0914377a65468db913026e47efd3ca4f4;hp=839aa4c81369bc17ced6df4af85b7e3008e9daab;hpb=f99ce750ee781a2584e849a0264300fa4d99aaaa;p=mono.git

diff --git a/mono/mini/exceptions.cs b/mono/mini/exceptions.cs
index 839aa4c8136..6971d0e681a 100644
--- a/mono/mini/exceptions.cs
+++ b/mono/mini/exceptions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 /*
  * Regression tests for the mono JIT.
@@ -1821,241 +1822,326 @@ class Tests {
 		return 2;
 	}
 
-	public static int test_0_ovf () {
-		int ocount = 0;
+	public static int test_0_ovf1 () {
+		int exception = 0;
 		
 		checked {
-
-			ocount = 0;
 			try {
 				ulong a =  UInt64.MaxValue - 1;
 				ulong t = a++;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 1;
+		}
+		return exception;
+	}
+
+	public static int test_1_ovf2 () {
+		int exception = 0;
 
-			ocount = 0;
+		checked {
 			try {
 				ulong a =  UInt64.MaxValue;
 				ulong t = a++;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 2;
+		}
+		return exception;
+	}
+
+	public static int test_0_ovf3 () {
+		int exception = 0;
 
-			ocount = 0;
+		long a = Int64.MaxValue - 1;
+		checked {
 			try {
-				long a = Int64.MaxValue - 1;
 				long t = a++;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 3;
+		}
+		return exception;
+	}
+
+	public static int test_1_ovf4 () {
+		int exception = 0;
 
+		long a = Int64.MaxValue;
+		checked {
 			try {
-				long a = Int64.MaxValue;
 				long t = a++;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 4;
+		}
+		return exception;
+	}
 
-			ocount = 0;
+	public static int test_0_ovf5 () {
+		int exception = 0;
+
+		ulong a = UInt64.MaxValue - 1;
+		checked {
 			try {
-				ulong a = UInt64.MaxValue - 1;
 				ulong t = a++;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 5;
+		}
+		return exception;
+	}
 
+	public static int test_1_ovf6 () {
+		int exception = 0;
+
+		ulong a = UInt64.MaxValue;
+		checked {
 			try {
-				ulong a = UInt64.MaxValue;
 				ulong t = a++;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 6;
+		}
+		return exception;
+	}
+
+	public static int test_0_ovf7 () {
+		int exception = 0;
 
-			ocount = 0;
+		long a = Int64.MinValue + 1;
+		checked {
 			try {
-				long a = Int64.MinValue + 1;
 				long t = a--;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 7;
+		}
+		return 0;
+	}
+
+	public static int test_1_ovf8 () {
+		int exception = 0;
 
-			ocount = 0;
+		long a = Int64.MinValue;
+		checked {
 			try {
-				long a = Int64.MinValue;
 				long t = a--;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 8;
+		}
+		return exception;
+	}
+
+	public static int test_0_ovf9 () {
+		int exception = 0;
 
-			ocount = 0;
+		ulong a = UInt64.MinValue + 1;
+		checked {
 			try {
-				ulong a = UInt64.MinValue + 1;
 				ulong t = a--;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 9;
+		}
+		return exception;
+	}
+
+	public static int test_1_ovf10 () {
+		int exception = 0;
 
-			ocount = 0;
+		ulong a = UInt64.MinValue;
+		checked {
 			try {
-				ulong a = UInt64.MinValue;
 				ulong t = a--;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 10;
+		}
+		return exception;
+	}
+
+	public static int test_0_ovf11 () {
+		int exception = 0;
 
-			ocount = 0;
+		int a = Int32.MinValue + 1;
+		checked {
 			try {
-				int a = Int32.MinValue + 1;
 				int t = a--;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 11;
+		}
+		return exception;
+	}
 
-			ocount = 0;
+	public static int test_1_ovf12 () {
+		int exception = 0;
+
+		int a = Int32.MinValue;
+		checked {
 			try {
-				int a = Int32.MinValue;
 				int t = a--;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 12;
+		}
+		return exception;
+	}
 
-			ocount = 0;
+	public static int test_0_ovf13 () {
+		int exception = 0;
+
+		uint a = 1;
+		checked {
 			try {
-				uint a = 1;
 				uint t = a--;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 13;
+		}
+		return exception;
+	}
+
+	public static int test_1_ovf14 () {
+		int exception = 0;
 
-			ocount = 0;
+		uint a = 0;
+		checked {
 			try {
-				uint a = 0;
 				uint t = a--;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 14;
+		}
+		return exception;
+	}
+
+	public static int test_0_ovf15 () {
+		int exception = 0;
 
-			ocount = 0;
+		sbyte a = 126;
+		checked {
 			try {
-				sbyte a = 126;
 				sbyte t = a++;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 15;
+		}
+		return exception;
+	}
 
-			ocount = 0;
+	public static int test_1_ovf16 () {
+		int exception = 0;
+
+		sbyte a = 127;
+		checked {
 			try {
-				sbyte a = 127;
 				sbyte t = a++;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 16;
+		}
+		return exception;
+	}
 
-			ocount = 0;
+	public static int test_0_ovf17 () {
+		int exception = 0;
+
+		checked {
 			try {
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 17;
+		}
+		return exception;
+	}
 
-			ocount = 0;
+	public static int test_0_ovf18 () {
+		int exception = 0;
+
+		int a = 1 << 29;
+		checked {
 			try {
-				int a = 1 << 29;
 				int t = a*2;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 18;
+		}
+		return exception;
+	}
+
+	public static int test_1_ovf19 () {
+		int exception = 0;
 
-			ocount = 0;
+		int a = 1 << 30;
+		checked {
 			try {
-				int a = 1 << 30;
 				int t = a*2;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 19;
+		}
+		return exception;
+	}
+
+	public static int test_0_ovf20 () {
+		int exception = 0;
 
-			ocount = 0;
+		checked {
 			try {
 				ulong a = 0xffffffffff;
 				ulong t = a*0x0ffffff;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 0)
-				return 20;
+		}
+		return exception;
+	}
 
-			ocount = 0;
+	public static int test_1_ovf21 () {
+		int exception = 0;
+
+		ulong a = 0xffffffffff;
+		checked {
 			try {
-				ulong a = 0xffffffffff;
 				ulong t = a*0x0fffffff;
 			} catch {
-				ocount++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 21;
+		}
+		return exception;
+	}
+
+	public static int test_1_ovf22 () {
+		int exception = 0;
 
-			ocount = 0;
+		long a = Int64.MinValue;
+		long b = 10;
+		checked {
 			try {
-				long a = Int64.MinValue;
-				long b = 10;
 				long v = a * b;
 			} catch {
-				ocount ++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 22;
+		}
+		return exception;
+	}
 
-			ocount = 0;
+	public static int test_1_ovf23 () {
+		int exception = 0;
+
+		long a = 10;
+		long b = Int64.MinValue;
+		checked {
 			try {
-				long a = 10;
-				long b = Int64.MinValue;
 				long v = a * b;
 			} catch {
-				ocount ++;
+				exception = 1;
 			}
-			if (ocount != 1)
-				return 23;
 		}
-		
-		return 0;
+		return exception;
 	}
 
 	class Broken {
@@ -2267,6 +2353,39 @@ class Tests {
 		return 1;
 	}
 
+	public int amethod () {
+		return 1;
+	}
+
+	public static int test_0_nonvirt_nullref_at_clause_start () {
+		Tests t = null;
+		try {
+			t.amethod ();
+		} catch (NullReferenceException) {
+			return 0;
+		}
+
+		return 1;
+	}
+
+	public static int throw_only () {
+		throw new Exception ();
+	}
+
+	[MethodImpl(MethodImplOptions.NoInlining)] 
+	public static int throw_only2 () {
+		return throw_only ();
+	}
+
+	public static int test_0_inline_throw_only () {
+		try {
+			return throw_only2 ();
+		}
+		catch (Exception ex) {
+			return 0;
+		}
+	}
+
 	// bug #78633
 	public static int test_0_throw_to_branch_opt_outer_clause () {
 		int i = 0;