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

Remove unnecessary restrictions

Browse Source 
Change-Id: Idc0db273f7ad2d6b11113752ca01a1f2a327e991
This commit is contained in:
Stephan Bergmann
2017-05-18 14:26:47 +02:00
parent a7551b34ad
commit 9b51d16771
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compilerplugins/clang/comparisonwithconstant.cxx
View File

@@ -74,11 +74,6 @@ bool ComparisonWithConstant::VisitBinaryOperator(const BinaryOperator* binaryOp)
if (!(binaryOp->getOpcode() == BO_EQ || binaryOp->getOpcode() == BO_NE)) { if (!(binaryOp->getOpcode() == BO_EQ || binaryOp->getOpcode() == BO_NE)) {
return true; return true;
} }
// ignore logging macros
if (compiler.getSourceManager().isMacroBodyExpansion(binaryOp->getSourceRange().getBegin())
|| compiler.getSourceManager().isMacroArgExpansion(binaryOp->getSourceRange().getBegin())) {
return true;
}
// protect against clang assert // protect against clang assert
if (binaryOp->getLHS()->isValueDependent() || binaryOp->getRHS()->isValueDependent()) { if (binaryOp->getLHS()->isValueDependent() || binaryOp->getRHS()->isValueDependent()) {
return true; return true;
@@ -118,14 +113,6 @@ bool ComparisonWithConstant::rewrite(const BinaryOperator * binaryOp) {
const std::string lhsString = getExprAsString(lhsRange); const std::string lhsString = getExprAsString(lhsRange);
const std::string rhsString = getExprAsString(rhsRange); const std::string rhsString = getExprAsString(rhsRange);
/* we can't safely move around stuff containing comments, we mess up the resulting code */
if ( lhsString.find("/*") != std::string::npos || lhsString.find("//") != std::string::npos ) {
return false;
}
if ( rhsString.find("/*") != std::string::npos || rhsString.find("//") != std::string::npos ) {
return false;
}
// switch LHS and RHS // switch LHS and RHS
if (!replaceText(lhsRange, rhsString)) { if (!replaceText(lhsRange, rhsString)) {
return false; return false;