george.karpenkov created this revision.
Herald added subscribers: szepet, kristof.beyls, xazax.hun, javed.absar,
aemerson.
https://reviews.llvm.org/D38810
Files:
lib/Analysis/BodyFarm.cpp
test/Analysis/call_once.cpp
Index: test/Analysis/call_once.cpp
===================================================================
--- test/Analysis/call_once.cpp
+++ test/Analysis/call_once.cpp
@@ -1,15 +1,24 @@
-// RUN: %clang_analyze_cc1 -std=c++11 -fblocks -analyzer-checker=core,debug.ExprInspection -w -verify %s
+// RUN: %clang_analyze_cc1 -std=c++11 -fblocks -analyzer-checker=core,debug.ExprInspection -verify %s
+// RUN: %clang_analyze_cc1 -std=c++11 -fblocks -analyzer-checker=core,debug.ExprInspection -DEMULATE_LIBSTDCPP -verify %s
void clang_analyzer_eval(bool);
// Faking std::std::call_once implementation.
namespace std {
+
+#ifndef EMULATE_LIBSTDCPP
typedef struct once_flag_s {
unsigned long __state_ = 0;
} once_flag;
+#else
+typedef struct once_flag_s {
+ int _M_once = 0;
+} once_flag;
+#endif
template <class Callable, class... Args>
void call_once(once_flag &o, Callable func, Args... args) {};
+
} // namespace std
// Check with Lambdas.
Index: lib/Analysis/BodyFarm.cpp
===================================================================
--- lib/Analysis/BodyFarm.cpp
+++ lib/Analysis/BodyFarm.cpp
@@ -108,7 +108,7 @@
/// Returns a *first* member field of a record declaration with a given name.
/// \return an nullptr if no member with such a name exists.
- NamedDecl *findMemberField(const CXXRecordDecl *RD, StringRef Name);
+ NamedDecl *findMemberField(const RecordDecl *RD, StringRef Name);
private:
ASTContext &C;
@@ -234,7 +234,7 @@
OK_Ordinary);
}
-NamedDecl *ASTMaker::findMemberField(const CXXRecordDecl *RD, StringRef Name) {
+NamedDecl *ASTMaker::findMemberField(const RecordDecl *RD, StringRef Name) {
CXXBasePaths Paths(
/* FindAmbiguities=*/false,
@@ -328,28 +328,35 @@
const ParmVarDecl *Callback = D->getParamDecl(1);
QualType CallbackType = Callback->getType().getNonReferenceType();
QualType FlagType = Flag->getType().getNonReferenceType();
- CXXRecordDecl *FlagCXXDecl = FlagType->getAsCXXRecordDecl();
- if (!FlagCXXDecl) {
- DEBUG(llvm::dbgs() << "Flag field is not a CXX record: "
- << "unknown std::call_once implementation."
- << "Ignoring the call.\n");
+ auto *FlagRecordDecl = dyn_cast_or_null<RecordDecl>(FlagType->getAsTagDecl());
+
+ if (!FlagRecordDecl) {
+ DEBUG(llvm::dbgs() << "Flag field is not a record: "
+ << "unknown std::call_once implementation, "
+ << "ignoring the call.\n");
return nullptr;
}
- // Note: here we are assuming libc++ implementation of call_once,
- // which has a struct with a field `__state_`.
- // Body farming might not work for other `call_once` implementations.
- NamedDecl *FoundDecl = M.findMemberField(FlagCXXDecl, "__state_");
- ValueDecl *FieldDecl;
- if (FoundDecl) {
- FieldDecl = dyn_cast<ValueDecl>(FoundDecl);
- } else {
+ // We initially assume libc++ implementation of call_once,
+ // where the once_flag struct has a field `__state_`.
+ NamedDecl *FoundDecl = M.findMemberField(FlagRecordDecl, "__state_");
+
+ // Otherwise, try libstdc++ implementation, with a field
+ // `_M_once`
+ if (!FoundDecl) {
DEBUG(llvm::dbgs() << "No field __state_ found on std::once_flag struct, "
- << "unable to synthesize call_once body, ignoring "
- << "the call.\n");
+ << "trying libstdc++ implementation\n");
+ FoundDecl = M.findMemberField(FlagRecordDecl, "_M_once");
+ }
+
+ if (!FoundDecl) {
+ DEBUG(llvm::dbgs() << "No field _M_once found on std::once flag struct: "
+ << "unknown std::call_once implementation, "
+ << "ignoring the call");
return nullptr;
}
+ ValueDecl *FieldDecl = dyn_cast<ValueDecl>(FoundDecl);
bool isLambdaCall = CallbackType->getAsCXXRecordDecl() &&
CallbackType->getAsCXXRecordDecl()->isLambda();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
