fix: resolve conflicts

Author: makai410

compiler/rustc_smir/src/stable_mir/unstable/convert/stable/mir.rs

@@ -588,7 +588,7 @@ impl<'tcx> Stable<'tcx> for mir::AssertMessage<'tcx> {
                 stable_mir::mir::AssertMessage::NullPointerDereference
             }
             AssertKind::InvalidEnumConstruction(source) => {
-                stable_mir::mir::AssertMessage::InvalidEnumConstruction(source.stable(tables))
+                stable_mir::mir::AssertMessage::InvalidEnumConstruction(source.stable(tables, cx))
             }
         }
     }