diff --git a/llvm/lib/Transforms/IPO/HotColdSplitting.cpp b/llvm/lib/Transforms/IPO/HotColdSplitting.cpp
index 704ddbe6110f..5d989a40f65f 100644
--- a/llvm/lib/Transforms/IPO/HotColdSplitting.cpp
+++ b/llvm/lib/Transforms/IPO/HotColdSplitting.cpp
@@ -125,7 +125,7 @@ bool unlikelyExecuted(BasicBlock &BB) {
 
 /// Check whether it's safe to outline \p BB.
 static bool mayExtractBlock(const BasicBlock &BB) {
-  return !BB.hasAddressTaken();
+  return !BB.hasAddressTaken() && !BB.isEHPad();
 }
 
 /// Check whether \p Region is profitable to outline.
diff --git a/llvm/test/Transforms/HotColdSplit/eh-pads.ll b/llvm/test/Transforms/HotColdSplit/eh-pads.ll
index f9b55f32fcf8..1197a54bc32f 100644
--- a/llvm/test/Transforms/HotColdSplit/eh-pads.ll
+++ b/llvm/test/Transforms/HotColdSplit/eh-pads.ll
@@ -26,8 +26,11 @@ normal:
   ret void
 }
 
+; See llvm.org/PR39917. It's currently not safe to outline landingpad
+; instructions.
+;
 ; CHECK-LABEL: define {{.*}}@bar(
-; CHECK-NOT: landingpad
+; CHECK: landingpad
 define void @bar(i32 %cond) personality i8 0 {
 entry:
   br i1 undef, label %exit, label %continue
@@ -54,10 +57,6 @@ normal:
 ; CHECK: sideeffect(i32 1)
 ; CHECK: sink
 
-; CHECK-LABEL: define {{.*}}@bar.cold.1(
-; CHECK: sideeffect(i32 0)
-; CHECK: sideeffect(i32 1)
-
 declare void @sideeffect(i32)
 
 declare void @sink() cold