projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b84d1ab)
Surgically remove unsupported tailcall cases
authorRuss Keldorph <Russ.Keldorph@microsoft.com>
Mon, 1 May 2017 16:57:21 +0000 (09:57 -0700)
committerRuss Keldorph <russ.keldorph@microsoft.com>
Tue, 2 May 2017 15:20:11 +0000 (08:20 -0700)
Rather than disabling tailcall tests entirely, surgically remove the
failing cases so the remaining cases can be enabled.

Commit migrated from https://github.com/dotnet/coreclr/commit/c8b635f1e0058b4147d6d89efeb7464e97d03dc3

src/coreclr/tests/issues.targets patch | blob | history
src/coreclr/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il patch | blob | history
src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il patch | blob | history
src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il patch | blob | history

diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index 594d43d..a40c6ac 100644 (file)
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -181,12 +181,6 @@
         <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\*">
             <Issue>6707</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd">
-            <Issue>9880</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd">
-            <Issue>9880</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <!-- The following are x86 failures -->
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il
index dad77ea..eb2ac39 100644 (file)
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/smallFrame.il
@@ -358,7 +358,8 @@
     // Code size       7 (0x7)
     .maxstack  8
     //.line 114,114 : 3,16 ''
-    IL_0000:  tail. call       valuetype RetBuff RetBufferBug::TailCallee()
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_0000:  call       valuetype RetBuff RetBufferBug::TailCallee()
     IL_0005:  pop
     //.line 115,115 : 2,3 ''
     IL_0006:  ret
diff --git a/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il b/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il
index e295a99..ca789a6 100644 (file)
--- a/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il
+++ b/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyTransparentLibraryWithPrefix.il
@@ -198,7 +198,8 @@
     IL_0022:  call       void [mscorlib]System.Console::WriteLine(string)
     IL_0027:  ldc.i4.s   101
     IL_0029:  stsfld     int32 TailcallVerify.Condition22::Result
-    IL_002e:  tail. call       int32 TailcallVerify.Condition22::Callee2()
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_002e:  call       int32 TailcallVerify.Condition22::Callee2()
     IL_0033:  pop
     IL_0034:  ret
   } // end of method Condition22::Caller2
@@ -307,7 +308,8 @@
     IL_0027:  ldc.i4.s   101
     IL_0029:  stsfld     int32 TailcallVerify.Condition22::Result
     IL_002e:  ldarg.0
-    IL_002f:  tail. callvirt   instance int32 TailcallVerify.Condition22::Callee3()
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_002f:  callvirt   instance int32 TailcallVerify.Condition22::Callee3()
     IL_0034:  pop
     IL_0035:  ret
   } // end of method Condition22::Caller3
diff --git a/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il b/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
index 1c354b7..5654518 100644 (file)
--- a/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
+++ b/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
@@ -13,6 +13,11 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern System.Threading.Thread
+{
+  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
+  .ver 4:0:0:0
+}
 .assembly extern System.Linq
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )                     
@@ -2786,21 +2791,22 @@
     .entrypoint
     .maxstack  1
 
-    ldstr      "Condition1.Test1"
-    call       int32 TailcallVerify.Program::Run(string)
-    pop
-    ldstr      "Condition1.Test2"
-    call       int32 TailcallVerify.Program::Run(string)
-    pop
-    ldstr      "Condition1.Test3"
-    call       int32 TailcallVerify.Program::Run(string)
-    pop
-    ldstr      "Condition2.Test1"
-    call       int32 TailcallVerify.Program::Run(string)
-    pop
-    ldstr      "Condition2.Test2"
-    call       int32 TailcallVerify.Program::Run(string)
-    pop
+    // Disable tests intending to test tail.call,pop,ret sequence.
+    //ldstr      "Condition1.Test1"
+    //call       int32 TailcallVerify.Program::Run(string)
+    //pop
+    //ldstr      "Condition1.Test2"
+    //call       int32 TailcallVerify.Program::Run(string)
+    //pop
+    //ldstr      "Condition1.Test3"
+    //call       int32 TailcallVerify.Program::Run(string)
+    //pop
+    //ldstr      "Condition2.Test1"
+    //call       int32 TailcallVerify.Program::Run(string)
+    //pop
+    //ldstr      "Condition2.Test2"
+    //call       int32 TailcallVerify.Program::Run(string)
+    //pop
     ldstr      "Condition3.Test1"
     call       int32 TailcallVerify.Program::Run(string)
     pop
@@ -2935,12 +2941,13 @@
     ldstr      "Condition20.Test1"
     call       int32 TailcallVerify.Program::Run(string)
     pop
