Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/PNaClSjLjEH.cpp

Index: lib/Transforms/NaCl/PNaClSjLjEH.cpp
diff --git a/lib/Transforms/NaCl/PNaClSjLjEH.cpp b/lib/Transforms/NaCl/PNaClSjLjEH.cpp
index ae0a3578115d83f77dc9b4451d4c1ae929b87e76..155e8c1350872e799e9e08a6a362ec2f78d7819d 100644
--- a/lib/Transforms/NaCl/PNaClSjLjEH.cpp
+++ b/lib/Transforms/NaCl/PNaClSjLjEH.cpp
@@ -192,20 +192,20 @@ void FuncRewriter::initializeFrame() {
   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);
 }