Update other places where the builtin header needs to be mentioned

Author: AaronBallman

clang/lib/Headers/CMakeLists.txt

@@ -18,6 +18,7 @@ set(core_files
   __stdarg_va_list.h
   stdatomic.h
   stdbool.h
+  stdcountof.h
   stdckdint.h
   stddef.h
   __stddef_header_macro.h

clang/lib/Headers/module.modulemap

@@ -231,6 +231,11 @@ module _Builtin_stdbool [system] {
   export *
 }
 
+module _Builtin_stdcountof [system] {
+  header "stdcountof.h"
+  export *
+}
+
 module _Builtin_stddef [system] {
   textual header "stddef.h"
 

clang/lib/Lex/ModuleMap.cpp

@@ -260,6 +260,7 @@ static bool isBuiltinHeaderName(StringRef FileName) {
            .Case("stdarg.h", true)
            .Case("stdatomic.h", true)
            .Case("stdbool.h", true)
+           .Case("stdcountof.h", true)
            .Case("stddef.h", true)
            .Case("stdint.h", true)
            .Case("tgmath.h", true)

clang/lib/Lex/PPDirectives.cpp

@@ -252,8 +252,8 @@ static bool warnByDefaultOnWrongCase(StringRef Include) {
     .Cases("assert.h", "complex.h", "ctype.h", "errno.h", "fenv.h", true)
     .Cases("float.h", "inttypes.h", "iso646.h", "limits.h", "locale.h", true)
     .Cases("math.h", "setjmp.h", "signal.h", "stdalign.h", "stdarg.h", true)
-    .Cases("stdatomic.h", "stdbool.h", "stdckdint.h", "stddef.h", true)
-    .Cases("stdint.h", "stdio.h", "stdlib.h", "stdnoreturn.h", true)
+    .Cases("stdatomic.h", "stdbool.h", "stdckdint.h", "stdcountof.h", true)
+    .Cases("stddef.h", "stdint.h", "stdio.h", "stdlib.h", "stdnoreturn.h", true)
     .Cases("string.h", "tgmath.h", "threads.h", "time.h", "uchar.h", true)
     .Cases("wchar.h", "wctype.h", true)
 

clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc

@@ -389,6 +389,7 @@ SYMBOL(cosh, None, <math.h>)
 SYMBOL(coshf, None, <math.h>)
 SYMBOL(coshl, None, <math.h>)
 SYMBOL(cosl, None, <math.h>)
+SYMBOL(countof, None, <stdcountof.h>)
 SYMBOL(cpow, None, <complex.h>)
 SYMBOL(cpowf, None, <complex.h>)
 SYMBOL(cpowl, None, <complex.h>)

clang/test/Modules/Inputs/builtin-headers/system-modules.modulemap

@@ -49,6 +49,11 @@ module cstd [system] [no_undeclared_includes] {
     export *
   }
 
+  module stdcountof {
+    header "stdcountof.h"
+    export *
+  }
+
   module stddef {
     header "stddef.h"
     export *