From 73f348716eeba6df100dad2815fd2f5ab03b2706 Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Sat, 7 May 2011 23:16:37 -0700
Subject: [PATCH] Fix the divergence from upstream.

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

Change-Id: If04d220ecd99fbaec3a16d9b7f1a960242373a60
---
 lib/Analysis/ProfileInfo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Analysis/ProfileInfo.cpp b/lib/Analysis/ProfileInfo.cpp
index 7a38d56b9a3..4f6cdd0db34 100644
--- a/lib/Analysis/ProfileInfo.cpp
+++ b/lib/Analysis/ProfileInfo.cpp
@@ -752,10 +752,10 @@ void ProfileInfoT<Function,BasicBlock>::repair(const Function *F) {
            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)) {
-- 
2.11.0