diff options
| author | DeLesley Hutchins <delesley@google.com> | 2014-05-30 15:55:25 +0000 |
|---|---|---|
| committer | DeLesley Hutchins <delesley@google.com> | 2014-05-30 15:55:25 +0000 |
| commit | fb64e939d26f2facbdf0674fdc2809f3c7dedc75 (patch) | |
| tree | e68be3d0a7a4f1c2c7d4f5e06435c727df67a907 | |
| parent | c323952cb4f123c507d8b57bbc5cc7b241651d8e (diff) | |
| download | bcm5719-llvm-fb64e939d26f2facbdf0674fdc2809f3c7dedc75.tar.gz bcm5719-llvm-fb64e939d26f2facbdf0674fdc2809f3c7dedc75.zip | |
Thread Safety Analysis: fix uninitialized member in TIL Literal.
llvm-svn: 209904
| -rw-r--r-- | clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h | 4 | ||||
| -rw-r--r-- | clang/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h | 28 |
2 files changed, 17 insertions, 15 deletions
diff --git a/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h b/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h index a876e653925..e84af077f9f 100644 --- a/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h +++ b/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h @@ -607,9 +607,9 @@ public: static bool classof(const SExpr *E) { return E->opcode() == COP_Literal; } Literal(const clang::Expr *C) - : SExpr(COP_Literal), ValType(ValueType::getValueType<void>()) + : SExpr(COP_Literal), ValType(ValueType::getValueType<void>()), Cexpr(C) { } - Literal(ValueType VT) : SExpr(COP_Literal), ValType(VT) {} + Literal(ValueType VT) : SExpr(COP_Literal), ValType(VT), Cexpr(nullptr) {} Literal(const Literal &L) : SExpr(L), ValType(L.ValType), Cexpr(L.Cexpr) {} // The clang expression for this literal. diff --git a/clang/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h b/clang/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h index 344f9d68147..322a3b589ee 100644 --- a/clang/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h +++ b/clang/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h @@ -600,8 +600,10 @@ protected: } void printLiteral(Literal *E, StreamType &SS) { - if (E->clangExpr()) + if (E->clangExpr()) { SS << getSourceLiteralString(E->clangExpr()); + return; + } else { ValueType VT = E->valueType(); switch (VT.Base) { @@ -610,7 +612,7 @@ protected: return; } case ValueType::BT_Bool: { - if (reinterpret_cast<LiteralT<bool>*>(E)->value()) + if (E->as<bool>().value()) SS << "true"; else SS << "false"; @@ -620,27 +622,27 @@ protected: switch (VT.Size) { case ValueType::ST_8: if (VT.Signed) - printLiteralT(reinterpret_cast<LiteralT<int8_t>*>(E), SS); + printLiteralT(&E->as<int8_t>(), SS); else - printLiteralT(reinterpret_cast<LiteralT<uint8_t>*>(E), SS); + printLiteralT(&E->as<uint8_t>(), SS); return; case ValueType::ST_16: if (VT.Signed) - printLiteralT(reinterpret_cast<LiteralT<int16_t>*>(E), SS); + printLiteralT(&E->as<int16_t>(), SS); else - printLiteralT(reinterpret_cast<LiteralT<uint16_t>*>(E), SS); + printLiteralT(&E->as<uint16_t>(), SS); return; case ValueType::ST_32: if (VT.Signed) - printLiteralT(reinterpret_cast<LiteralT<int32_t>*>(E), SS); + printLiteralT(&E->as<int32_t>(), SS); else - printLiteralT(reinterpret_cast<LiteralT<uint32_t>*>(E), SS); + printLiteralT(&E->as<uint32_t>(), SS); return; case ValueType::ST_64: if (VT.Signed) - printLiteralT(reinterpret_cast<LiteralT<int64_t>*>(E), SS); + printLiteralT(&E->as<int64_t>(), SS); else - printLiteralT(reinterpret_cast<LiteralT<uint64_t>*>(E), SS); + printLiteralT(&E->as<uint64_t>(), SS); return; default: break; @@ -650,10 +652,10 @@ protected: case ValueType::BT_Float: { switch (VT.Size) { case ValueType::ST_32: - printLiteralT(reinterpret_cast<LiteralT<float>*>(E), SS); + printLiteralT(&E->as<float>(), SS); return; case ValueType::ST_64: - printLiteralT(reinterpret_cast<LiteralT<double>*>(E), SS); + printLiteralT(&E->as<double>(), SS); return; default: break; @@ -662,7 +664,7 @@ protected: } case ValueType::BT_String: { SS << "\""; - printLiteralT(reinterpret_cast<LiteralT<StringRef>*>(E), SS); + printLiteralT(&E->as<StringRef>(), SS); SS << "\""; return; } |
