When we attempt to create a built-in that involves a library type we
don't have access to (e.g., fprintf, which needs the library type FILE), fail with a warning and forget about the builtin entirely. Previously, we would actually provide an error, which breaks autoconf's super-lame checks for fprintf, longjmp, etc. Fixes PR8316. llvm-svn: 122744
This commit is contained in:
parent
150d2124b2
commit
bfe022caa1
|
@ -223,10 +223,12 @@ def note_please_include_header : Note<
|
|||
"please include the header <%0> or explicitly provide a "
|
||||
"declaration for '%1'">;
|
||||
def note_previous_builtin_declaration : Note<"%0 is a builtin with type %1">;
|
||||
def err_implicit_decl_requires_stdio : Error<
|
||||
"implicit declaration of '%0' requires inclusion of the header <stdio.h>">;
|
||||
def err_implicit_decl_requires_setjmp : Error<
|
||||
"implicit declaration of '%0' requires inclusion of the header <setjmp.h>">;
|
||||
def warn_implicit_decl_requires_stdio : Warning<
|
||||
"declaration of built-in function '%0' requires inclusion of the header "
|
||||
"<stdio.h>">;
|
||||
def warn_implicit_decl_requires_setjmp : Warning<
|
||||
"declaration of built-in function '%0' requires inclusion of the header "
|
||||
"<setjmp.h>">;
|
||||
def warn_redecl_library_builtin : Warning<
|
||||
"incompatible redeclaration of library function %0">;
|
||||
def err_builtin_definition : Error<"definition of builtin function %0">;
|
||||
|
|
|
@ -793,13 +793,13 @@ NamedDecl *Sema::LazilyCreateBuiltin(IdentifierInfo *II, unsigned bid,
|
|||
|
||||
case ASTContext::GE_Missing_stdio:
|
||||
if (ForRedeclaration)
|
||||
Diag(Loc, diag::err_implicit_decl_requires_stdio)
|
||||
Diag(Loc, diag::warn_implicit_decl_requires_stdio)
|
||||
<< Context.BuiltinInfo.GetName(BID);
|
||||
return 0;
|
||||
|
||||
case ASTContext::GE_Missing_setjmp:
|
||||
if (ForRedeclaration)
|
||||
Diag(Loc, diag::err_implicit_decl_requires_setjmp)
|
||||
Diag(Loc, diag::warn_implicit_decl_requires_setjmp)
|
||||
<< Context.BuiltinInfo.GetName(BID);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -483,12 +483,21 @@ static bool LookupBuiltin(Sema &S, LookupResult &R) {
|
|||
S.Context.BuiltinInfo.isPredefinedLibFunction(BuiltinID))
|
||||
return false;
|
||||
|
||||
NamedDecl *D = S.LazilyCreateBuiltin((IdentifierInfo *)II, BuiltinID,
|
||||
S.TUScope, R.isForRedeclaration(),
|
||||
R.getNameLoc());
|
||||
if (D)
|
||||
if (NamedDecl *D = S.LazilyCreateBuiltin((IdentifierInfo *)II,
|
||||
BuiltinID, S.TUScope,
|
||||
R.isForRedeclaration(),
|
||||
R.getNameLoc())) {
|
||||
R.addDecl(D);
|
||||
return (D != NULL);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (R.isForRedeclaration()) {
|
||||
// If we're redeclaring this function anyway, forget that
|
||||
// this was a builtin at all.
|
||||
S.Context.BuiltinInfo.ForgetBuiltin(BuiltinID, S.Context.Idents);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ void h() {
|
|||
}
|
||||
|
||||
void f2() {
|
||||
fprintf(0, "foo"); // expected-error{{implicit declaration of 'fprintf' requires inclusion of the header <stdio.h>}} \
|
||||
fprintf(0, "foo"); // expected-warning{{declaration of built-in function 'fprintf' requires inclusion of the header <stdio.h>}} \
|
||||
expected-warning {{implicit declaration of function 'fprintf' is invalid in C99}}
|
||||
}
|
||||
|
||||
|
@ -52,3 +52,6 @@ main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
void snprintf() { }
|
||||
|
||||
// PR8316
|
||||
void longjmp(); // expected-warning{{declaration of built-in function 'longjmp' requires inclusion of the header <setjmp.h>}}
|
||||
|
|
Loading…
Reference in New Issue