[test-suite] Fix Unit Tests for Code Coverage

[lenary]

Summary

https://reviews.llvm.org/D88931 recently landed to add more tests to the
test suite to improve coverage of parts of clang. These tests caused
errors on some platforms, which was caught in post-commit review.

This change replaces the use of "%i" with the equivalent specifiers for
those types from inttypes.h, and updates the reference output to
correctly account for formatting unsigned arguments using unsigned
format specifiers.

[yroux]

Hi Sam,

the overall patch looks good to me, I just spot that these macros are explicitly defined into SingleSource/Regression/C/casts.c if PRId64 doesn't exist.
So I wonder if this guarf is needed on some plateform

[lenary]

In D97686#2596453, @yroux wrote:

Hi Sam,

the overall patch looks good to me, I just spot that these macros are explicitly defined into SingleSource/Regression/C/casts.c if PRId64 doesn't exist.
So I wonder if this guarf is needed on some plateform

I don't think we should be providing definitions if they aren't provided already, as we don't know if the platform is ILP32/LP64/LLP64 -- which was the original point in this patch.

As it is right now, this will fail at compile-time if you don't have these macros, which I think is ok. It should be up to the platforms without these inttypes.h definitions to exclude these tests with a downstream cmake patch if they don't support these macros (or indeed the types that go with them).

[yroux]

It makes sense, thanks.

