commit 73f348716eeba6df100dad2815fd2f5ab03b2706
author Shih-wei Liao <sliao@google.com> Sat May 07 23:16:37 2011 -0700
committer Shih-wei Liao <sliao@google.com> Sat May 07 23:16:37 2011 -0700
tree 72a5992f3c5dd9cdb203a1d5ed506dc24de9cae6
parent 4a72431356609125ac1a7d897bee88b0347d4d55

Fix the divergence from upstream.

external/stlport now is configured to support standard-compliant P[0].

Change-Id: If04d220ecd99fbaec3a16d9b7f1a960242373a60

lib/Analysis/ProfileInfo.cpp

diff --git a/lib/Analysis/ProfileInfo.cpp b/lib/Analysis/ProfileInfo.cpp
index 7a38d56..4f6cdd0 100644
--- a/lib/Analysis/ProfileInfo.cpp
+++ b/lib/Analysis/ProfileInfo.cpp
@@ -752,10 +752,10 @@
            Succ != End; ++Succ) {
         Path P;
         GetPath(*Succ, 0, P, GetPathToExit);
-        if (Dest && Dest != P[ reinterpret_cast<const llvm::BasicBlock*>(0) ]) {
+        if (Dest && Dest != P[0]) {
           AllEdgesHaveSameReturn = false;
         }
-        Dest = P[ reinterpret_cast<const llvm::BasicBlock*>(0) ];
+        Dest = P[0];
       }
       if (AllEdgesHaveSameReturn) {
         if(EstimateMissingEdges(BB)) {