commit befe61885c4d3c59ade5ebfab3a82de97c94e8fe
author Shih-wei Liao <sliao@google.com> Mon Sep 24 23:32:44 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 24 23:32:44 2012 -0700
tree a667b749b416d243536c36f18c17678acf361957
parent c8c3bfe83655b44032b7ef67e6084819a0543ef8
parent 7b15ea3405a02cec9951c8e491abb4688dee57c1

Merge "Fix a bug in ABCExpandVAArgPass."

lib/AndroidBitcode/ABCExpandVAArgPass.cpp

diff --git a/lib/AndroidBitcode/ABCExpandVAArgPass.cpp b/lib/AndroidBitcode/ABCExpandVAArgPass.cpp
index 7b89ced..1f0debf 100644
--- a/lib/AndroidBitcode/ABCExpandVAArgPass.cpp
+++ b/lib/AndroidBitcode/ABCExpandVAArgPass.cpp
@@ -19,6 +19,7 @@
 
 #include "bcc/AndroidBitcode/ABCExpandVAArgPass.h"
 
+#include <llvm/ADT/STLExtras.h>
 #include <llvm/Instructions.h>
 #include <llvm/Support/InstIterator.h>
 
@@ -33,7 +34,8 @@
 
   // process va_arg inst
   for (llvm::inst_iterator inst = llvm::inst_begin(pFunc),
-          inst_end = llvm::inst_end(pFunc); inst != inst_end; inst++) {
+          inst_end = llvm::inst_end(pFunc), next_inst = llvm::next(inst);
+       inst != inst_end; inst = next_inst++) {
     if (inst->getOpcode() == llvm::Instruction::VAArg) {
       llvm::Value *v = expandVAArg(&*inst);
       inst->replaceAllUsesWith(v);