[cfe-commits] r45239 - in /cfe/trunk: Sema/Sema.h Sema/SemaChecking.cpp Sema/SemaExpr.cpp include/clang/Basic/DiagnosticKinds.def test/Sema/builtins.c test/Sema/cfstring.c
Chris Lattner
sabre at nondot.org
Wed Dec 19 16:26:34 PST 2007
Author: lattner
Date: Wed Dec 19 18:26:33 2007
New Revision: 45239
URL: http://llvm.org/viewvc/llvm-project?rev=45239&view=rev
Log:
implement semantic analysis for __builtin_islessequal and friends.
Added:
cfe/trunk/test/Sema/builtins.c
Removed:
cfe/trunk/test/Sema/cfstring.c
Modified:
cfe/trunk/Sema/Sema.h
cfe/trunk/Sema/SemaChecking.cpp
cfe/trunk/Sema/SemaExpr.cpp
cfe/trunk/include/clang/Basic/DiagnosticKinds.def
Modified: cfe/trunk/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/Sema.h?rev=45239&r1=45238&r2=45239&view=diff
==============================================================================
--- cfe/trunk/Sema/Sema.h (original)
+++ cfe/trunk/Sema/Sema.h Wed Dec 19 18:26:33 2007
@@ -729,6 +729,8 @@
bool CheckBuiltinCFStringArgument(Expr* Arg);
bool SemaBuiltinVAStart(Expr *Fn, Expr** Args, unsigned NumArgs);
+ bool SemaBuiltinUnorderedCompare(Expr *Fn, Expr** Args, unsigned NumArgs,
+ SourceLocation RParenLoc);
void CheckFloatComparison(SourceLocation loc, Expr* lex, Expr* rex);
};
Modified: cfe/trunk/Sema/SemaChecking.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/SemaChecking.cpp?rev=45239&r1=45238&r2=45239&view=diff
==============================================================================
--- cfe/trunk/Sema/SemaChecking.cpp (original)
+++ cfe/trunk/Sema/SemaChecking.cpp Wed Dec 19 18:26:33 2007
@@ -33,19 +33,26 @@
/// and safety properties not strictly enforced by the C type system.
bool
Sema::CheckFunctionCall(Expr *Fn, SourceLocation RParenLoc,
- FunctionDecl *FDecl,
- Expr** Args, unsigned NumArgsInCall) {
+ FunctionDecl *FDecl, Expr** Args, unsigned NumArgs) {
// Get the IdentifierInfo* for the called function.
IdentifierInfo *FnInfo = FDecl->getIdentifier();
switch (FnInfo->getBuiltinID()) {
case Builtin::BI__builtin___CFStringMakeConstantString:
- assert(NumArgsInCall == 1 &&
- "Wrong number of arguments to builtin CFStringMakeConstantString");
+ assert(NumArgs == 1 &&
+ "Wrong # arguments to builtin CFStringMakeConstantString");
return CheckBuiltinCFStringArgument(Args[0]);
case Builtin::BI__builtin_va_start:
- return SemaBuiltinVAStart(Fn, Args, NumArgsInCall);
+ return SemaBuiltinVAStart(Fn, Args, NumArgs);
+
+ case Builtin::BI__builtin_isgreater:
+ case Builtin::BI__builtin_isgreaterequal:
+ case Builtin::BI__builtin_isless:
+ case Builtin::BI__builtin_islessequal:
+ case Builtin::BI__builtin_islessgreater:
+ case Builtin::BI__builtin_isunordered:
+ return SemaBuiltinUnorderedCompare(Fn, Args, NumArgs, RParenLoc);
}
// Search the KnownFunctionIDs for the identifier.
@@ -75,7 +82,7 @@
}
CheckPrintfArguments(Fn, RParenLoc, HasVAListArg,
- FDecl, format_idx, Args, NumArgsInCall);
+ FDecl, format_idx, Args, NumArgs);
}
return false;
@@ -170,6 +177,36 @@
return false;
}
+/// SemaBuiltinUnorderedCompare - Handle functions like __builtin_isgreater and
+/// friends. This is declared to take (...), so we have to check everything.
+bool Sema::SemaBuiltinUnorderedCompare(Expr *Fn, Expr** Args, unsigned NumArgs,
+ SourceLocation RParenLoc) {
+ if (NumArgs < 2)
+ return Diag(RParenLoc, diag::err_typecheck_call_too_few_args);
+ if (NumArgs > 2)
+ return Diag(Args[2]->getLocStart(), diag::err_typecheck_call_too_many_args,
+ SourceRange(Args[2]->getLocStart(),
+ Args[NumArgs-1]->getLocEnd()));
+
+ Expr *OrigArg0 = Args[0];
+ Expr *OrigArg1 = Args[1];
+
+ // Do standard promotions between the two arguments, returning their common
+ // type.
+ QualType Res = UsualArithmeticConversions(Args[0], Args[1], false);
+
+ // If the common type isn't a real floating type, then the arguments were
+ // invalid for this operation.
+ if (!Res->isRealFloatingType())
+ return Diag(Args[0]->getLocStart(),
+ diag::err_typecheck_call_invalid_ordered_compare,
+ OrigArg0->getType().getAsString(),
+ OrigArg1->getType().getAsString(),
+ SourceRange(Args[0]->getLocStart(), Args[1]->getLocEnd()));
+
+ return false;
+}
+
/// CheckPrintfArguments - Check calls to printf (and similar functions) for
/// correct use of format strings.
@@ -221,9 +258,9 @@
Sema::CheckPrintfArguments(Expr *Fn, SourceLocation RParenLoc,
bool HasVAListArg, FunctionDecl *FDecl,
unsigned format_idx, Expr** Args,
- unsigned NumArgsInCall) {
+ unsigned NumArgs) {
// CHECK: printf-like function is called with no format string.
- if (format_idx >= NumArgsInCall) {
+ if (format_idx >= NumArgs) {
Diag(RParenLoc, diag::warn_printf_missing_format_string,
Fn->getSourceRange());
return;
@@ -314,7 +351,7 @@
// string. This can only be determined for non vprintf-like
// functions. For those functions, this value is 1 (the sole
// va_arg argument).
- unsigned numDataArgs = NumArgsInCall-(format_idx+1);
+ unsigned numDataArgs = NumArgs-(format_idx+1);
// Inspect the format string.
unsigned StrIdx = 0;
Modified: cfe/trunk/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/SemaExpr.cpp?rev=45239&r1=45238&r2=45239&view=diff
==============================================================================
--- cfe/trunk/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/Sema/SemaExpr.cpp Wed Dec 19 18:26:33 2007
@@ -647,8 +647,8 @@
break;
case Incompatible:
return Diag(l, diag::err_typecheck_passing_incompatible,
- rhsType.getAsString(), lhsType.getAsString(),
- Fn->getSourceRange(), argExpr->getSourceRange());
+ rhsType.getAsString(), lhsType.getAsString(),
+ Fn->getSourceRange(), argExpr->getSourceRange());
}
}
if (NumArgsInCall > NumArgsInProto && proto->isVariadic()) {
Modified: cfe/trunk/include/clang/Basic/DiagnosticKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticKinds.def?rev=45239&r1=45238&r2=45239&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticKinds.def Wed Dec 19 18:26:33 2007
@@ -783,6 +783,8 @@
"too few arguments to function")
DIAG(err_typecheck_call_too_many_args, ERROR,
"too many arguments to function")
+DIAG(err_typecheck_call_invalid_ordered_compare, ERROR,
+ "ordered compare requires two args of floating point type ('%0' and '%1')")
DIAG(err_typecheck_passing_incompatible, ERROR,
"incompatible types passing '%0' to function expecting '%1'")
DIAG(ext_typecheck_passing_incompatible_pointer, WARNING,
Added: cfe/trunk/test/Sema/builtins.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/builtins.c?rev=45239&view=auto
==============================================================================
--- cfe/trunk/test/Sema/builtins.c (added)
+++ cfe/trunk/test/Sema/builtins.c Wed Dec 19 18:26:33 2007
@@ -0,0 +1,33 @@
+// RUN: clang %s -fsyntax-only -verify
+
+int test1(float a, int b) {
+ return __builtin_isless(a, b);
+}
+int test2(int a, int b) {
+ return __builtin_islessequal(a, b); // expected-error {{floating point type}}
+}
+
+int test3(double a, float b) {
+ return __builtin_isless(a, b);
+}
+int test4(int* a, double b) {
+ return __builtin_islessequal(a, b); // expected-error {{floating point type}}
+}
+
+int test5(float a, long double b) {
+ return __builtin_isless(a, b, b); // expected-error {{too many arguments}}
+}
+int test6(float a, long double b) {
+ return __builtin_islessequal(a); // expected-error {{too few arguments}}
+}
+
+
+#define CFSTR __builtin___CFStringMakeConstantString
+void cfstring() {
+ CFSTR("\242"); // expected-warning {{ CFString literal contains non-ASCII character }}
+ CFSTR("\0"); // expected-warning {{ CFString literal contains NUL character }}
+ CFSTR(242); // expected-error {{ CFString literal is not a string constant }} \
+ expected-warning {{incompatible types}}
+ CFSTR("foo", "bar"); // expected-error {{ error: too many arguments to function }}
+}
+
Removed: cfe/trunk/test/Sema/cfstring.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/cfstring.c?rev=45238&view=auto
==============================================================================
--- cfe/trunk/test/Sema/cfstring.c (original)
+++ cfe/trunk/test/Sema/cfstring.c (removed)
@@ -1,10 +0,0 @@
-#define CFSTR __builtin___CFStringMakeConstantString
-
-// RUN: clang %s -fsyntax-only -verify
-void f() {
- CFSTR("\242"); // expected-warning {{ CFString literal contains non-ASCII character }}
- CFSTR("\0"); // expected-warning {{ CFString literal contains NUL character }}
- CFSTR(242); // expected-error {{ CFString literal is not a string constant }} \
- expected-warning {{incompatible types}}
- CFSTR("foo", "bar"); // expected-error {{ error: too many arguments to function }}
-}
More information about the cfe-commits
mailing list