Index: lib/CodeGen/CGCoroutine.cpp
===================================================================
--- lib/CodeGen/CGCoroutine.cpp
+++ lib/CodeGen/CGCoroutine.cpp
@@ -350,6 +350,16 @@
 }
 #endif
 
+static SmallVector<llvm::OperandBundleDef, 1>
+getBundlesForCoroEnd(CodeGenFunction &CGF) {
+  SmallVector<llvm::OperandBundleDef, 1> BundleList;
+
+  if (Instruction *EHPad = CGF.CurrentFuncletPad)
+    BundleList.emplace_back("funclet", EHPad);
+
+  return BundleList;
+}
+
 void CodeGenFunction::EmitCoroutineBody(const CoroutineBodyStmt &S) {
   auto *NullPtr = llvm::ConstantPointerNull::get(Builder.getInt8PtrTy());
 
@@ -423,9 +433,17 @@
   struct CallCoroEnd final : public EHScopeStack::Cleanup {
     void Emit(CodeGenFunction &CGF, Flags flags) override {
       auto &CGM = CGF.CGM;
-      auto NullPtr = llvm::ConstantPointerNull::get(CGF.Int8PtrTy);
-      llvm::Function *CoroEnd = CGM.getIntrinsic(llvm::Intrinsic::coro_end);
-      CGF.Builder.CreateCall(CoroEnd, {NullPtr, CGF.Builder.getInt1(true)});
+      auto *NullPtr = llvm::ConstantPointerNull::get(CGF.Int8PtrTy);
+      llvm::Function *CoroEndFn = CGM.getIntrinsic(llvm::Intrinsic::coro_end);
+      auto Bundles = getBundlesForCoroEnd(CGF);
+      auto *CoroEnd = CGF.Builder.CreateCall(
+          CoroEndFn, {NullPtr, CGF.Builder.getTrue()}, Bundles);
+      if (Bundles.empty()) {
+        auto *ResumeBB = CGF.getEHResumeBlock(/*cleanup=*/true);
+        auto *CleanupContBB = CGF.createBasicBlock("cleanup.cont");
+        CGF.Builder.CreateCondBr(CoroEnd, ResumeBB, CleanupContBB);
+        CGF.EmitBlock(CleanupContBB);
+      }
     }
   };
   EHStack.pushCleanup<CallCoroEnd>(EHCleanup);
Index: test/CodeGenCoroutines/coro-builtins.c
===================================================================
--- test/CodeGenCoroutines/coro-builtins.c
+++ test/CodeGenCoroutines/coro-builtins.c
@@ -43,7 +43,7 @@
   __builtin_coro_free(__builtin_coro_frame());
 
   // CHECK-NEXT: %[[FRAME6:.+]] = call i8* @llvm.coro.frame() 
-  // CHECK-NEXT: call void @llvm.coro.end(i8* %[[FRAME6]], i1 false)
+  // CHECK-NEXT: call i1 @llvm.coro.end(i8* %[[FRAME6]], i1 false)
   __builtin_coro_end(__builtin_coro_frame(), 0);
 
   // CHECK-NEXT: call i8 @llvm.coro.suspend(token none, i1 true)
Index: test/CodeGenCoroutines/coro-eh-cleanup.cpp
===================================================================
--- /dev/null
+++ test/CodeGenCoroutines/coro-eh-cleanup.cpp
@@ -0,0 +1,55 @@
+// RUN: %clang_cc1 -std=c++14 -fcoroutines-ts -triple=x86_64-pc-windows-msvc18.0.0 -emit-llvm %s -o - -fexceptions -fcxx-exceptions -disable-llvm-passes | FileCheck %s
+// RUN: %clang_cc1 -std=c++14 -fcoroutines-ts -triple=x86_64-unknown-linux-gnu -emit-llvm -o - %s -fexceptions -fcxx-exceptions -disable-llvm-passes | FileCheck --check-prefix=CHECK-LPAD %s
+
+#include "Inputs/coroutine.h"
+
+struct coro_t {
+  struct promise_type {
+    coro_t get_return_object() {
+      coro::coroutine_handle<promise_type>{};
+      return {};
+    }
+    coro::suspend_never initial_suspend() { return {}; }
+    coro::suspend_never final_suspend() { return {}; }
+    void return_void(){}
+  };
+};
+
+struct Cleanup { ~Cleanup(); };
+void may_throw();
+
+coro_t f() {
+  Cleanup x;
+  may_throw();
+  co_return;
+}
+
+// CHECK: @"\01?f@@YA?AUcoro_t@@XZ"(
+// CHECK:   invoke void @"\01?may_throw@@YAXXZ"()
+// CHECK:       to label %[[CONT:.+]] unwind label %[[EHCLEANUP:.+]]
+// CHECK: [[EHCLEANUP]]:
+// CHECK:   %[[INNERPAD:.+]] = cleanuppad within none []
+// CHECK:   call void @"\01??_DCleanup@@QEAA@XZ"(
+// CHECK:   cleanupret from %[[INNERPAD]] unwind label %[[COROENDBB:.+]]
+// CHECK: [[COROENDBB]]:
+// CHECK-NEXT: %[[CLPAD:.+]] = cleanuppad within none
+// CHECK-NEXT: call i1 @llvm.coro.end(i8* null, i1 true) [ "funclet"(token %[[CLPAD]]) ]
+// CHECK-NEXT: cleanupret from %[[CLPAD]] unwind label
+
+// CHECK-LPAD: @_Z1fv(
+// CHECK-LPAD:   invoke void @_Z9may_throwv()
+// CHECK-LPAD:       to label %[[CONT:.+]] unwind label %[[EHCLEANUP:.+]]
+// CHECK-LPAD: [[EHCLEANUP]]:
+// CHECK-LPAD:    landingpad { i8*, i32 }
+// CHECK-LPAD:          cleanup
+// CHECK-LPAD: call void @_ZN7CleanupD1Ev(
+// CHECK-LPAD: br label %[[COROENDBB:.+]]
+// CHECK-LPAD: [[COROENDBB]]:
+// CHECK-LPAD:     %[[I1RESUME:.+]] = call i1 @llvm.coro.end(i8* null, i1 true)
+// CHECK-LPAD:  br i1  %[[I1RESUME]], label %eh.resume
+// CHECK-LPAD: eh.resume:
+// CHECK-LPAD-NEXT:  %exn = load i8*, i8** %exn.slot, align 8
+// CHECK-LPAD-NEXT:    %sel = load i32, i32* %ehselector.slot, align 4
+// CHECK-LPAD-NEXT:    %lpad.val = insertvalue { i8*, i32 } undef, i8* %exn, 0
+// CHECK-LPAD-NEXT:    %lpad.val29 = insertvalue { i8*, i32 } %lpad.val, i32 %sel, 1
+// CHECK-LPAD-NEXT:    resume { i8*, i32 } %lpad.val29