Found and fixed the remaining divergence in lib/Analysis from upstream.
Remove the type casting of (BasicBlock*).
Change-Id: I8f67cc42aa47efa8e10e549241c139f8b8fa35aa
diff --git a/lib/Analysis/PathProfileVerifier.cpp b/lib/Analysis/PathProfileVerifier.cpp
index 26d8741..c549773 100644
--- a/lib/Analysis/PathProfileVerifier.cpp
+++ b/lib/Analysis/PathProfileVerifier.cpp
@@ -126,7 +126,7 @@
<< currentPath->getCount() << "\n");
// setup the entry edge (normally path profiling doens't care about this)
if (currentPath->getFirstBlockInPath() == &F->getEntryBlock())
- edgeArray[arrayMap[(BasicBlock *)0][currentPath->getFirstBlockInPath()][0]]
+ edgeArray[arrayMap[0][currentPath->getFirstBlockInPath()][0]]
+= currentPath->getCount();
for( ProfilePathEdgeIterator nextEdge = pev->begin(),