From 61ea0e469254e0c7ab0e190b463d994b9316846c Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.foad@gmail.com>
Date: Thu, 23 Jun 2011 09:09:15 +0000
Subject: Reinstate r133513 (reverted in r133700) with an additional fix for a
 -Wshorten-64-to-32 warning in Instructions.h.

llvm-svn: 133708
---
 llvm/lib/Target/CppBackend/CPPBackend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'llvm/lib/Target/CppBackend/CPPBackend.cpp')

diff --git a/llvm/lib/Target/CppBackend/CPPBackend.cpp b/llvm/lib/Target/CppBackend/CPPBackend.cpp
index 2ba773bd5e5..0d15514d8cf 100644
--- a/llvm/lib/Target/CppBackend/CPPBackend.cpp
+++ b/llvm/lib/Target/CppBackend/CPPBackend.cpp
@@ -1356,7 +1356,7 @@ void CppWriter::printInstruction(const Instruction *I,
     for (unsigned i = 0; i < phi->getNumIncomingValues(); ++i) {
       Out << iName << "->addIncoming("
           << opNames[PHINode::getOperandNumForIncomingValue(i)] << ", "
-          << opNames[PHINode::getOperandNumForIncomingBlock(i)] << ");";
+          << getOpName(phi->getIncomingBlock(i)) << ");";
       nl(Out);
     }
     break;
-- 
cgit v1.2.3