Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/PNaClSjLjEH.cpp

 //===- PNaClSjLjEH.cpp - Lower C++ exception handling to use setjmp()------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // The PNaClSjLjEH pass is part of an implementation of C++ exception
@@ skipping 174 matching lines @@
   // invoke instructions in the function.
   Type *I32 = Type::getInt32Ty(M->getContext());
   Frame = new AllocaInst(ExceptionFrameTy, ConstantInt::get(I32, 1),
                          kPNaClJmpBufAlign, "invoke_frame");
   Func->getEntryBlock().getInstList().push_front(Frame);
 
   // Calculate addresses of fields in the exception frame.
   Value *JmpBufIndexes[] = { ConstantInt::get(I32, 0),
                              ConstantInt::get(I32, 0),
                              ConstantInt::get(I32, 0) };
-  FrameJmpBuf = GetElementPtrInst::Create(Frame, JmpBufIndexes,
-                                          "invoke_jmp_buf");
+  FrameJmpBuf = GetElementPtrInst::Create(
+      ExceptionFrameTy, Frame, JmpBufIndexes, "invoke_jmp_buf");
   FrameJmpBuf->insertAfter(Frame);
 
   Value *NextPtrIndexes[] = { ConstantInt::get(I32, 0),
                               ConstantInt::get(I32, 1) };
-  FrameNextPtr = GetElementPtrInst::Create(Frame, NextPtrIndexes,
-                                           "invoke_next");
+  FrameNextPtr = GetElementPtrInst::Create(
+      ExceptionFrameTy, Frame, NextPtrIndexes, "invoke_next");
   FrameNextPtr->insertAfter(Frame);
 
   Value *ExcInfoIndexes[] = { ConstantInt::get(I32, 0),
                               ConstantInt::get(I32, 2) };
-  FrameExcInfo = GetElementPtrInst::Create(Frame, ExcInfoIndexes,
-                                           "exc_info_ptr");
+  FrameExcInfo = GetElementPtrInst::Create(
+      ExceptionFrameTy, Frame, ExcInfoIndexes, "exc_info_ptr");
   FrameExcInfo->insertAfter(Frame);
 }
 
 // Creates the helper function that will do the setjmp() call and
 // function call for implementing Invoke.  Creates the call to the
 // helper function.  Returns a Value which is zero on the normal
 // execution path and non-zero if the landingpad block should be
 // entered.
 Value *FuncRewriter::createSetjmpWrappedCall(InvokeInst *Invoke) {
   Type *I32 = Type::getInt32Ty(Func->getContext());
@@ skipping 237 matching lines @@
     FuncRewriter Rewriter(ExceptionFrameTy, &ExcInfoWriter, Func);
     Rewriter.expandFunc();
   }
   ExcInfoWriter.defineGlobalVariables(&M);
   return true;
 }
 
 ModulePass *llvm::createPNaClSjLjEHPass() {
   return new PNaClSjLjEH();
 }