1 files changed, 36 insertions, 36 deletions
diff --git a/compiler-rt/test/ubsan/TestCases/ImplicitConversion/signed-integer-truncation.c b/compiler-rt/test/ubsan/TestCases/ImplicitConversion/signed-integer-truncation.c
index b7a43f0b83a..081d2ea1b42 100644
--- a/compiler-rt/test/ubsan/TestCases/ImplicitConversion/signed-integer-truncation.c
+++ b/compiler-rt/test/ubsan/TestCases/ImplicitConversion/signed-integer-truncation.c
@@ -27,82 +27,82 @@
 // However, not all of them should result in the check.
 // So here, we *only* check which should and which should not result in checks.
 
-unsigned int convert_unsigned_int_to_unsigned_int(unsigned int x) {
+uint32_t convert_unsigned_int_to_unsigned_int(uint32_t x) {
 #line 100
   return x;
 }
 
-unsigned char convert_unsigned_char_to_unsigned_char(unsigned char x) {
+uint8_t convert_unsigned_char_to_unsigned_char(uint8_t x) {
 #line 200
   return x;
 }
 
-signed int convert_signed_int_to_signed_int(signed int x) {
+int32_t convert_signed_int_to_signed_int(int32_t x) {
 #line 300
   return x;
 }
 
-signed char convert_signed_char_to_signed_char(signed char x) {
+int8_t convert_signed_char_to_signed_char(int8_t x) {
 #line 400
   return x;
 }
 
-unsigned char convert_unsigned_int_to_unsigned_char(unsigned int x) {
+uint8_t convert_unsigned_int_to_unsigned_char(uint32_t x) {
 #line 500
   return x;
 }
 
-unsigned int convert_unsigned_char_to_unsigned_int(unsigned char x) {
+uint32_t convert_unsigned_char_to_unsigned_int(uint8_t x) {
 #line 600
   return x;
 }
 
-signed int convert_unsigned_char_to_signed_int(unsigned char x) {
+int32_t convert_unsigned_char_to_signed_int(uint8_t x) {
 #line 700
   return x;
 }
 
-signed int convert_signed_char_to_signed_int(signed char x) {
+int32_t convert_signed_char_to_signed_int(int8_t x) {
 #line 800
   return x;
 }
 
-signed int convert_unsigned_int_to_signed_int(unsigned int x) {
+int32_t convert_unsigned_int_to_signed_int(uint32_t x) {
 #line 900
   return x;
 }
 
-unsigned int convert_signed_int_to_unsigned_int(signed int x) {
+uint32_t convert_signed_int_to_unsigned_int(int32_t x) {
 #line 1000
   return x;
 }
 
-unsigned char convert_signed_int_to_unsigned_char(signed int x) {
+uint8_t convert_signed_int_to_unsigned_char(int32_t x) {
 #line 1100
   return x;
 }
 
-unsigned char convert_signed_char_to_unsigned_char(signed char x) {
+uint8_t convert_signed_char_to_unsigned_char(int8_t x) {
 #line 1200
   return x;
 }
 
-signed char convert_unsigned_char_to_signed_char(unsigned char x) {
+int8_t convert_unsigned_char_to_signed_char(uint8_t x) {
 #line 1300
   return x;
 }
 
-unsigned int convert_signed_char_to_unsigned_int(signed char x) {
+uint32_t convert_signed_char_to_unsigned_int(int8_t x) {
 #line 1400
   return x;
 }
 
-signed char convert_unsigned_int_to_signed_char(unsigned int x) {
+int8_t convert_unsigned_int_to_signed_char(uint32_t x) {
 #line 1500
   return x;
 }
 
-signed char convert_signed_int_to_signed_char(signed int x) {
+int8_t convert_signed_int_to_signed_char(int32_t x) {
 #line 1600
   return x;
 }
@@ -159,7 +159,7 @@ int main() {
   convert_unsigned_int_to_signed_int((uint32_t)UINT32_MAX);
   convert_signed_int_to_unsigned_int((int32_t)(uint32_t)UINT32_MAX);
   convert_signed_int_to_unsigned_char((int32_t)(uint32_t)UINT32_MAX);
-// CHECK-V0: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int' of value -1 (32-bit, signed) to type 'unsigned char' changed the value to 255 (8-bit, unsigned)
+// CHECK-V0: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value -1 (32-bit, signed) to type 'uint8_t' (aka 'unsigned char') changed the value to 255 (8-bit, unsigned)
   convert_signed_char_to_unsigned_char((int8_t)UINT8_MAX);
   convert_unsigned_char_to_signed_char((uint8_t)UINT8_MAX);
   convert_signed_char_to_unsigned_int((int8_t)UINT8_MAX);
@@ -178,14 +178,14 @@ int main() {
   convert_unsigned_int_to_signed_int((uint32_t)INT32_MIN);
   convert_signed_int_to_unsigned_int((int32_t)(uint32_t)INT32_MIN);
   convert_signed_int_to_unsigned_char((int32_t)(uint32_t)INT32_MIN);
-// CHECK-V1: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int' of value -2147483648 (32-bit, signed) to type 'unsigned char' changed the value to 0 (8-bit, unsigned)
+// CHECK-V1: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value -2147483648 (32-bit, signed) to type 'uint8_t' (aka 'unsigned char') changed the value to 0 (8-bit, unsigned)
   convert_signed_char_to_unsigned_char((int8_t)INT8_MIN);
   convert_unsigned_char_to_signed_char((uint8_t)INT8_MIN);
   convert_signed_char_to_unsigned_int((int8_t)INT8_MIN);
   convert_unsigned_int_to_signed_char((uint32_t)INT32_MIN);
-// CHECK-V1: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'unsigned int' of value 2147483648 (32-bit, unsigned) to type 'signed char' changed the value to 0 (8-bit, signed)
+// CHECK-V1: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'uint32_t' (aka 'unsigned int') of value 2147483648 (32-bit, unsigned) to type 'int8_t' (aka 'signed char') changed the value to 0 (8-bit, signed)
   convert_signed_int_to_signed_char((int32_t)(uint32_t)INT32_MIN);
-// CHECK-V1: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int' of value -2147483648 (32-bit, signed) to type 'signed char' changed the value to 0 (8-bit, signed)
+// CHECK-V1: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value -2147483648 (32-bit, signed) to type 'int8_t' (aka 'signed char') changed the value to 0 (8-bit, signed)
 #elif defined(V2)
   // All bits except the source 'Sign' bit are set.
   convert_unsigned_int_to_unsigned_int((uint32_t)INT32_MAX);
@@ -199,14 +199,14 @@ int main() {
   convert_unsigned_int_to_signed_int((uint32_t)INT32_MAX);
   convert_signed_int_to_unsigned_int((int32_t)(uint32_t)INT32_MAX);
   convert_signed_int_to_unsigned_char((int32_t)(uint32_t)INT32_MAX);
-// CHECK-V2: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int' of value 2147483647 (32-bit, signed) to type 'unsigned char' changed the value to 255 (8-bit, unsigned)
+// CHECK-V2: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value 2147483647 (32-bit, signed) to type 'uint8_t' (aka 'unsigned char') changed the value to 255 (8-bit, unsigned)
   convert_signed_char_to_unsigned_char((int8_t)INT8_MAX);
   convert_unsigned_char_to_signed_char((uint8_t)INT8_MAX);
   convert_signed_char_to_unsigned_int((int8_t)INT8_MAX);
   convert_unsigned_int_to_signed_char((uint32_t)INT32_MAX);
-// CHECK-V2: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'unsigned int' of value 2147483647 (32-bit, unsigned) to type 'signed char' changed the value to -1 (8-bit, signed)
+// CHECK-V2: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'uint32_t' (aka 'unsigned int') of value 2147483647 (32-bit, unsigned) to type 'int8_t' (aka 'signed char') changed the value to -1 (8-bit, signed)
   convert_signed_int_to_signed_char((int32_t)(uint32_t)INT32_MAX);
-// CHECK-V2: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int' of value 2147483647 (32-bit, signed) to type 'signed char' changed the value to -1 (8-bit, signed)
+// CHECK-V2: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value 2147483647 (32-bit, signed) to type 'int8_t' (aka 'signed char') changed the value to -1 (8-bit, signed)
 #elif defined(V3)
   // All destination bits set.
   convert_unsigned_int_to_unsigned_int((uint32_t)UINT8_MAX);
@@ -224,9 +224,9 @@ int main() {
   convert_unsigned_char_to_signed_char((uint8_t)UINT8_MAX);
   convert_signed_char_to_unsigned_int((int8_t)UINT8_MAX);
   convert_unsigned_int_to_signed_char((uint32_t)UINT8_MAX);
-// CHECK-V3: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'unsigned int' of value 255 (32-bit, unsigned) to type 'signed char' changed the value to -1 (8-bit, signed)
+// CHECK-V3: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'uint32_t' (aka 'unsigned int') of value 255 (32-bit, unsigned) to type 'int8_t' (aka 'signed char') changed the value to -1 (8-bit, signed)
   convert_signed_int_to_signed_char((int32_t)(uint32_t)UINT8_MAX);
-// CHECK-V3: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int' of value 255 (32-bit, signed) to type 'signed char' changed the value to -1 (8-bit, signed)
+// CHECK-V3: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value 255 (32-bit, signed) to type 'int8_t' (aka 'signed char') changed the value to -1 (8-bit, signed)
 #elif defined(V4)
   // Destination 'sign' bit set.
   convert_unsigned_int_to_unsigned_int((uint32_t)(uint8_t)INT8_MIN);
@@ -244,9 +244,9 @@ int main() {
   convert_unsigned_char_to_signed_char((uint8_t)(uint8_t)INT8_MIN);
   convert_signed_char_to_unsigned_int((int8_t)(uint8_t)INT8_MIN);
   convert_unsigned_int_to_signed_char((uint32_t)(uint8_t)INT8_MIN);
-// CHECK-V4: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'unsigned int' of value 128 (32-bit, unsigned) to type 'signed char' changed the value to -128 (8-bit, signed)
+// CHECK-V4: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'uint32_t' (aka 'unsigned int') of value 128 (32-bit, unsigned) to type 'int8_t' (aka 'signed char') changed the value to -128 (8-bit, signed)
   convert_signed_int_to_signed_char((int32_t)(uint32_t)(uint8_t)INT8_MIN);
-// CHECK-V4: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int' of value 128 (32-bit, signed) to type 'signed char' changed the value to -128 (8-bit, signed)
+// CHECK-V4: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value 128 (32-bit, signed) to type 'int8_t' (aka 'signed char') changed the value to -128 (8-bit, signed)
 #elif defined(V5)
   // All bits except the destination 'sign' bit are set.
   convert_unsigned_int_to_unsigned_int((~((uint32_t)(uint8_t)INT8_MIN)));
@@ -260,14 +260,14 @@ int main() {
   convert_unsigned_int_to_signed_int((~((uint32_t)(uint8_t)INT8_MIN)));
   convert_signed_int_to_unsigned_int((int32_t)(~((uint32_t)(uint8_t)INT8_MIN)));
   convert_signed_int_to_unsigned_char((int32_t)(~((uint32_t)(uint8_t)INT8_MIN)));
-// CHECK-V5: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int' of value -129 (32-bit, signed) to type 'unsigned char' changed the value to 127 (8-bit, unsigned)
+// CHECK-V5: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value -129 (32-bit, signed) to type 'uint8_t' (aka 'unsigned char') changed the value to 127 (8-bit, unsigned)
   convert_signed_char_to_unsigned_char((int8_t)(uint8_t)INT8_MIN);
   convert_unsigned_char_to_signed_char((uint8_t)(uint8_t)INT8_MIN);
   convert_signed_char_to_unsigned_int((int8_t)(uint8_t)INT8_MIN);
   convert_unsigned_int_to_signed_char((~((uint32_t)(uint8_t)INT8_MIN)));
-// CHECK-V5: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'unsigned int' of value 4294967167 (32-bit, unsigned) to type 'signed char' changed the value to 127 (8-bit, signed)
+// CHECK-V5: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'uint32_t' (aka 'unsigned int') of value 4294967167 (32-bit, unsigned) to type 'int8_t' (aka 'signed char') changed the value to 127 (8-bit, signed)
   convert_signed_int_to_signed_char((int32_t)(~((uint32_t)(uint8_t)INT8_MIN)));
-// CHECK-V5: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int' of value -129 (32-bit, signed) to type 'signed char' changed the value to 127 (8-bit, signed)
+// CHECK-V5: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value -129 (32-bit, signed) to type 'int8_t' (aka 'signed char') changed the value to 127 (8-bit, signed)
 #elif defined(V6)
   // Only the source and destination sign bits are set.
   convert_unsigned_int_to_unsigned_int((uint32_t)INT32_MIN);
@@ -281,14 +281,14 @@ int main() {
   convert_unsigned_int_to_signed_int((uint32_t)INT32_MIN);
   convert_signed_int_to_unsigned_int((uint32_t)INT32_MIN);
   convert_signed_int_to_unsigned_char((int32_t)(((uint32_t)INT32_MIN) | ((uint32_t)(uint8_t)INT8_MIN)));
-// CHECK-V6: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int' of value -2147483520 (32-bit, signed) to type 'unsigned char' changed the value to 128 (8-bit, unsigned)
+// CHECK-V6: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value -2147483520 (32-bit, signed) to type 'uint8_t' (aka 'unsigned char') changed the value to 128 (8-bit, unsigned)
   convert_signed_char_to_unsigned_char((int8_t)INT8_MIN);
   convert_unsigned_char_to_signed_char((uint8_t)INT8_MIN);
   convert_signed_char_to_unsigned_int((int8_t)INT8_MIN);
   convert_unsigned_int_to_signed_char((((uint32_t)INT32_MIN) | ((uint32_t)(uint8_t)INT8_MIN)));
-// CHECK-V6: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'unsigned int' of value 2147483776 (32-bit, unsigned) to type 'signed char' changed the value to -128 (8-bit, signed)
+// CHECK-V6: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'uint32_t' (aka 'unsigned int') of value 2147483776 (32-bit, unsigned) to type 'int8_t' (aka 'signed char') changed the value to -128 (8-bit, signed)
   convert_signed_int_to_signed_char((int32_t)(((uint32_t)INT32_MIN) | ((uint32_t)(uint8_t)INT8_MIN)));
-// CHECK-V6: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int' of value -2147483520 (32-bit, signed) to type 'signed char' changed the value to -128 (8-bit, signed)
+// CHECK-V6: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value -2147483520 (32-bit, signed) to type 'int8_t' (aka 'signed char') changed the value to -128 (8-bit, signed)
 #elif defined(V7)
   // All bits except the source and destination sign bits are set.
   convert_unsigned_int_to_unsigned_int((uint32_t)INT32_MAX);
@@ -302,14 +302,14 @@ int main() {
   convert_unsigned_int_to_signed_int((uint32_t)INT32_MAX);
   convert_signed_int_to_unsigned_int((uint32_t)INT32_MAX);
   convert_signed_int_to_unsigned_char((int32_t)(~(((uint32_t)INT32_MIN) | ((uint32_t)(uint8_t)INT8_MIN))));
-// CHECK-V7: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int' of value 2147483519 (32-bit, signed) to type 'unsigned char' changed the value to 127 (8-bit, unsigned)
+// CHECK-V7: {{.*}}signed-integer-truncation.c:1100:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value 2147483519 (32-bit, signed) to type 'uint8_t' (aka 'unsigned char') changed the value to 127 (8-bit, unsigned)
   convert_signed_char_to_unsigned_char((int8_t)INT8_MAX);
   convert_unsigned_char_to_signed_char((uint8_t)INT8_MAX);
   convert_signed_char_to_unsigned_int((int8_t)INT8_MAX);
   convert_unsigned_int_to_signed_char(~(((uint32_t)INT32_MIN) | ((uint32_t)(uint8_t)INT8_MIN)));
-// CHECK-V7: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'unsigned int' of value 2147483519 (32-bit, unsigned) to type 'signed char' changed the value to 127 (8-bit, signed)
+// CHECK-V7: {{.*}}signed-integer-truncation.c:1500:10: runtime error: implicit conversion from type 'uint32_t' (aka 'unsigned int') of value 2147483519 (32-bit, unsigned) to type 'int8_t' (aka 'signed char') changed the value to 127 (8-bit, signed)
   convert_signed_int_to_signed_char((int32_t)~(((uint32_t)INT32_MIN) | ((uint32_t)(uint8_t)INT8_MIN)));
-// CHECK-V7: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int' of value 2147483519 (32-bit, signed) to type 'signed char' changed the value to 127 (8-bit, signed)
+// CHECK-V7: {{.*}}signed-integer-truncation.c:1600:10: runtime error: implicit conversion from type 'int32_t' (aka 'int') of value 2147483519 (32-bit, signed) to type 'int8_t' (aka 'signed char') changed the value to 127 (8-bit, signed)
 #else
 #error Some V* needs to be defined!
 #endif