Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2014-04-09 19:32:44 +0400
committerMarek Safar <marek.safar@gmail.com>2014-04-09 19:57:49 +0400
commitabbb766d3a47a9b2c57010de3b5ae22e04e12e57 (patch)
tree29df2874094a2977be3e4dfdd9f4674a1eca332f /mcs/class/dlr
parent078dc0321d53f9e161957656550fd10cc41db618 (diff)
[interpreter] Disable fast call invocation using methodinfo delegates due to aot limitation. Fixes #18688
Diffstat (limited to 'mcs/class/dlr')
-rw-r--r--mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/CallInstruction.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/CallInstruction.cs b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/CallInstruction.cs
index fc69ed342e3..3875af308b9 100644
--- a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/CallInstruction.cs
+++ b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/CallInstruction.cs
@@ -55,6 +55,9 @@ namespace Microsoft.Scripting.Interpreter {
return GetArrayAccessor(info, argumentCount);
}
+#if FULL_AOT_RUNTIME
+ return new MethodInfoCallInstruction(info, argumentCount);
+#else
if (ReflectionUtils.IsDynamicMethod(info) || !info.IsStatic && info.DeclaringType.IsValueType()) {
return new MethodInfoCallInstruction(info, argumentCount);
}
@@ -109,7 +112,8 @@ namespace Microsoft.Scripting.Interpreter {
}
}
- return res;
+ return res;
+#endif
}
private static CallInstruction GetArrayAccessor(MethodInfo info, int argumentCount) {