diff options
| author | Bernhard Urban <bernhard.urban@xamarin.com> | 2018-11-26 23:37:57 +0300 |
|---|---|---|
| committer | Ludovic Henry <luhenry@microsoft.com> | 2018-11-26 23:37:57 +0300 |
| commit | 7aadce3fad0dd1d501e166e2dead67401d6e881b (patch) | |
| tree | 533bbdd73ed9e2414922d8dd085cbb796e64a8a2 | |
| parent | 4bc42a87678bd0d11ea55b09a85aa8c72cdc1a85 (diff) | |
[mini] use AOT trampolines in interp mixed mode (#11767) (#11784)
[mini] use AOT trampolines in interp mixed mode
Fixes this on mscorlib/mixed mode on Xamarin.iOS:
```
[FAIL] NonExceptional.Serialization_Deserialization : System.Runtime.Serialization.SerializationException : An error occurred while deserializing the object. The serialized data is corrupt.Â
[FAIL] NonExceptional.Serialize_Deserialize_FixedDateRule : System.Runtime.Serialization.SerializationException : An error occurred while deserializing the object. The serialized data is corrupt.Â
[FAIL] NonExceptional.Serialize_Deserialize_FloatingDateRule : System.Runtime.Serialization.SerializationException : An error occurred while deserializing the object. The serialized data is corrupt.Â
[FAIL] SerializationTests.Serialization_Deserialization : System.Runtime.Serialization.SerializationException : An error occurred while deserializing the object. The serialized data is corrupt.Â
[FAIL] TimeZoneTest.CurrentTimeZone_SerializationRoundtrip : System.Runtime.Serialization.SerializationException : An error occurred while deserializing the object. The serialized data is corrupt.Â
```
| -rw-r--r-- | mono/mini/mini-trampolines.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c index fb64e6dc73b..375ff203c01 100644 --- a/mono/mini/mini-trampolines.c +++ b/mono/mini/mini-trampolines.c @@ -1455,7 +1455,7 @@ mono_create_jump_trampoline (MonoDomain *domain, MonoMethod *method, gboolean ad error_init (error); - if (mono_use_interpreter) { + if (mono_use_interpreter && !mono_aot_only) { gpointer ret = mini_get_interp_callbacks ()->create_method_pointer (method, error); if (!mono_error_ok (error)) return NULL; |