Skip unit tests on 3.14

Summary: These tests will start failing on 3.14 when we enable it. But they're also currently disabled and failing on 3.12. This updates the expected results and marks them to be run on 3.12 but not 3.14 using a feature flag.

Reviewed By: czardoz

Differential Revision: D78598891

fbshipit-source-id: 9d53a7128c5b9650c4a513e277913597abc50a86

Author: DinoV

RuntimeTests/hir_frame_state_test.cpp

@@ -209,9 +209,9 @@ def test(fs):
       CurInstrOffset 24
       Locals<2> v0 v1
     }
-    v8 = LoadConst<NoneType>
-    v8 = RefineType<NoneType> v8
-    Return<NoneType> v8
+    v8 = LoadConst<ImmortalNoneType>
+    v8 = RefineType<ImmortalNoneType> v8
+    Return<ImmortalNoneType> v8
   }
 }
 )";
@@ -942,9 +942,9 @@ def test(x, y):
       Stack<1> v5
     }
     v0 = Assign v5
-    v6 = LoadConst<NoneType>
-    v6 = RefineType<NoneType> v6
-    Return<NoneType> v6
+    v6 = LoadConst<ImmortalNoneType>
+    v6 = RefineType<ImmortalNoneType> v6
+    Return<ImmortalNoneType> v6
   }
 }
 )";
@@ -1224,9 +1224,9 @@ def test(x, y):
       CurInstrOffset 16
       Locals<2> v0 v1
     }
-    v5 = LoadConst<NoneType>
-    v5 = RefineType<NoneType> v5
-    Return<NoneType> v5
+    v5 = LoadConst<ImmortalNoneType>
+    v5 = RefineType<ImmortalNoneType> v5
+    Return<ImmortalNoneType> v5
   }
 }
 )";
@@ -1322,9 +1322,9 @@ def test(x, y):
       CurInstrOffset 12
       Locals<2> v0 v1
     }
-    v6 = LoadConst<NoneType>
-    v6 = RefineType<NoneType> v6
-    Return<NoneType> v6
+    v6 = LoadConst<ImmortalNoneType>
+    v6 = RefineType<ImmortalNoneType> v6
+    Return<ImmortalNoneType> v6
   }
 }
 )";

RuntimeTests/hir_test.cpp

@@ -909,7 +909,7 @@ TEST_F(EdgeCaseTest, IgnoreUnreachableLoops) {
     Snapshot {
       CurInstrOffset 0
     }
-    v1 = LoadConst<NoneType>
+    v1 = LoadConst<ImmortalNoneType>
     Return v1
   }
 }
@@ -994,7 +994,7 @@ TEST_F(EdgeCaseTest, JumpBackwardNoInterrupt) {
     Snapshot {
       CurInstrOffset 0
     }
-    v1 = LoadConst<NoneType>
+    v1 = LoadConst<ImmortalNoneType>
     Return v1
   }
 }
@@ -1498,7 +1498,7 @@ TEST_F(HIRBuildTest, MatchKeys) {
         Stack<2> v0 v1
       }
     }
-    v4 = LoadConst<NoneType>
+    v4 = LoadConst<ImmortalNoneType>
     v5 = PrimitiveCompare<Equal> v3 v4
     CondBranch<1, 2> v5
   }

RuntimeTests/hir_tests/all_passes_static_test.txt

@@ -193,9 +193,8 @@ fun jittestmodule:test {
   bb 3 (preds 1) {
     UpdatePrevInstr<idx:35 line_no:-1>
     XDecref v34
-    v53:NoneType = LoadConst<NoneType>
-    Incref v53
-    Return<NoneType> v53
+    v53:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v53
   }
 }
 --- End ---

RuntimeTests/hir_tests/all_passes_test.txt

@@ -510,9 +510,8 @@ fun jittestmodule:test {
     }
     UpdatePrevInstr<idx:20 line_no:3>
     Decref v15
