aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp6
-rw-r--r--test/Analysis/blocks.m4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp b/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
index 57e698bb7c..1aaaa68ca6 100644
--- a/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
@@ -82,14 +82,14 @@ UndefCapturedBlockVarChecker::PostVisitBlockExpr(CheckerContext &C,
if (state->getSVal(VR).isUndef())
if (ExplodedNode *N = C.generateSink()) {
if (!BT)
- BT = new BuiltinBug("Captured block variable is uninitialized");
+ BT = new BuiltinBug("uninitialized variable captured by block");
// Generate a bug report.
llvm::SmallString<128> buf;
llvm::raw_svector_ostream os(buf);
- os << "Variable '" << VD->getName() << "' is captured by block with "
- "a garbage value";
+ os << "Variable '" << VD->getName()
+ << "' is uninitialized when captured by block";
EnhancedBugReport *R = new EnhancedBugReport(*BT, os.str(), N);
if (const Expr *Ex = FindBlockDeclRefExpr(BE->getBody(), VD))
diff --git a/test/Analysis/blocks.m b/test/Analysis/blocks.m
index b05b198c54..e18d7cfb7b 100644
--- a/test/Analysis/blocks.m
+++ b/test/Analysis/blocks.m
@@ -73,7 +73,7 @@ void test1(NSString *format, ...) {
void test2() {
static int y = 0;
int x;
- ^{ y = x + 1; }(); // expected-warning{{Variable 'x' is captured by block with a garbage value}}
+ ^{ y = x + 1; }(); // expected-warning{{Variable 'x' is uninitialized when captured by block}}
}
void test2_b() {
@@ -86,5 +86,5 @@ void test2_b() {
void test2_c() {
typedef void (^myblock)(void);
- myblock f = ^() { f(); }; // expected-warning{{Variable 'f' is captured by block with a garbage value}}
+ myblock f = ^() { f(); }; // expected-warning{{Variable 'f' is uninitialized when captured by block}}
} \ No newline at end of file