maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Bug #: 

Submitted by:
Reviewed by:
Fix CheckRelationalOperands/CheckEqualityOperands to deal with null pointer
constants. The new logic also deals (more) correctly for non-pointer/integer
operands.

llvm-svn: 39654
This commit is contained in:
Steve Naroff 2007-06-13 21:41:08 +00:00
parent cf98efa73b
commit 75c1723b3c
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
clang/Sema/SemaExpr.cpp
View File

@ -813,12 +813,22 @@ inline QualType Sema::CheckRelationalOperands( // C99 6.5.8
if (lType->isRealType() && rType->isRealType())
return Context.IntTy;
if (lType->isPointerType() && rType->isPointerType())
return Context.IntTy;
if (lType->isIntegerType() || rType->isIntegerType()) { // GCC extension.
Diag(loc, diag::ext_typecheck_comparison_of_pointer_integer);
return Context.IntTy;
if (lType->isPointerType()) {
if (rType->isPointerType())
return Context.IntTy;
if (rType->isIntegerType()) {
if (!rex->isNullPointerConstant())
Diag(loc, diag::ext_typecheck_comparison_of_pointer_integer,
lex->getSourceRange(), rex->getSourceRange());
return Context.IntTy; // the previous diagnostic is a GCC extension.
}
} else if (rType->isPointerType()) {
if (lType->isIntegerType()) {
if (!lex->isNullPointerConstant())
Diag(loc, diag::ext_typecheck_comparison_of_pointer_integer,
lex->getSourceRange(), rex->getSourceRange());
return Context.IntTy; // the previous diagnostic is a GCC extension.
}
}
InvalidOperands(loc, lex, rex);
return QualType();
@ -832,12 +842,23 @@ inline QualType Sema::CheckEqualityOperands( // C99 6.5.9
if (lType->isArithmeticType() && rType->isArithmeticType())
return Context.IntTy;
if (lType->isPointerType() && rType->isPointerType())
return Context.IntTy;
if (lType->isIntegerType() || rType->isIntegerType()) { // GCC extension.
Diag(loc, diag::ext_typecheck_comparison_of_pointer_integer);
return Context.IntTy;
if (lType->isPointerType()) {
if (rType->isPointerType())
return Context.IntTy;
if (rType->isIntegerType()) {
if (!rex->isNullPointerConstant())
Diag(loc, diag::ext_typecheck_comparison_of_pointer_integer,
lex->getSourceRange(), rex->getSourceRange());
return Context.IntTy; // the previous diagnostic is a GCC extension.
}
} else if (rType->isPointerType()) {
if (lType->isIntegerType()) {
if (!lex->isNullPointerConstant())
Diag(loc, diag::ext_typecheck_comparison_of_pointer_integer,
lex->getSourceRange(), rex->getSourceRange());
return Context.IntTy; // the previous diagnostic is a GCC extension.
}
}
InvalidOperands(loc, lex, rex);
return QualType();