From 5b7dfbd89a0a0b7b59603bf9eb0f3f58534b4dd5 Mon Sep 17 00:00:00 2001
From: David Greene <greened@obbligato.org>
Date: Fri, 17 Apr 2009 14:56:18 +0000
Subject: [PATCH] Use a safer iterator interface and get rid of std C++ library
 misuse. This fixes a --enable-expensive-checks problem.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69353 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Transforms/IPO/ArgumentPromotion.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp
index b562c425aa6..2bb6428060c 100644
--- a/lib/Transforms/IPO/ArgumentPromotion.cpp
+++ b/lib/Transforms/IPO/ArgumentPromotion.cpp
@@ -565,11 +565,10 @@ Function *ArgPromotion::DoPromotion(Function *F,
       // Add a parameter to the function for each element passed in.
       for (ScalarizeTable::iterator SI = ArgIndices.begin(),
              E = ArgIndices.end(); SI != E; ++SI) {
-        unsigned num = SI->size();
         // not allowed to dereference ->begin() if size() is 0
         Params.push_back(GetElementPtrInst::getIndexedType(I->getType(),
-                                                           num ? &*SI->begin(): 0,
-                                                           num));
+                                                           SI->begin(),
+                                                           SI->end()));
         assert(Params.back());
       }