mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:fpcomparison: Fix check for floating-point zero

Browse Source 
...so that isZeroConstant doesn't trigger an assert inside Clang's
isCXX11ConstantExpr when expr is sizeof(x) with x being dependent on a template
argument.

Change-Id: I6bab46e64cc085d597db25994d8bfdc66417fe83
This commit is contained in:
Stephan Bergmann
2016-02-04 10:57:25 +01:00
parent 7b0b9da7cb
commit 39accf65cd
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compilerplugins/clang/fpcomparison.cxx
View File

@@ -97,8 +97,7 @@ bool FpComparison::ignore(FunctionDecl* function)
static bool isZeroConstant(ASTContext& context, const Expr* expr)
{
// calling isCXX11ConstantExpr with non-arithmetic types sometimes results in a crash
if (!expr->getType()->isArithmeticType()) {
if (!expr->getType()->isFloatingType()) {
return false;
}
// prevent clang crash
@@ -106,12 +105,11 @@ static bool isZeroConstant(ASTContext& context, const Expr* expr)
return false;
}
APValue result;
if (expr->isCXX11ConstantExpr(context, &result)
&& result.isFloat() && result.getFloat().isZero())
{
return true;
if (!expr->isCXX11ConstantExpr(context, &result)) {
return false;
}
return false;
assert(result.isFloat());
return result.getFloat().isZero();
}
bool FpComparison::VisitBinaryOperator(const BinaryOperator* binaryOp)
{