SingleSource/UnitTests/2020-01-06-coverage-001.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 int32_t *a;
 uint8_t b = 7;
 static int32_t **c = &a;
 uint8_t *p;
 int32_t x;
 
 void d() {
int main() {
   temp_1 = val_1;
   temp_2 = val_2;
 
   x = val_3;
   p = &temp_2;
   a = &temp_1;
   d();
 
-  printf("b = %i\n", b);
-  printf("x = %i\n", x);
+  printf("b = %" PRIu8 "\n", b);
+  printf("x = %" PRIi32 "\n", x);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-002.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 int32_t a, c, e;
 int8_t b;
 int16_t d;
 int32_t x;
 int64_t y;
 
 int64_t f() {
int32_t main() {
   x = val_6;
   d = val_5;
   b = val_4;
   e = val_3;
   c = val_2;
   a = val_1;
   z = f();
 
-  printf("a = %i\n", a);
-  printf("b = %i\n", b);
-  printf("c = %i\n", c);
-  printf("d = %i\n", d);
-  printf("x = %i\n", x);
-  printf("e = %i\n", e);
-  printf("z = %li\n", z);
-  printf("y = %li\n", y);
+  printf("a = %" PRIi32 "\n", a);
+  printf("b = %" PRIi8 "\n", b);
+  printf("c = %" PRIi32 "\n", c);
+  printf("d = %" PRIi16 "\n", d);
+  printf("x = %" PRIi32 "\n", x);
+  printf("e = %" PRIi32 "\n", e);
+  printf("z = %" PRIi64 "\n", z);
+  printf("y = %" PRIi64 "\n", y);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-003.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 int8_t a;
 int32_t x;
 
 void b() { x = (uint64_t)4073709551607 > a || a != 0; }
 
 int main() {
   int32_t val_2;
   int8_t val_1;
 
   val_1 = -7;
   val_2 = 1695154176;
 
   x = val_2;
   a = val_1;
   b();
 
-  printf("a = %i\n", a);
-  printf("x = %i\n", x);
+  printf("a = %" PRIi8 "\n", a);
+  printf("x = %" PRIi32 "\n", x);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-004.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 int32_t a, b;
 
 union u {
   uint16_t c;
 } d;
 
 static int32_t *e = &b;
int main() {
   x = val_5;
   f = &temp_1;
   d.c = val_3;
   b = val_2;
   a = val_1;
   j();
   y = h(h_call_argument_1);
 
-  printf("a = %i\n", a);
-  printf("b = %i\n", b);
-  printf("d.c = %i\n", d.c);
-  printf("y = %li\n", y);
-  printf("h_call_argument_1 = %i\n", h_call_argument_1);
-  printf("x = %li\n", x);
+  printf("a = %" PRIi32 "\n", a);
+  printf("b = %" PRIi32 "\n", b);
+  printf("d.c = %" PRIu16 "\n", d.c);
+  printf("y = %" PRIi64 "\n", y);
+  printf("h_call_argument_1 = %" PRIi32 "\n", h_call_argument_1);
+  printf("x = %" PRIi64 "\n", x);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-005.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 uint32_t a, c, d;
 uint64_t b;
 int16_t e;
 uint64_t *p;
 int16_t *q;
 void g();
 uint64_t *r;
int main() {
   e = val_5;
   b = val_4;
   d = val_3;
   c = val_2;
   a = val_1;
   h();
   g();
 
-  printf("a = %i\n", a);
-  printf("b = %li\n", b);
-  printf("c = %i\n", c);
-  printf("d = %i\n", d);
-  printf("e = %i\n", e);
+  printf("a = %" PRIu32 "\n", a);
+  printf("b = %" PRIu64 "\n", b);
+  printf("c = %" PRIu32 "\n", c);
+  printf("d = %" PRIu32 "\n", d);
+  printf("e = %" PRIi16 "\n", e);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-005.reference_output

 a = 16777101
 b = 2
-c = -6
+c = 4294967290
 d = 0
 e = -9
 exit 0

SingleSource/UnitTests/2020-01-06-coverage-006.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 #pragma pack(1)
 
 struct s {
   int : 28;
   unsigned : 17;
   unsigned a : 25;
 } b;
int main() {
   val_2 = 0;
   val_3 = 0;
 
   x = val_3;
   c = val_2;
   b.a = val_1;
   d();
 
-  printf("b.a = %i\n", b.a);
-  printf("c = %i\n", c);
-  printf("x = %i\n", x);
+  printf("b.a = %u\n", b.a);
+  printf("c = %" PRIi32 "\n", c);
+  printf("x = %" PRIi32 "\n", x);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-007.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 uint32_t a;
 const uint32_t b = -1L, c;
 int16_t d;
 
 void e() {
   uint32_t f;
   uint32_t g;
   f = b / a;
   g = f;
   d = g < c;
 }
 
 int main() {
   int16_t val_2;
   uint32_t val_1;
 
   val_1 = 3;
   val_2 = -32767;
 
   d = val_2;
   a = val_1;
   e();
 
-  printf("a = %i\n", a);
-  printf("b = %i\n", b);
-  printf("c = %i\n", c);
-  printf("d = %i\n", d);
+  printf("a = %" PRIu32 "\n", a);
+  printf("b = %" PRIu32 "\n", b);
+  printf("c = %" PRIu32 "\n", c);
+  printf("d = %" PRIi16 "\n", d);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-007.reference_output

 a = 3
-b = -1
+b = 4294967295
 c = 0
 d = 0
 exit 0

SingleSource/UnitTests/2020-01-06-coverage-008.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 struct a {
   int64_t b;
   int64_t c;
 } d;
 
 int64_t e;
 
int main() {
   e = val_3;
   d.b = val_1;
   d.c = val_2;
   struct a h = {0, 9};
   s = h;
   e = h.c;
   f(&h);
 
-  printf("d.b = %li\n", d.b);
-  printf("d.c = %li\n", d.c);
-  printf("s.b = %li\n", s.b);
-  printf("s.c = %li\n", s.c);
-  printf("e = %li\n", e);
+  printf("d.b = %" PRIi64 "\n", d.b);
+  printf("d.c = %" PRIi64 "\n", d.c);
+  printf("s.b = %" PRIi64 "\n", s.b);
+  printf("s.c = %" PRIi64 "\n", s.c);
+  printf("e = %" PRIi64 "\n", e);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-009.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 uint32_t a, b, h;
 int16_t c, g;
 uint8_t d = 8;
 uint8_t *const e = &d;
 int32_t *f;
 
 void i() {
int main() {
   f = &temp_1;
   g = val_5;
   c = val_4;
   h = val_3;
   b = val_2;
   a = val_1;
   i();
 
-  printf("a = %i\n", a);
-  printf("b = %i\n", b);
-  printf("c = %i\n", c);
-  printf("d = %i\n", d);
-  printf("g = %i\n", g);
-  printf("h = %i\n", h);
+  printf("a = %" PRIu32 "\n", a);
+  printf("b = %" PRIu32 "\n", b);
+  printf("c = %" PRIi16 "\n", c);
+  printf("d = %" PRIu8 "\n", d);
+  printf("g = %" PRIi16 "\n", g);
+  printf("h = %" PRIu32 "\n", h);
 
   return 0;
 }

SingleSource/UnitTests/2020-01-06-coverage-010.c

 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 int32_t *a;
 int32_t b, d, f;
 int8_t c;
 volatile int32_t e;
 int32_t x;
 int8_t *p;
 int32_t y;
int main() {
   e = val_6;
   c = val_5;
   f = val_4;
   d = val_3;
   b = val_2;
   a = &temp_1;
   k();
 
-  printf("b = %i\n", b);
-  printf("c = %i\n", c);
-  printf("d = %i\n", d);
-  printf("x = %i\n", x);
-  printf("e = %i\n", e);
-  printf("y = %i\n", y);
-  printf("z = %i\n", z);
-  printf("v = %i\n", v);
-  printf("f = %i\n", f);
-  printf("w = %i\n", w);
+  printf("b = %" PRIi32 "\n", b);
+  printf("c = %" PRIi8 "\n", c);
+  printf("d = %" PRIi32 "\n", d);
+  printf("x = %" PRIi32 "\n", x);
+  printf("e = %" PRIi32 "\n", e);
+  printf("y = %" PRIi32 "\n", y);
+  printf("z = %" PRIi32 "\n", z);
+  printf("v = %" PRIi32 "\n", v);
+  printf("f = %" PRIi32 "\n", f);
+  printf("w = %" PRIi32 "\n", w);
 
   return 0;
 }