From e40d4053ba8a3ef9eb22eddb8a747e3a1c8a2450 Mon Sep 17 00:00:00 2001 From: George Karpenkov Date: Thu, 6 Sep 2018 23:07:26 +0000 Subject: [PATCH] [analyzer] Dump a reproducible, deterministic ID of program state to exploded graph Differential Revision: https://reviews.llvm.org/D51395 llvm-svn: 341600 --- .../include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h | 2 ++ clang/lib/StaticAnalyzer/Core/ExprEngine.cpp | 3 ++- clang/lib/StaticAnalyzer/Core/ProgramState.cpp | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h index b86301a..6aaa1e5 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h @@ -107,6 +107,8 @@ public: ~ProgramState(); + int64_t getID() const; + /// Return the ProgramStateManager associated with this state. ProgramStateManager &getStateManager() const { return *stateMgr; diff --git a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp index 04190de..a9901a6 100644 --- a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp +++ b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp @@ -3141,7 +3141,8 @@ struct DOTGraphTraits : public DefaultDOTGraphTraits { } ProgramStateRef state = N->getState(); - Out << "\\|StateID: " << (const void*) state.get() + Out << "\\|StateID: " << state->getID() << " (" + << (const void*) state.get() << ")" << " NodeID: " << (const void*) N << "\\|"; state->printDOT(Out, N->getLocationContext()); diff --git a/clang/lib/StaticAnalyzer/Core/ProgramState.cpp b/clang/lib/StaticAnalyzer/Core/ProgramState.cpp index 94e2e00..361255b 100644 --- a/clang/lib/StaticAnalyzer/Core/ProgramState.cpp +++ b/clang/lib/StaticAnalyzer/Core/ProgramState.cpp @@ -69,6 +69,13 @@ ProgramState::~ProgramState() { stateMgr->getStoreManager().decrementReferenceCount(store); } +int64_t ProgramState::getID() const { + Optional Out = getStateManager().Alloc.identifyObject(this); + assert(Out && "Wrong allocator used"); + assert(*Out % alignof(ProgramState) == 0 && "Wrong alignment information"); + return *Out / alignof(ProgramState); +} + ProgramStateManager::ProgramStateManager(ASTContext &Ctx, StoreManagerCreator CreateSMgr, ConstraintManagerCreator CreateCMgr, -- 2.7.4