Revert a worksaround for a libc++ / ctype issue. NFC (#20958)

sbc100 · web-flow · commit 9f19a5218c05 · 2023-12-20T09:29:44.000-08:00
Undefining these macros was hurting code size for us. These changes were originally made in #1740 as a fix for #1716 but they appear to no longer be necessary. I verified that I can build the failing program from #1716 using em++ today.
diff --git a/system/include/compat/ctype.h b/system/include/compat/ctype.h
@@ -14,21 +14,4 @@
 
 #include_next <ctype.h>
 
-/* We undef these until libcxx is fixed. Without this,
-   some things can fail to compile correctly, like
-   Boost. Issue #1716. */
-
-#undef isalpha
-#undef isblank
-#undef iscntrl
-#undef isdigit
-#undef isgraph
-#undef islower
-#undef isprint
-#undef ispunct
-#undef isspace
-#undef isupper
-#undef isxdigit
-#undef isctype
-
 #endif /* _COMPAT_CTYPE_H_ */
diff --git a/system/include/compat/wchar.h b/system/include/compat/wchar.h
diff --git a/system/include/compat/wctype.h b/system/include/compat/wctype.h
diff --git a/test/code_size/embind_val_wasm.json b/test/code_size/embind_val_wasm.json
@@ -3,8 +3,8 @@
   "a.html.gz": 431,
   "a.js": 7468,
   "a.js.gz": 3137,
-  "a.wasm": 11501,
-  "a.wasm.gz": 5766,
-  "total": 19642,
-  "total_gz": 9334
+  "a.wasm": 11458,
+  "a.wasm.gz": 5733,
+  "total": 19599,
+  "total_gz": 9301
 }
diff --git a/test/code_size/random_printf_wasm.json b/test/code_size/random_printf_wasm.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 12794,
-  "a.html.gz": 7006,
-  "total": 12794,
-  "total_gz": 7006
+  "a.html": 12734,
+  "a.html.gz": 6983,
+  "total": 12734,
+  "total_gz": 6983
 }
diff --git a/test/code_size/random_printf_wasm2js.json b/test/code_size/random_printf_wasm2js.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 17365,
-  "a.html.gz": 7567,
-  "total": 17365,
-  "total_gz": 7567
+  "a.html": 17329,
+  "a.html.gz": 7543,
+  "total": 17329,
+  "total_gz": 7543
 }
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.size b/test/other/metadce/test_metadce_cxx_ctors1.size
@@ -1 +1 @@
-125899
+125859
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.size b/test/other/metadce/test_metadce_cxx_ctors2.size
@@ -1 +1 @@
-125369
+125329
diff --git a/test/other/metadce/test_metadce_cxx_except.size b/test/other/metadce/test_metadce_cxx_except.size
@@ -1 +1 @@
-168151
+168118
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.size b/test/other/metadce/test_metadce_cxx_except_wasm.size
@@ -1 +1 @@
-139331
+139293
diff --git a/test/other/metadce/test_metadce_cxx_mangle.size b/test/other/metadce/test_metadce_cxx_mangle.size
@@ -1 +1 @@
-223601
+223576
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.size b/test/other/metadce/test_metadce_cxx_noexcept.size
@@ -1 +1 @@
-128689
+128649
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.size b/test/other/metadce/test_metadce_cxx_wasmfs.size
@@ -1 +1 @@
-166001
+165961
diff --git a/test/other/metadce/test_metadce_hello_O0.funcs b/test/other/metadce/test_metadce_hello_O0.funcs
@@ -38,7 +38,6 @@ $getTempRet0
 $getint
 $getpid
 $init_pthread_self
-$isdigit
 $legalstub$dynCall_jiji
 $main
 $memchr
diff --git a/test/other/metadce/test_metadce_hello_O0.size b/test/other/metadce/test_metadce_hello_O0.size
@@ -1 +1 @@
-12161
+12133
diff --git a/test/other/test_unoptimized_code_size.wasm.size b/test/other/test_unoptimized_code_size.wasm.size
@@ -1 +1 @@
-12158
+12130
diff --git a/test/other/test_unoptimized_code_size_no_asserts.wasm.size b/test/other/test_unoptimized_code_size_no_asserts.wasm.size
@@ -1 +1 @@
-11599
+11571
diff --git a/test/other/test_unoptimized_code_size_strict.wasm.size b/test/other/test_unoptimized_code_size_strict.wasm.size
@@ -1 +1 @@
-12158
+12130

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "a.html": 12794,`
`3`		`- "a.html.gz": 7006,`
`4`		`- "total": 12794,`
`5`		`- "total_gz": 7006`
	`2`	`+ "a.html": 12734,`
	`3`	`+ "a.html.gz": 6983,`
	`4`	`+ "total": 12734,`
	`5`	`+ "total_gz": 6983`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "a.html": 17365,`
`3`		`- "a.html.gz": 7567,`
`4`		`- "total": 17365,`
`5`		`- "total_gz": 7567`
	`2`	`+ "a.html": 17329,`
	`3`	`+ "a.html.gz": 7543,`
	`4`	`+ "total": 17329,`
	`5`	`+ "total_gz": 7543`
`6`	`6`	`}`