Index: lib/Transforms/Utils/LowerInvoke.cpp
===================================================================
--- lib/Transforms/Utils/LowerInvoke.cpp
+++ lib/Transforms/Utils/LowerInvoke.cpp
@@ -48,10 +48,13 @@
   bool Changed = false;
   for (BasicBlock &BB : F)
     if (InvokeInst *II = dyn_cast<InvokeInst>(BB.getTerminator())) {
-      SmallVector<Value *, 16> CallArgs(II->op_begin(), II->op_end() - 3);
+      SmallVector<Value *, 16> CallArgs(II->arg_begin(), II->arg_end());
+      SmallVector<OperandBundleDef, 1> OpBundles;
+      II->getOperandBundlesAsDefs(OpBundles);
+
       // Insert a normal call instruction...
       CallInst *NewCall =
-          CallInst::Create(II->getCalledValue(), CallArgs, "", II);
+          CallInst::Create(II->getCalledValue(), CallArgs, OpBundles, "", II);
       NewCall->takeName(II);
       NewCall->setCallingConv(II->getCallingConv());
       NewCall->setAttributes(II->getAttributes());
Index: test/Transforms/Util/lowerinvoke-funclet.ll
===================================================================
--- /dev/null
+++ test/Transforms/Util/lowerinvoke-funclet.ll
@@ -0,0 +1,39 @@
+; RUN: opt -lowerinvoke -S < %s | FileCheck %s
+
+; Test if invoke instructions that have a funclet operand bundle can be lowered.
+
+%struct.Cleanup = type { i8 }
+
+define void @lowerinvoke_funclet() personality i8* bitcast (i32 (...)* @__CxxFrameHandler3 to i8*) {
+; CHECK-LABEL: @lowerinvoke_funclet
+entry:
+  %c = alloca %struct.Cleanup, align 1
+  invoke void @foo()
+          to label %try.cont unwind label %catch.dispatch
+
+catch.dispatch:                                   ; preds = %entry
+  %0 = catchswitch within none [label %catch] unwind to caller
+
+catch:                                            ; preds = %catch.dispatch
+  %1 = catchpad within %0 [i8* null, i32 64, i8* null]
+  invoke void @bar(i32 3) [ "funclet"(token %1), "test"(i32 0) ]
+          to label %invoke.cont1 unwind label %ehcleanup
+; CHECK:  call void @bar(i32 3) [ "funclet"(token %1), "test"(i32 0) ]
+
+invoke.cont1:                                     ; preds = %catch
+  call void @"??1Cleanup@@QEAA@XZ"(%struct.Cleanup* %c) #3 [ "funclet"(token %1) ]
+  catchret from %1 to label %try.cont
+
+try.cont:                                         ; preds = %entry, %invoke.cont1
+  ret void
+
+ehcleanup:                                        ; preds = %catch
+  %2 = cleanuppad within %1 []
+  call void @"??1Cleanup@@QEAA@XZ"(%struct.Cleanup* %c) #3 [ "funclet"(token %2) ]
+  cleanupret from %2 unwind to caller
+}
+
+declare void @foo()
+declare void @bar(i32)
+declare i32 @__CxxFrameHandler3(...)
+declare void @"??1Cleanup@@QEAA@XZ"(%struct.Cleanup*) unnamed_addr