Created ExplodedGraph.cpp and moved most method implementations of

ExplodedNodeImpl::NodeGroup from being defined inline to being defined
"out-of-line" in ExplodedGraph.cpp. This removes a dependence on including
<vector> in ExplodedGraph.h, and will hopefully result in smaller generated code
with negligible performance impact.

llvm-svn: 45928

2 files changed, 78 insertions, 53 deletions

diff --git a/clang/Analysis/ExplodedGraph.cpp b/clang/Analysis/ExplodedGraph.cpp
new file mode 100644
index 00000000000..4c9f0265328
--- /dev/null
+++ b/clang/Analysis/ExplodedGraph.cpp
@@ -0,0 +1,70 @@
+//=-- ExplodedGraph.cpp - Local, Path-Sens. "Exploded Graph" -*- C++ -*------=//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//  This file defines the template classes ExplodedNode and ExplodedGraph,
+//  which represent a path-sensitive, intra-procedural "exploded graph."
+//
+//===----------------------------------------------------------------------===//
+
+#include "clang/Analysis/PathSensitive/ExplodedGraph.h"
+#include <vector>
+
+using namespace clang;
+
+
+static inline std::vector<ExplodedNodeImpl*>& getVector(void* P) {
+  return *reinterpret_cast<std::vector<ExplodedNodeImpl*>*>(P);
+}
+
+void ExplodedNodeImpl::NodeGroup::addNode(ExplodedNodeImpl* N) {
+  if (getKind() == Size1) {
+    if (ExplodedNodeImpl* NOld = getNode()) {
+      std::vector<ExplodedNodeImpl*>* V = new std::vector<ExplodedNodeImpl*>();
+      V->push_back(NOld);
+      V->push_back(N);
+      P = reinterpret_cast<uintptr_t>(V) & SizeOther;
+    }
+    else
+      P = reinterpret_cast<uintptr_t>(N);
+  }
+  else
+    getVector(getPtr()).push_back(N);
+}
+
+bool ExplodedNodeImpl::NodeGroup::empty() const {
+  if (getKind() == Size1)
+    return getNode() ? false : true;
+  else
+    return getVector(getPtr()).empty();
+}
+
+unsigned ExplodedNodeImpl::NodeGroup::size() const {
+  if (getKind() == Size1)
+    return getNode() ? 1 : 0;
+  else
+    return getVector(getPtr()).size();
+}
+
+ExplodedNodeImpl** ExplodedNodeImpl::NodeGroup::begin() const {
+  if (getKind() == Size1)
+    return (ExplodedNodeImpl**) &P;
+  else
+    return const_cast<ExplodedNodeImpl**>(&*(getVector(getPtr()).begin()));
+}
+
+ExplodedNodeImpl** ExplodedNodeImpl::NodeGroup::end() const {
+  if (getKind() == Size1)
+    return ((ExplodedNodeImpl**) &P)+1;
+  else
+    return const_cast<ExplodedNodeImpl**>(&*(getVector(getPtr()).rbegin())+1);
+}
+
+ExplodedNodeImpl::NodeGroup::~NodeGroup() {
+  if (getKind() == SizeOther) delete &getVector(getPtr());
+}
diff --git a/clang/include/clang/Analysis/PathSensitive/ExplodedGraph.h b/clang/include/clang/Analysis/PathSensitive/ExplodedGraph.h
index 24bb1cb54ff..fbd0a24415f 100644
--- a/clang/include/clang/Analysis/PathSensitive/ExplodedGraph.h
+++ b/clang/include/clang/Analysis/PathSensitive/ExplodedGraph.h
@@ -39,68 +39,23 @@ protected:
     uintptr_t P;
     
     unsigned getKind() const { return P & Flags; }
-    
-    std::vector<ExplodedNodeImpl*>& getVector() {
-      assert (getKind() == SizeOther);
-      return *reinterpret_cast<std::vector<ExplodedNodeImpl*>*>(P & ~Flags);
-    }  
-    const std::vector<ExplodedNodeImpl*>& getVector() const {
-      assert (getKind() == SizeOther);
-      return *reinterpret_cast<std::vector<ExplodedNodeImpl*>*>(P & ~Flags);
-    }
-    
-    ExplodedNodeImpl* getNode() const {
-      assert (getKind() == Size1);
-      return reinterpret_cast<ExplodedNodeImpl*>(P);
-    }
+    void* getPtr() const { return reinterpret_cast<void*>(P & ~Flags); }
+    ExplodedNodeImpl* getNode() const;
     
   public:
     NodeGroup() : P(0) {}
     
-    ~NodeGroup() { if (getKind() == SizeOther) delete &getVector(); }
+    ~NodeGroup();
     
-    inline ExplodedNodeImpl** begin() const {
-      if (getKind() == Size1)
-        return (ExplodedNodeImpl**) &P;
-      else
-        return const_cast<ExplodedNodeImpl**>(&*(getVector().begin()));
-    }
+    inline ExplodedNodeImpl** begin() const;
     
-    inline ExplodedNodeImpl** end() const {
-      if (getKind() == Size1)
-        return ((ExplodedNodeImpl**) &P)+1;
-      else
-        return const_cast<ExplodedNodeImpl**>(&*(getVector().rbegin())+1);
-    }
+    inline ExplodedNodeImpl** end() const;
     
-    inline unsigned size() const {
-      if (getKind() == Size1)
-        return getNode() ? 1 : 0;
-      else
-        return getVector().size();
-    }
+    inline unsigned size() const;
     
-    inline bool empty() const {
-      if (getKind() == Size1)
-        return getNode() ? false : true;
-      else
-        return getVector().empty();
-    }
+    inline bool empty() const;
     
-    inline void addNode(ExplodedNodeImpl* N) {
-      if (getKind() == Size1) {
-        if (ExplodedNodeImpl* NOld = getNode()) {
-          std::vector<ExplodedNodeImpl*>* V = new std::vector<ExplodedNodeImpl*>();
-          V->push_back(NOld);
-          V->push_back(N);
-          P = reinterpret_cast<uintptr_t>(V) & SizeOther;
-        }
-        else
-          P = reinterpret_cast<uintptr_t>(N);
-      }
-      else
-        getVector().push_back(N);
-    }
+    void addNode(ExplodedNodeImpl* N);
   };