Merge pull request #5439 from swiftwasm/katei/revert-valist-change

kateinoigakukun · web-flow · commit bc2ef647e3a2 · 2023-05-15T22:09:59.000+09:00
diff --git a/lib/ClangImporter/ImportType.cpp b/lib/ClangImporter/ImportType.cpp
@@ -847,7 +847,7 @@ namespace {
         }
 
         static const llvm::StringLiteral vaListNames[] = {
-          "va_list", "__gnuc_va_list", "__isoc_va_list", "__va_list"
+          "va_list", "__gnuc_va_list", "__va_list"
         };
 
         ImportHint hint = ImportHint::None;
diff --git a/lib/ClangImporter/MappedTypes.def b/lib/ClangImporter/MappedTypes.def
@@ -128,7 +128,6 @@ MAP_STDLIB_TYPE("u_int64_t", UnsignedInt, 64, "UInt64", false, DoNothing)
 // There's an explicit workaround in ImportType.cpp's VisitDecayedType for that.
 MAP_STDLIB_TYPE("va_list", VaList, 0, "CVaListPointer", false, DoNothing)
 MAP_STDLIB_TYPE("__gnuc_va_list", VaList, 0, "CVaListPointer", false, DoNothing)
-MAP_STDLIB_TYPE("__isoc_va_list", VaList, 0, "CVaListPointer", false, DoNothing)
 MAP_STDLIB_TYPE("__va_list", VaList, 0, "CVaListPointer", false, DoNothing)
 
 // libkern/OSTypes.h types.

Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,7 @@ namespace {`
`847`	`847`	`}`
`848`	`848`
`849`	`849`	`static const llvm::StringLiteral vaListNames[] = {`
`850`		`- "va_list", "__gnuc_va_list", "__isoc_va_list", "__va_list"`
	`850`	`+ "va_list", "__gnuc_va_list", "__va_list"`
`851`	`851`	`};`
`852`	`852`
`853`	`853`	`ImportHint hint = ImportHint::None;`