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:
Fixed typechecking bugs wrt UsualUnaryConversions. Includes two distinct fixes:

#1: Call UsualUnaryConversions in CheckRelationalOperands/CheckEqualityOperands.
#2: UsualArithmeticConversions arguments are now output parameters. This insures
the implicit conversion is seen by clients (and fixes bugs in CheckAdditionOperands
and CheckSubtractionOperands when doing pointer arithmetic).
~

llvm-svn: 39649
This commit is contained in:
Steve Naroff 2007-06-13 15:42:33 +00:00
parent c0a38dd38f
commit d6fbee81df
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/Sema/Sema.h
View File

@ -274,7 +274,7 @@ private:
// operators (C99 6.3.1.8). If both operands aren't arithmetic, this
// routine returns the first non-arithmetic type found. The client is
// responsible for emitting appropriate error diagnostics.
QualType UsualArithmeticConversions(QualType t1, QualType t2);
QualType UsualArithmeticConversions(QualType &t1, QualType &t2);
// DefaultFunctionArrayConversion - converts functions and arrays
// to their respective pointers (C99 6.3.2.1). If the type isn't a function
// or array, this routine simply returns the input type (unmodified).

27
clang/Sema/SemaExpr.cpp
View File

@ -592,9 +592,9 @@ QualType Sema::UsualUnaryConversions(QualType t) {
/// binary operators (C99 6.3.1.8). If both operands aren't arithmetic, this
/// routine returns the first non-arithmetic type found. The client is
/// responsible for emitting appropriate error diagnostics.
QualType Sema::UsualArithmeticConversions(QualType t1, QualType t2) {
QualType lhs = UsualUnaryConversions(t1);
QualType rhs = UsualUnaryConversions(t2);
QualType Sema::UsualArithmeticConversions(QualType &lhs, QualType &rhs) {
lhs = UsualUnaryConversions(lhs);
rhs = UsualUnaryConversions(rhs);
// If both types are identical, no conversion is needed.
if (lhs == rhs)
@ -736,7 +736,8 @@ inline void Sema::InvalidOperands(SourceLocation loc, Expr *lex, Expr *rex) {
inline QualType Sema::CheckMultiplyDivideOperands(
Expr *lex, Expr *rex, SourceLocation loc)
{
QualType resType = UsualArithmeticConversions(lex->getType(), rex->getType());
QualType lhsType = lex->getType(), rhsType = rex->getType();
QualType resType = UsualArithmeticConversions(lhsType, rhsType);
if (resType->isArithmeticType())
return resType;
@ -747,7 +748,8 @@ inline QualType Sema::CheckMultiplyDivideOperands(
inline QualType Sema::CheckRemainderOperands(
Expr *lex, Expr *rex, SourceLocation loc)
{
QualType resType = UsualArithmeticConversions(lex->getType(), rex->getType());
QualType lhsType = lex->getType(), rhsType = rex->getType();
QualType resType = UsualArithmeticConversions(lhsType, rhsType);
if (resType->isIntegerType())
return resType;
@ -793,7 +795,8 @@ inline QualType Sema::CheckShiftOperands( // C99 6.5.7
{
// FIXME: Shifts don't perform usual arithmetic conversions. This is wrong
// for int << longlong -> the result type should be int, not long long.
QualType resType = UsualArithmeticConversions(lex->getType(), rex->getType());
QualType lhsType = lex->getType(), rhsType = rex->getType();
QualType resType = UsualArithmeticConversions(lhsType, rhsType);
if (resType->isIntegerType())
return resType;
@ -804,7 +807,8 @@ inline QualType Sema::CheckShiftOperands( // C99 6.5.7
inline QualType Sema::CheckRelationalOperands( // C99 6.5.8
Expr *lex, Expr *rex, SourceLocation loc)
{
QualType lType = lex->getType(), rType = rex->getType();
QualType lType = UsualUnaryConversions(lex->getType());
QualType rType = UsualUnaryConversions(rex->getType());
if (lType->isRealType() && rType->isRealType())
return Context.IntTy;
@ -823,7 +827,8 @@ inline QualType Sema::CheckRelationalOperands( // C99 6.5.8
inline QualType Sema::CheckEqualityOperands( // C99 6.5.9
Expr *lex, Expr *rex, SourceLocation loc)
{
QualType lType = lex->getType(), rType = rex->getType();
QualType lType = UsualUnaryConversions(lex->getType());
QualType rType = UsualUnaryConversions(rex->getType());
if (lType->isArithmeticType() && rType->isArithmeticType())
return Context.IntTy;
@ -841,7 +846,8 @@ inline QualType Sema::CheckEqualityOperands( // C99 6.5.9
inline QualType Sema::CheckBitwiseOperands(
Expr *lex, Expr *rex, SourceLocation loc)
{
QualType resType = UsualArithmeticConversions(lex->getType(), rex->getType());
QualType lhsType = lex->getType(), rhsType = rex->getType();
QualType resType = UsualArithmeticConversions(lhsType, rhsType);
if (resType->isIntegerType())
return resType;
@ -948,7 +954,8 @@ inline QualType Sema::CheckCommaOperands( // C99 6.5.17
}
QualType Sema::CheckIncrementDecrementOperand(Expr *op, SourceLocation OpLoc) {
QualType resType = UsualArithmeticConversions(op->getType(), Context.IntTy);
QualType lhsType = op->getType(), rhsType = Context.IntTy;
QualType resType = UsualArithmeticConversions(lhsType, rhsType);
assert(!resType.isNull() && "no type for increment/decrement expression");
// C99 6.5.2.4p1