Make it possible for builtins to expression FILE* arguments, so that
we can define builtins such as fprintf, vfprintf, and
__builtin___fprintf_chk. Give a nice error message when we need to
implicitly declare a function like fprintf.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64526 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 45ef035..4666250 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -133,9 +133,7 @@
KnownFunctionIDs[id_NSLog] = &IT.get("NSLog");
KnownFunctionIDs[id_asprintf] = &IT.get("asprintf");
- KnownFunctionIDs[id_fprintf] = &IT.get("fprintf");
KnownFunctionIDs[id_vasprintf] = &IT.get("vasprintf");
- KnownFunctionIDs[id_vfprintf] = &IT.get("vfprintf");
StdNamespace = 0;
TUScope = 0;
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index db08377..f202ad4 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -182,9 +182,7 @@
enum {
id_NSLog,
id_asprintf,
- id_fprintf,
id_vasprintf,
- id_vfprintf,
id_num_known_functions
};
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index ab71255..7ecc304 100644
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -87,12 +87,10 @@
} else if (FnInfo == KnownFunctionIDs[id_NSLog]) {
format_idx = 0;
HasVAListArg = false;
- } else if (FnInfo == KnownFunctionIDs[id_asprintf] ||
- FnInfo == KnownFunctionIDs[id_fprintf]) {
+ } else if (FnInfo == KnownFunctionIDs[id_asprintf]) {
format_idx = 1;
HasVAListArg = false;
- } else if (FnInfo == KnownFunctionIDs[id_vasprintf] ||
- FnInfo == KnownFunctionIDs[id_vfprintf]) {
+ } else if (FnInfo == KnownFunctionIDs[id_vasprintf]) {
format_idx = 1;
HasVAListArg = true;
} else {
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 3c02d4b..16e8691 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -298,7 +298,19 @@
if (Context.BuiltinInfo.hasVAListUse(BID))
InitBuiltinVaListType();
- QualType R = Context.BuiltinInfo.GetBuiltinType(BID, Context);
+ Builtin::Context::GetBuiltinTypeError Error;
+ QualType R = Context.BuiltinInfo.GetBuiltinType(BID, Context, Error);
+ switch (Error) {
+ case Builtin::Context::GE_None:
+ // Okay
+ break;
+
+ case Builtin::Context::GE_Missing_FILE:
+ if (ForRedeclaration)
+ Diag(Loc, diag::err_implicit_decl_requires_stdio)
+ << Context.BuiltinInfo.GetName(BID);
+ return 0;
+ }
if (!ForRedeclaration && Context.BuiltinInfo.isPredefinedLibFunction(BID)) {
Diag(Loc, diag::ext_implicit_lib_function_decl)