-    ldstr      "Condition21.Test1"
-    call       int32 TailcallVerify.Program::Run(string)
-    pop
-    ldstr      "Condition21.Test2"
-    call       int32 TailcallVerify.Program::Run(string)
-    pop
+    // Disable tests intending to test tail.call,pop,ret sequence.
+    //ldstr      "Condition21.Test1"
+    //call       int32 TailcallVerify.Program::Run(string)
+    //pop
+    //ldstr      "Condition21.Test2"
+    //call       int32 TailcallVerify.Program::Run(string)
+    //pop
     ldstr      "Condition21.Test3"
     call       int32 TailcallVerify.Program::Run(string)
     pop
@@ -2950,9 +2957,10 @@
     ldstr      "Condition21.Test7"
     call       int32 TailcallVerify.Program::Run(string)
     pop
-    ldstr      "Condition22.Test2"
-    call       int32 TailcallVerify.Program::Run(string)
-    pop
+    // Disable tests intending to test tail.call,pop,ret sequence.
+    //ldstr      "Condition22.Test2"
+    //call       int32 TailcallVerify.Program::Run(string)
+    //pop
     ldstr      "Condition22.Test4"
     call       int32 TailcallVerify.Program::Run(string)
     ret    
@@ -3561,7 +3569,8 @@
     IL_0056:  ldc.i4.3
     IL_0057:  ldc.i4.4
     IL_0058:  ldloc.0
-    IL_0059:  tail. call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeIsOdd1(int32,
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_0059:  call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeIsOdd1(int32,
                                                                                                            int32,
                                                                                                            int32,
                                                                                                            int32,
@@ -3940,7 +3949,8 @@
     IL_0032:  ldloca.s   CS$0$0000
     IL_0034:  initobj    TailcallVerify.ValueType3Bytes
     IL_003a:  ldloc.0
-    IL_003b:  tail. call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeIsEven2(int32,
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_003b:  call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeIsEven2(int32,
                                                                                                             int32,
                                                                                                             int32,
                                                                                                             valuetype TailcallVerify.ValueType3Bytes)
@@ -4610,7 +4620,8 @@
     IL_0037:  ldloca.s   CS$0$0000
     IL_0039:  initobj    TailcallVerify.ValueType3Bytes
     IL_003f:  ldloc.0
-    IL_0040:  tail. call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeE4(int32,
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_0040:  call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition21::CalleeE4(int32,
                                                                                                        int32,
                                                                                                        int32,
                                                                                                        int32,
@@ -9265,7 +9276,8 @@
     IL_0022:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0027:  ldc.i4.s   101
     IL_0029:  stsfld     int32 TailcallVerify.Condition2::Result
-    IL_002e:  tail. call       int32 TailcallVerify.Condition2::Callee1()
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_002e:  call       int32 TailcallVerify.Condition2::Callee1()
     IL_0033:  pop
     IL_0034:  ret
   } // end of method Condition2::Caller1
@@ -9366,7 +9378,8 @@
     IL_0027:  ldc.i4.s   101
     IL_0029:  stsfld     int32 TailcallVerify.Condition2::Result
     IL_002e:  ldc.i4.0
-    IL_002f:  tail. call       string TailcallVerify.Condition2::Callee2(int32)
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_002f:  call       string TailcallVerify.Condition2::Callee2(int32)
     IL_0034:  pop
     IL_0035:  ret
   } // end of method Condition2::Caller2
@@ -9501,7 +9514,8 @@
     IL_0022:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0027:  ldc.i4.s   101
     IL_0029:  stsfld     int32 TailcallVerify.Condition1::Result
-    IL_002e:  tail. call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee1()
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_002e:  call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee1()
     IL_0033:  pop
     IL_0034:  ret
   } // end of method Condition1::Caller1
@@ -9607,7 +9621,8 @@
     IL_0027:  ldc.i4.s   101
     IL_0029:  stsfld     int32 TailcallVerify.Condition1::Result
     IL_002e:  ldc.i4.0
-    IL_002f:  tail. call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee2(int32)
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_002f:  call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee2(int32)
     IL_0034:  pop
     IL_0035:  ret
   } // end of method Condition1::Caller2
@@ -9720,7 +9735,8 @@
     IL_0047:  ldc.i4     0x7fffffff
     IL_004c:  ldc.i4     0x80000000
     IL_0051:  ldc.i4     0x7fffffff
-    IL_0056:  tail. call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee3(int32,
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_0056:  call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee3(int32,
                                                                                                      int32,
                                                                                                      int32,
                                                                                                      int32,
@@ -9914,7 +9930,8 @@
     IL_0099:  ldc.r8     -1.7976931348623157e+308
     IL_00a2:  ldc.r4     3.4028235e+038
     IL_00a7:  ldloc.1
-    IL_00a8:  tail. call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee4(int32,
+//            tail.      // tail.call, pop, ret sequence is never valid for .NET Core (but is accepted by .NET x64)
+    IL_00a8:  call       valuetype TailcallVerify.ValueType3Bytes TailcallVerify.Condition1::Callee4(int32,
                                                                                                      int64,
                                                                                                      valuetype TailcallVerify.ValueType3Bytes,
                                                                                                      int16,
Domain: Dotnet / Core;