-    v21:NoneType = LoadConst<NoneType>
-    Incref v21
-    Return<NoneType> v21
+    v21:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v21
   }
 }
 --- Test Name ---
@@ -659,7 +658,7 @@ fun jittestmodule:test {
   }
 
   bb 9 (preds 8, 10) {
-    v33:NoneType = LoadConst<NoneType>
+    v33:ImmortalNoneType = LoadConst<ImmortalNoneType>
     Branch<1>
   }
 

RuntimeTests/hir_tests/builtin_load_method_elimination_test.txt

@@ -571,7 +571,7 @@ fun jittestmodule:test {
 
   bb 9 (preds 8, 10) {
     Snapshot
-    v27:NoneType = LoadConst<NoneType>
+    v27:ImmortalNoneType = LoadConst<ImmortalNoneType>
     Branch<1>
   }
 

RuntimeTests/hir_tests/dead_code_elimination_test.txt

@@ -256,8 +256,8 @@ fun jittestmodule:test {
       }
     }
     Snapshot
-    v21:NoneType = LoadConst<NoneType>
-    Return<NoneType> v21
+    v21:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v21
   }
 }
 --- Test Name ---

RuntimeTests/hir_tests/dynamic_comparison_elimination_test.txt

@@ -261,8 +261,8 @@ fun jittestmodule:test {
 
   bb 2 (preds 6) {
     Snapshot
-    v25:NoneType = LoadConst<NoneType>
-    Return<NoneType> v25
+    v25:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v25
   }
 }
 --- End ---

RuntimeTests/hir_tests/hir_builder_static_test.txt

@@ -199,7 +199,7 @@ fun jittestmodule:test {
 
   bb 9 (preds 8, 10) {
     Snapshot
-    v13 = LoadConst<NoneType>
+    v13 = LoadConst<ImmortalNoneType>
     v2 = Assign v11
     v3 = Assign v13
     Branch<1>
@@ -369,9 +369,9 @@ fun jittestmodule:test {
     v5 = LoadField<x@16, OptObject, owned> v0
     StoreField<x@16> v0 v1 v5
     Snapshot
-    v6 = LoadConst<NoneType>
-    v6 = RefineType<NoneType> v6
-    Return<NoneType> v6
+    v6 = LoadConst<ImmortalNoneType>
+    v6 = RefineType<ImmortalNoneType> v6
+    Return<ImmortalNoneType> v6
   }
 }
 --- Test Name ---
@@ -643,7 +643,7 @@ fun jittestmodule:test {
 
   bb 9 (preds 8, 10) {
     Snapshot
-    v10 = LoadConst<NoneType>
+    v10 = LoadConst<ImmortalNoneType>
     v1 = Assign v8
     v2 = Assign v10
     Branch<1>
@@ -1469,9 +1469,9 @@ fun jittestmodule:test {
       }
     }
     Snapshot
-    v7 = LoadConst<NoneType>
-    v7 = RefineType<NoneType> v7
-    Return<NoneType> v7
+    v7 = LoadConst<ImmortalNoneType>
+    v7 = RefineType<ImmortalNoneType> v7
+    Return<ImmortalNoneType> v7
   }
 }
 --- Test Name ---

RuntimeTests/hir_tests/refcount_insertion_static_test.txt

@@ -47,9 +47,8 @@ fun jittestmodule:Test.__init__ {
     v13:CInt32[0] = LoadConst<CInt32[0]>
     v14:Nullptr = LoadConst<Nullptr>
     StoreField<x@16> v8 v13 v14
-    v16:NoneType = LoadConst<NoneType>
-    Incref v16
-    Return<NoneType> v16
+    v16:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v16
   }
 }
 --- Test Name ---
@@ -97,9 +96,8 @@ fun jittestmodule:Test.__init__ {
     v13:OptObject = LoadField<x@16, OptObject, owned> v7
     StoreField<x@16> v7 v12 v13
     XDecref v13
-    v14:NoneType = LoadConst<NoneType>
-    Incref v14
-    Return<NoneType> v14
+    v14:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v14
   }
 }
 --- End ---

