From ab24148bb0809f2d4a7bbd6218f53606ba65d884 Mon Sep 17 00:00:00 2001
From: Tristan Labelle <github@tristanlabelle.com>
Date: Fri, 8 Feb 2019 11:22:11 -0800
Subject: [PATCH] Reenable tests for casts between type shapes that have been
 fixed (#1909)

---
 .../between_type_shapes.hlsl                  | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/tools/clang/test/CodeGenHLSL/expressions/conversions_and_casts/between_type_shapes.hlsl b/tools/clang/test/CodeGenHLSL/expressions/conversions_and_casts/between_type_shapes.hlsl
index ea496ae2b..13ae4122e 100644
--- a/tools/clang/test/CodeGenHLSL/expressions/conversions_and_casts/between_type_shapes.hlsl
+++ b/tools/clang/test/CodeGenHLSL/expressions/conversions_and_casts/between_type_shapes.hlsl
@@ -104,12 +104,12 @@ void main()
     // DXC: i32 1, i32 0, i32 0, i32 0, i8 15)
     // FXC: l(1,0,0,0)
     output_m1x1(v1);
-    // DXC crashes (GitHub #1799)
+    // DXC: i32 1, i32 0, i32 0, i32 0, i8 15)
     // FXC: l(1,0,0,0)
-    // output_m1x1((int1x1)a1);
-    // DXC crashes (GitHub #1799)
+    output_m1x1((int1x1)a1);
+    // DXC: i32 1, i32 0, i32 0, i32 0, i8 15)
     // FXC: l(1,0,0,0)
-    // output_m1x1((int1x1)s1);
+    output_m1x1((int1x1)s1);
 
     // DXC: i32 1, i32 0, i32 0, i32 0, i8 15)
     // FXC: l(1,0,0,0)
@@ -180,12 +180,12 @@ void main()
     // DXC: i32 11, i32 0, i32 0, i32 0, i8 15)
     // FXC: l(11,0,0,0)
     output_m1x1(m2x2); // warning: implicit truncation of vector type
-    // DXC crashes (GitHub #1799)
+    // DXC: i32 1, i32 0, i32 0, i32 0, i8 15)
     // FXC: l(1,0,0,0)
-    // output_m1x1((int1x1)a2);
-    // DXC crashes (GitHub #1799)
+    output_m1x1((int1x1)a2);
+    // DXC: i32 1, i32 0, i32 0, i32 0, i8 15)
     // FXC: l(1,0,0,0)
-    // output_m1x1((int1x1)s2);
+    output_m1x1((int1x1)s2);
 
     // DXC: i32 1, i32 0, i32 0, i32 0, i8 15)
     // FXC: l(1,0,0,0)
@@ -276,28 +276,28 @@ void main()
     // DXC: i32 1, i32 2, i32 3, i32 4, i8 15)
     // FXC: l(1,2,3,4)
     output_m2x2(v4);
-    // DXC crashes (GitHub #1799)
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC: l(1,2,0,0)
-    // output_m1x2((int1x2)a2);
-    // DXC crashes (GitHub #1799)
+    output_m1x2((int1x2)a2);
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC: l(1,2,0,0)
-    // output_m2x1((int2x1)a2);
-    // DXC crashes (GitHub #1799)
+    output_m2x1((int2x1)a2);
+    // DXC: i32 1, i32 2, i32 3, i32 4, i8 15)
     // FXC: l(1,2,3,4)
-    // output_m2x2((int2x2)a4);
-    // DXC crashes (GitHub #1799)
+    output_m2x2((int2x2)a4);
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC: l(1,2,0,0)
-    // output_m1x2((int1x2)s2);
-    // DXC crashes (GitHub #1799)
+    output_m1x2((int1x2)s2);
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC: l(1,2,0,0)
-    // output_m2x1((int2x1)s2);
-    // DXC crashes (GitHub #1799)
+    output_m2x1((int2x1)s2);
+    // DXC: i32 1, i32 2, i32 3, i32 4, i8 15)
     // FXC: l(1,2,3,4)
-    // output_m2x2((int2x2)s4);
+    output_m2x2((int2x2)s4);
 
-    // DXC fails with validation errors (GitHub #1861)
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC: l(1,2,0,0)
-    // output_a2((A2)v2);
+    output_a2((A2)v2);
     // DXC crashes (GitHub #1799)
     // FXC: l(11,12,0,0)
     // output_a2((A2)m1x2);
@@ -381,28 +381,28 @@ void main()
     // DXC: i32 11, i32 12, i32 21, i32 22, i8 15)
     // FXC: l(11,12,21,22)
     output_m2x2(m3x3); // warning: implicit truncation of vector type
-    // DXC crashes (GitHub #1799)
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC: l(1,2,0,0)
-    // output_m1x2((int1x2)a4);
-    // DXC crashes (GitHub #1799)
+    output_m1x2((int1x2)a4);
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC fails with internal error: invalid sequence/cast expression
-    // output_m2x1((int2x1)a4);
-    // DXC crashes (GitHub #1799)
+    output_m2x1((int2x1)a4);
+    // DXC: i32 1, i32 2, i32 3, i32 4, i8 15)
     // FXC rejects with error X3017: cannot convert from 'typedef int[5]' to 'int2x2'
-    // output_m2x2((int2x2)a5);
-    // DXC crashes (GitHub #1799)
+    output_m2x2((int2x2)a5);
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC: l(1,2,0,0)
-    // output_m1x2((int1x2)s4);
-    // DXC crashes (GitHub #1799)
+    output_m1x2((int1x2)s4);
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC fails with internal error: invalid sequence/cast expression
-    // output_m2x1((int2x1)s4);
-    // DXC crashes (GitHub #1799)
+    output_m2x1((int2x1)s4);
+    // DXC: i32 1, i32 2, i32 3, i32 4, i8 15)
     // FXC rejects with error X3017: cannot convert from 'struct S5' to 'int2x2'
-    // output_m2x2((int2x2)s5);
+    output_m2x2((int2x2)s5);
 
-    // DXC fails validation
+    // DXC: i32 1, i32 2, i32 0, i32 0, i8 15)
     // FXC: l(1,2,0,0)
-    // output_a2((A2)v4);
+    output_a2((A2)v4);
     // DXC crashes (GitHub #1799)
     // FXC: l(11,12,0,0)
     // output_a2((A2)m1x3);