Manual cleanups.

- Remove `#include <stddef.h>` from files that no longer directly
  reference `size_t`.

- Order of `#include`s, etc.

Author: mattmccutchen-cci

clang/test/3C/3d-allocation.c

@@ -8,8 +8,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <stdlib.h>
-
 int ***malloc3d(int y, int x, int z) {
   //CHECK_NOALL: int ***malloc3d(int y, int x, int z) : itype(_Ptr<int **>) {
   //CHECK_ALL: _Array_ptr<_Array_ptr<_Array_ptr<int>>> malloc3d(int y, int x, int z) : count(y) {

clang/test/3C/add_bounds.c

@@ -35,7 +35,6 @@ void biz(){
   //CHECK_ALL: _Array_ptr<int> b : count(10) = a;
 }
 
-#include<stddef.h>
 #include <stdlib.h>
 _Array_ptr<int> faz(void) {
 //CHECK_ALL: _Array_ptr<int> faz(void) : count(100) {

clang/test/3C/alloc_type_param.c

@@ -5,7 +5,6 @@
 // RUN: 3c -base-dir=%S -output-dir=%t.checked -alltypes %s --
 // RUN: 3c -base-dir=%t.checked -alltypes %t.checked/alloc_type_param.c -- | diff %t.checked/alloc_type_param.c -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 /* Check basic behavior with the three alloc functions */

clang/test/3C/allocator.c

@@ -9,7 +9,6 @@
 // RUN: 3c -base-dir=%t.checked %t.checked/allocator.c -- | diff %t.checked/allocator.c -
 // expected-no-diagnostics
 //
-#include <stddef.h>
 #include <stdlib.h>
 
 void dosomething(void) {

clang/test/3C/arrboundsbasic.c

@@ -6,8 +6,6 @@
 Basic array bounds tests (without any data-flow analysis).
 */
 
-#include <stddef.h>
-
 #include <stdlib.h>
 
 struct bar {

clang/test/3C/arrboundsbasicinfer.c

@@ -6,8 +6,6 @@
 Basic array bounds tests (without any data-flow analysis).
 */
 
-#include <stddef.h>
-
 #include <stdlib.h>
 
 struct bar {

clang/test/3C/arrboundsbyte.c

@@ -6,7 +6,6 @@
 Array bounds (byte_bound) tests with data-flow analysis.
 */
 
-#include <stddef.h>
 #include <stdlib.h>
 // This test needs a custom version of memcpy where src and dest are `int *`.
 int *memcpy_int(int *restrict dest

clang/test/3C/arrboundsheuristics.c

@@ -10,7 +10,6 @@
 
 int *glob;
 int lenplusone;
-#include <stddef.h>
 #include <stdlib.h>
 //CHECK_ALL: _Array_ptr<int> glob = ((void *)0);
 //CHECK_NOALL: int *glob;

clang/test/3C/arrboundsinfer2.c

@@ -6,9 +6,8 @@
 Basic array bounds tests (without any data-flow analysis).
 */
 
-#include <stddef.h>
-
 #include <stdlib.h>
+
 extern void ext_func(_Array_ptr<int> arr : count(len), unsigned len);
 
 struct bar {

clang/test/3C/arrctxsenbounds.c

@@ -5,7 +5,6 @@
 /*
 Context-sensitive array-bounds inference.
 */
-#include <stddef.h>
 #include <stdlib.h>
 struct foo {
   int *x;

clang/test/3C/arrtests_xfail.c

@@ -8,9 +8,8 @@
 Various array bounds tests.
 */
 
-#include <stddef.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 int *g; // array : count is 100; see the call to foo
 void foo(void) {

clang/test/3C/calloc.c

@@ -5,7 +5,6 @@
 // RUN: 3c -base-dir=%S -output-dir=%t.checked -alltypes %s --
 // RUN: 3c -base-dir=%t.checked -alltypes %t.checked/calloc.c -- | diff %t.checked/calloc.c -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 void func(int *x : itype(_Array_ptr<int>));

clang/test/3C/definedType.c

@@ -5,7 +5,6 @@
 // RUN: 3c -base-dir=%S -alltypes -output-dir=%t.checked %s --
 // RUN: 3c -base-dir=%t.checked -alltypes %t.checked/definedType.c -- | diff %t.checked/definedType.c -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 // From issue 204

clang/test/3C/dont_rewrite.c

@@ -2,8 +2,6 @@
 // RUN: 3c -base-dir=%S -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK" %s
 // RUN: 3c -base-dir=%S -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
 
-#include <stddef.h>
-
 #include <string.h>
 
 // don't mess with this

clang/test/3C/free.c

@@ -2,7 +2,6 @@
 // RUN: 3c -base-dir=%S -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
 // RUN: 3c -base-dir=%S -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 int *test() {

clang/test/3C/graphs2.c

@@ -14,7 +14,6 @@
 #include <string.h>
 
 #include <stddef.h>
-#include <stdlib.h>
 
 /*Structure for storing a graph*/
 

clang/test/3C/hash.c

@@ -6,11 +6,6 @@
  * Based on hash.c in Very Secure FTPd
  */
 
-//#include <stdlib_checked.h>
-//#include <string_checked.h>
-//#include <stdio_checked.h>
-
-#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 

clang/test/3C/inline_anon_structs.c

@@ -5,7 +5,6 @@
 // RUN: 3c -base-dir=%S -output-dir=%t.checked %s --
 // RUN: 3c -base-dir=%t.checked %t.checked/inline_anon_structs.c -- | diff %t.checked/inline_anon_structs.c -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 /*This code ensures conversion happens as expected when

clang/test/3C/invalidbounds.c

@@ -8,8 +8,6 @@ Regression test for the issue:
 Here, array bounds should be invalidated when conflicting bounds are assigned.
 */
 
-#include <stddef.h>
-
 #include <stdlib.h>
 #include <string.h>
 

clang/test/3C/liberal_itypes_ptr.c

@@ -41,7 +41,6 @@ void biz() {
   // CHECK: b = buz();
 }
 
-#include <stddef.h>
 #include <stdlib.h>
 
 void malloc_test() {

clang/test/3C/linkedlist.c

@@ -10,7 +10,6 @@
 #include <stdlib.h>
 
 #include <stddef.h>
-#include <stdlib.h>
 
 typedef struct node Node;
 typedef struct list List;

clang/test/3C/malloc_array.c

@@ -5,7 +5,6 @@
 // RUN: 3c -base-dir=%S -output-dir=%t.checked -alltypes %s --
 // RUN: 3c -base-dir=%t.checked -alltypes %t.checked/malloc_array.c -- | diff %t.checked/malloc_array.c -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 int *foo(int *x) {

clang/test/3C/malloc_implicit_cast.c

@@ -11,7 +11,6 @@
 
 // RUN: 3c -base-dir=%S -alltypes %s -- | FileCheck -match-full-lines %s
 
-#include <stddef.h>
 #include <stdlib.h>
 
 #include <stdint.h>

clang/test/3C/mergebodies2.c

@@ -37,4 +37,4 @@ int *fnPtrParamSafe(int (*fn)(int,int)) {
 int main(int argc, char** argv) {
 // CHECK: int main(int argc, _Ptr<_Ptr<char>> argv) _Checked {
   return 0;
-}
+}

clang/test/3C/pointerarithm.c

@@ -4,9 +4,8 @@
 // RUN: 3c -base-dir=%S -addcr -alltypes -output-dir=%t.checked %s --
 // RUN: 3c -base-dir=%t.checked -addcr -alltypes %t.checked/pointerarithm.c -- | diff %t.checked/pointerarithm.c -
 
-#include <stddef.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 int *sus(int *x, int *y) {

clang/test/3C/ptrptr.c

@@ -5,9 +5,8 @@
 // RUN: 3c -base-dir=%S -output-dir=%t.checked -alltypes %s --
 // RUN: 3c -base-dir=%t.checked -alltypes %t.checked/ptrptr.c -- | diff %t.checked/ptrptr.c -
 
-#include <stddef.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 void f() {

clang/test/3C/realloc.c

@@ -5,7 +5,6 @@
 // RUN: 3c -base-dir=%S -output-dir=%t.checked -alltypes %s --
 // RUN: 3c -base-dir=%t.checked -alltypes %t.checked/realloc.c -- | diff %t.checked/realloc.c -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 void foo(int *w) {

clang/test/3C/realloc_complex.c

@@ -10,7 +10,6 @@
 /* multiple complex realloc calls                         */
 /**********************************************************/
 
-#include <stddef.h>
 #include <stdlib.h>
 
 void foo(int *count) {

clang/test/3C/regression_tests_xfail.c

@@ -8,8 +8,6 @@
 //
 // XFAIL: *
 
-#include <stddef.h>
-
 #include <stdlib.h>
 
 unsigned char *func(void) {

clang/test/3C/resolve_itypes.c

@@ -45,7 +45,6 @@ int *biz(void) : itype(_Ptr<int>) {
 void fuz(int *a : itype(_Ptr<int>)) {}
 //CHECK: void fuz(_Ptr<int> a) _Checked {}
 
-#include<stddef.h>
 #include <stdlib.h>
 extern _Itype_for_any(T) void paper_foo(void * : itype(_Array_ptr<T>));
 void paper_bar(int *q : itype(_Ptr<int>), int n) {

clang/test/3C/return_not_least.c

@@ -40,7 +40,6 @@ int *foo(void) {
   return q;
 }
 
-#include <stddef.h>
 #include <stdlib.h>
 
 int *bar() {

clang/test/3C/root_cause.c

@@ -6,7 +6,6 @@
 
 // This test is unusual in that it checks for the errors in the code
 
-#include <stddef.h>
 #include <stdlib.h>
 
 void *x; // expected-warning {{Default void* type}}

clang/test/3C/single_ptr_calloc.c

@@ -5,7 +5,6 @@
 // RUN: 3c -base-dir=%S -output-dir=%t.checked -alltypes %s --
 // RUN: 3c -base-dir=%t.checked -alltypes %t.checked/single_ptr_calloc.c -- | diff %t.checked/single_ptr_calloc.c -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 void foo(int *w) {

clang/test/3C/stmtExprA.c

@@ -2,7 +2,6 @@
 // RUN: 3c -base-dir=%S %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
 // RUN: 3c -base-dir=%S %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 void foo2(int *x) {

clang/test/3C/stmtExprBUG.c

@@ -3,7 +3,6 @@
 // RUN: 3c -base-dir=%S %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
 // XFAIL: *
 
-#include <stddef.h>
 #include <stdlib.h>
 
 /*right now, even though our solving correctly identifies q ought to be checked

clang/test/3C/tree.c

@@ -2,7 +2,6 @@
 // RUN: 3c -base-dir=%S %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
 // RUN: 3c -base-dir=%S %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
 
-#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 

clang/test/3C/type_params.c

@@ -91,7 +91,6 @@ void unsafe(int *a) {
 
 // Example issue 153
 
-#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -153,7 +152,6 @@ void deep(int ****v, int ****w, int ****x, int ****y, int ****z) {
 // Issue #233. Void type paramters were not being detected by
 // typeArgsProvidedCheck
 
-
 // void provided
 void *example0(void *ptr, unsigned int size) {
   // CHECK: void *example0(void *ptr, unsigned int size) {

clang/test/3C/type_params_xfail1.c

@@ -7,7 +7,6 @@
 // independent at each call site.
 
 // adapted from type_params.c
-#include <stddef.h>
 #include <stdlib.h>
 
 _Itype_for_any(T) void incoming_doubleptr(_Array_ptr<T> ptr

clang/test/3C/unsafeunion.c

@@ -5,7 +5,6 @@
 // RUN: 3c -base-dir=%S -output-dir=%t.checked -alltypes %s --
 // RUN: 3c -base-dir=%t.checked -alltypes %t.checked/unsafeunion.c -- | diff %t.checked/unsafeunion.c -
 
-#include <stddef.h>
 #include <stdlib.h>
 
 union foo {

clang/test/3C/user_malloc.c

@@ -3,11 +3,11 @@
 // RUN: 3c -base-dir=%S -use-malloc=my_malloc,your_malloc %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
 
 #include <stddef.h>
+#include <stdlib.h>
 extern _Itype_for_any(T) void *my_malloc(size_t size)
     : itype(_Array_ptr<T>) byte_count(size);
 extern _Itype_for_any(T) void *your_malloc(size_t size)
     : itype(_Array_ptr<T>) byte_count(size);
-#include <stdlib.h>
 
 int *foo(void) {
   int *p = my_malloc(sizeof(int));