RuntimeTests/hir_tests/refcount_insertion_test.txt

@@ -665,9 +665,8 @@ fun jittestmodule:test {
     XDecref v40
     Decref v57
     Decref v62
-    v59:NoneType = LoadConst<NoneType>
-    Incref v59
-    Return<NoneType> v59
+    v59:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v59
   }
 }
 --- Test Name ---
@@ -947,9 +946,8 @@ fun jittestmodule:test {
     }
     XDecref v52
     BatchDecref v69 v74 v75 v76
-    v71:NoneType = LoadConst<NoneType>
-    Incref v71
-    Return<NoneType> v71
+    v71:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v71
   }
 }
 --- Test Name ---
@@ -1198,9 +1196,8 @@ fun jittestmodule:test {
     Decref v32
     Decref v37
     XDecref v38
-    v55:NoneType = LoadConst<NoneType>
-    Incref v55
-    Return<NoneType> v55
+    v55:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v55
   }
 }
 --- Test Name ---
@@ -1253,9 +1250,8 @@ fun jittestmodule:test {
         Locals<2> v6 v7
       }
     }
-    v13:NoneType = LoadConst<NoneType>
-    Incref v13
-    Return<NoneType> v13
+    v13:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v13
   }
 }
 --- Test Name ---
@@ -1864,16 +1860,14 @@ fun jittestmodule:test {
     }
     Decref v39
     Decref v46
-    v41:NoneType = LoadConst<NoneType>
-    Incref v41
-    Return<NoneType> v41
+    v41:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v41
   }
 
   bb 6 (preds 4) {
     XDecref v34
-    v43:NoneType = LoadConst<NoneType>
-    Incref v43
-    Return<NoneType> v43
+    v43:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v43
   }
 }
 --- Test Name ---
@@ -2088,8 +2082,7 @@ fun jittestmodule:test {
   }
 
   bb 3 (preds 2) {
-    v49:NoneType = LoadConst<NoneType>
-    Incref v49
+    v49:ImmortalNoneType = LoadConst<ImmortalNoneType>
     Branch<4>
   }
 
@@ -2101,11 +2094,11 @@ fun jittestmodule:test {
   bb 4 (preds 3, 8) {
     v52:Object = Phi<3, 8> v65 v22
     v54:{DictExact|NoneType} = Phi<3, 8> v49 v65
-    v55:NoneType = LoadConst<NoneType>
+    v55:ImmortalNoneType = LoadConst<ImmortalNoneType>
     v58:OptObject = LoadGlobalCached<1; "print">
     v59:MortalObjectUser[builtin_function_or_method:print:0xdeadbeef] = GuardIs<0xdeadbeef> v58 {
       Descr 'LOAD_GLOBAL: print'
-      LiveValues<6> b:v23 b:v39 o:v52 o:v54 b:v55 b:v58
+      LiveValues<6> b:v23 b:v39 o:v52 o:v54 unc:v55 b:v58
       FrameState {
         CurInstrOffset 64
         Locals<4> v39 v52 v23 v54
@@ -2114,7 +2107,7 @@ fun jittestmodule:test {
     Incref v39
     Decref v52
     v64:Object = VectorCall<1> v59 v39 {
-      LiveValues<5> b:v23 o:v39 o:v54 b:v55 b:v59
+      LiveValues<5> b:v23 o:v39 o:v54 unc:v55 b:v59
       FrameState {
         CurInstrOffset 80
         Locals<4> v39 v55 v23 v54
@@ -2123,9 +2116,8 @@ fun jittestmodule:test {
     Decref v39
     Decref v54
     Decref v64
-    v61:NoneType = LoadConst<NoneType>
-    Incref v61
-    Return<NoneType> v61
+    v61:ImmortalNoneType = LoadConst<ImmortalNoneType>
+    Return<ImmortalNoneType> v61
   }
 }
 --- Test Name ---