[tests] Re-enable bug-45841-fpstack-exceptions.exe (#4927)

* [tests] Re-enable bug-45841-fpstack-exceptions.exe

* [tests] Pass correct parameters in bug-45841.

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 0b3b086a4b1d65cd98a5e18421664df5200bcb6b..84f5df8dced1bbb92ee0101886193883bba9622f 100755 (executable)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -901,7 +901,6 @@ LLVM = $(filter --llvm, $(MONO_ENV_OPTIONS))
 # delegate-invoke.exe depends on 929c6bc9b6d76a273f251e6f5dfacac36e9c38bd which was
 # reverted.
 # bug-Xamarin-5278.exe got broken by 5d26590e79da139a284459299aee95c25f4cd835
-# bug-45841-fpstack-exceptions.exe: https://bugzilla.xamarin.com/show_bug.cgi?id=47053
 # appdomain-thread-abort.exe: https://bugzilla.xamarin.com/show_bug.cgi?id=47054
 KNOWN_FAILING_TESTS = \
        delegate-async-exception.exe    \
@@ -909,7 +908,6 @@ KNOWN_FAILING_TESTS = \
        bug-459094.exe \
        delegate-invoke.exe \
        bug-Xamarin-5278.exe \
-       bug-45841-fpstack-exceptions.exe \
        appdomain-thread-abort.exe
 
 DISABLED_TESTS = \

diff --git a/mono/tests/bug-45841-fpstack-exceptions.il b/mono/tests/bug-45841-fpstack-exceptions.il
index d6574763760ba04232a3924b931ff059bb9caa38..74117c2ba7179430dfb3ff1e9f46ec1723cb232d 100644 (file)
--- a/mono/tests/bug-45841-fpstack-exceptions.il
+++ b/mono/tests/bug-45841-fpstack-exceptions.il
@@ -41,7 +41,7 @@
     .locals init (valuetype [System.Data]System.Data.SqlTypes.SqlDecimal V_0)
     .try
     {
-               ldc.r8 5
+       ldstr "Exception 1"
        newobj     instance void [mscorlib]System.OverflowException::.ctor(string)
        throw
                          pop
@@ -57,7 +57,7 @@
     IL_0021:  nop
     .try
     {
-               ldc.r8 5
+       ldstr "Exception 2"
        newobj     instance void [mscorlib]System.OverflowException::.ctor(string)
        throw
                          pop
@@ -73,7 +73,7 @@
     IL_0033:  nop
     .try
     {
-               ldc.r8 5
+       ldstr "Exception 3"
        newobj     instance void [mscorlib]System.OverflowException::.ctor(string)
        throw
       IL_0044:  leave.s    IL_0049
@@ -88,7 +88,7 @@
     IL_0049:  nop
     .try
     {
-               ldc.r8 5
+       ldstr "Exception 4"
        newobj     instance void [mscorlib]System.OverflowException::.ctor(string)
        throw
                pop
@@ -104,7 +104,7 @@
     IL_005f:  nop
     .try
     {
-               ldc.r8 5
+       ldstr "Exception 5"
        newobj     instance void [mscorlib]System.OverflowException::.ctor(string)
        throw
                pop
@@ -120,7 +120,7 @@
     IL_0071:  nop
     .try
     {
-               ldc.r8 5
+       ldstr "Exception 6"
        newobj     instance void [mscorlib]System.OverflowException::.ctor(string)
        throw
                pop