diff options
| -rw-r--r-- | clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Analysis/number-object-conversion.mm | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp index 40e379cb2ef..d1749cfdbe2 100644 --- a/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp @@ -270,8 +270,10 @@ void NumberObjectConversionChecker::checkASTCodeBody(const Decl *D, hasRHS(SuspiciousNumberObjectExprM))); auto ConversionThroughBranchingM = - ifStmt(hasCondition(SuspiciousNumberObjectExprM)) - .bind("pedantic"); + ifStmt(allOf( + hasCondition(SuspiciousNumberObjectExprM), + unless(hasConditionVariableStatement(declStmt()) + ))).bind("pedantic"); auto ConversionThroughCallM = callExpr(hasAnyArgument(allOf(hasType(SuspiciousScalarTypeM), diff --git a/clang/test/Analysis/number-object-conversion.mm b/clang/test/Analysis/number-object-conversion.mm new file mode 100644 index 00000000000..32628b2e8f2 --- /dev/null +++ b/clang/test/Analysis/number-object-conversion.mm @@ -0,0 +1,13 @@ +// RUN: %clang_analyze_cc1 -triple i386-apple-darwin10 -fblocks -fobjc-arc -w -analyzer-checker=osx.NumberObjectConversion -analyzer-config osx.NumberObjectConversion:Pedantic=true %s -verify + +#include "Inputs/system-header-simulator-objc.h" + +NSNumber* generateNumber(); + +// expected-no-diagnostics +int test_initialization_in_ifstmt() { // Don't warn on initialization in guard. + if (NSNumber* number = generateNumber()) { // no-warning + return 0; + } + return 1; +} |
