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

Fixed another case where sizeof() returns the size in bytes, not bits. 

This parallels a previous patch (duplicate logic caused the bug to appear
in multiple locations):
 
  r44316 (http://llvm.org/viewvc/llvm-project?rev=44316&view=rev).

Patch provided by Nuno Lopes.

llvm-svn: 45098
This commit is contained in:
Ted Kremenek 2007-12-17 17:38:43 +00:00
parent 557fb1451e
commit 05821322b4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/AST/Expr.cpp
View File

@ -662,10 +662,16 @@ bool Expr::isIntegerConstantExpr(llvm::APSInt &Result, ASTContext &Ctx,
static_cast<uint32_t>(Ctx.getTypeSize(getType(), Exp->getOperatorLoc()))); static_cast<uint32_t>(Ctx.getTypeSize(getType(), Exp->getOperatorLoc())));
// Get information about the size or align. // Get information about the size or align.
if (Exp->isSizeOf()) if (Exp->isSizeOf()) {
Result = Ctx.getTypeSize(Exp->getArgumentType(), Exp->getOperatorLoc()); unsigned CharSize =
Ctx.Target.getCharWidth(Ctx.getFullLoc(Exp->getOperatorLoc()));
Result = Ctx.getTypeSize(Exp->getArgumentType(),
Exp->getOperatorLoc()) / CharSize;
}
else else
Result = Ctx.getTypeAlign(Exp->getArgumentType(), Exp->getOperatorLoc()); Result = Ctx.getTypeAlign(Exp->getArgumentType(), Exp->getOperatorLoc());
break; break;
} }
case BinaryOperatorClass: { case BinaryOperatorClass: {