Return NULL from getTailCallCopyArgsThunk instead of throwing (#5712)

* Return NULL from getTailCallCopyArgsThunk instead of throwing * Update RyuJIT
dotnet · Apr 18, 2018 · aa7f41b · aa7f41b
1 parent 3c4466f
commit aa7f41b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/dependencies.props b/dependencies.props
@@ -1,10 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <RyuJITVersion>2.1.0-preview3-26413-01</RyuJITVersion>
+    <RyuJITVersion>2.2.0-preview1-26418-02</RyuJITVersion>
     <ObjectWriterVersion>1.0.0-alpha-26412-0</ObjectWriterVersion>
     <CoreFxVersion>4.5.0-preview3-26417-03</CoreFxVersion>
     <CoreFxUapVersion>4.6.0-preview3-26417-03</CoreFxUapVersion>
-    <MicrosoftNETCoreNativeVersion>2.1.0-preview3-26413-01</MicrosoftNETCoreNativeVersion>
+    <MicrosoftNETCoreNativeVersion>2.2.0-preview1-26418-02</MicrosoftNETCoreNativeVersion>
     <MicrosoftNETCoreAppPackageVersion>2.0.0</MicrosoftNETCoreAppPackageVersion>
     <XunitNetcoreExtensionsVersion>1.0.1-prerelease-02104-02</XunitNetcoreExtensionsVersion>
   </PropertyGroup>

diff --git a/src/JitInterface/src/CorInfoImpl.cs b/src/JitInterface/src/CorInfoImpl.cs
@@ -3439,8 +3439,13 @@ private void addActiveDependency(CORINFO_MODULE_STRUCT_* moduleFrom, CORINFO_MOD
         { throw new NotImplementedException("GetDelegateCtor"); }
         private void MethodCompileComplete(CORINFO_METHOD_STRUCT_* methHnd)
         { throw new NotImplementedException("MethodCompileComplete"); }
+
         private void* getTailCallCopyArgsThunk(CORINFO_SIG_INFO* pSig, CorInfoHelperTailCallSpecialHandling flags)
-        { throw new NotImplementedException("getTailCallCopyArgsThunk"); }
+        {
+            // Slow tailcalls are not supported yet
+            // https://github.com/dotnet/corert/issues/1683
+            return null;
+        }
 
         private void* getMemoryManager()
         {