Fix GraphTraits for "const CallGraphNode *" and "const CallGraph *"
The specializations were broken. For example,
void foo(const CallGraph *G) {
auto I = GraphTraits<const CallGraph *>::nodes_begin(G);
auto K = I++;
...
}
or
void bar(const CallGraphNode *N) {
auto I = GraphTraits<const CallGraphNode *>::nodes_begin(G);
auto K = I++;
....
}
would not compile.
Patch by Speziale Ettore!
llvm-svn: 222149
diff --git a/llvm/unittests/Analysis/CMakeLists.txt b/llvm/unittests/Analysis/CMakeLists.txt
index 8454860..baf0c28 100644
--- a/llvm/unittests/Analysis/CMakeLists.txt
+++ b/llvm/unittests/Analysis/CMakeLists.txt
@@ -1,4 +1,5 @@
set(LLVM_LINK_COMPONENTS
+ IPA
Analysis
AsmParser
Core
@@ -6,6 +7,7 @@
)
add_llvm_unittest(AnalysisTests
+ CallGraphTest.cpp
CFGTest.cpp
LazyCallGraphTest.cpp
ScalarEvolutionTest.cpp
diff --git a/llvm/unittests/Analysis/CallGraphTest.cpp b/llvm/unittests/Analysis/CallGraphTest.cpp
new file mode 100644
index 0000000..29e9aa6
--- /dev/null
+++ b/llvm/unittests/Analysis/CallGraphTest.cpp
@@ -0,0 +1,62 @@
+//=======- CallGraphTest.cpp - Unit tests for the CG analysis -------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Analysis/CallGraph.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
+#include "gtest/gtest.h"
+
+using namespace llvm;
+
+namespace {
+
+template <typename Ty> void canSpecializeGraphTraitsIterators(Ty *G) {
+ typedef typename GraphTraits<Ty *>::NodeType NodeTy;
+
+ auto I = GraphTraits<Ty *>::nodes_begin(G);
+ auto E = GraphTraits<Ty *>::nodes_end(G);
+ auto X = ++I;
+
+ // Should be able to iterate over all nodes of the graph.
+ static_assert(std::is_same<decltype(*I), NodeTy &>::value,
+ "Node type does not match");
+ static_assert(std::is_same<decltype(*X), NodeTy &>::value,
+ "Node type does not match");
+ static_assert(std::is_same<decltype(*E), NodeTy &>::value,
+ "Node type does not match");
+
+ NodeTy *N = GraphTraits<Ty *>::getEntryNode(G);
+
+ auto S = GraphTraits<NodeTy *>::child_begin(N);
+ auto F = GraphTraits<NodeTy *>::child_end(N);
+ auto Y = ++S;
+
+ // Should be able to iterate over immediate successors of a node.
+ static_assert(std::is_same<decltype(*S), NodeTy *>::value,
+ "Node type does not match");
+ static_assert(std::is_same<decltype(*F), NodeTy *>::value,
+ "Node type does not match");
+ static_assert(std::is_same<decltype(*Y), NodeTy *>::value,
+ "Node type does not match");
+}
+
+TEST(CallGraphTest, GraphTraitsSpecialization) {
+ Module M("", getGlobalContext());
+ CallGraph CG(M);
+
+ canSpecializeGraphTraitsIterators(&CG);
+}
+
+TEST(CallGraphTest, GraphTraitsConstSpecialization) {
+ Module M("", getGlobalContext());
+ CallGraph CG(M);
+
+ canSpecializeGraphTraitsIterators(const_cast<const CallGraph *>(&CG));
+}
+}
diff --git a/llvm/unittests/Analysis/Makefile b/llvm/unittests/Analysis/Makefile
index 527f452..52296e7 100644
--- a/llvm/unittests/Analysis/Makefile
+++ b/llvm/unittests/Analysis/Makefile
@@ -9,7 +9,7 @@
LEVEL = ../..
TESTNAME = Analysis
-LINK_COMPONENTS := analysis asmparser
+LINK_COMPONENTS := ipa analysis asmparser
include $(LEVEL)/Makefile.config
include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest