diff --git a/src/libpanic_unwind/seh.rs b/src/libpanic_unwind/seh.rs
index c1656023b60e6..c294fe26327d7 100644
--- a/src/libpanic_unwind/seh.rs
+++ b/src/libpanic_unwind/seh.rs
@@ -237,7 +237,7 @@ static mut TYPE_DESCRIPTOR: _TypeDescriptor = _TypeDescriptor {
 macro_rules! define_cleanup {
     ($abi:tt) => {
         unsafe extern $abi fn exception_cleanup(e: *mut Exception) {
-            if let Some(b) = e.read().data {
+            if let Exception { data: Some(b) } = e.read() {
                 drop(b);
                 super::__rust_drop_panic();
             }
diff --git a/src/librustc_codegen_llvm/intrinsic.rs b/src/librustc_codegen_llvm/intrinsic.rs
index d34540638f183..5ce18a9007a62 100644
--- a/src/librustc_codegen_llvm/intrinsic.rs
+++ b/src/librustc_codegen_llvm/intrinsic.rs
@@ -1024,7 +1024,7 @@ fn codegen_gnu_try(
         // Codegens the shims described above:
         //
         //   bx:
-        //      invoke %func(%data) normal %normal unwind %catch
+        //      invoke %try_func(%data) normal %normal unwind %catch
         //
         //   normal:
         //      ret 0