Use TyCtxt::is_lang_item

1c3t3a · 1c3t3a · commit 4ee722262ece · 2025-03-11T13:33:56.000Z
diff --git a/compiler/rustc_codegen_llvm/src/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs
@@ -180,7 +180,7 @@ fn check_and_apply_linkage<'ll, 'tcx>(
             // instead of an extern_weak i8.
             let instance = Instance::mono(cx.tcx, def_id);
             if let ty::Adt(struct_def, generic_args) = instance.ty(cx.tcx, cx.typing_env()).kind()
-                && let Some(LangItem::Option) = cx.tcx.lang_items().from_def_id(struct_def.did())
+                && cx.tcx.is_lang_item(struct_def.did(), LangItem::Option)
                 && let Some(first_arg) = generic_args.first()
                 && let ty::FnPtr(sig, header) = first_arg.expect_ty().kind()
             {

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ fn check_and_apply_linkage<'ll, 'tcx>(`
`180`	`180`	`// instead of an extern_weak i8.`
`181`	`181`	`let instance = Instance::mono(cx.tcx, def_id);`
`182`	`182`	`if let ty::Adt(struct_def, generic_args) = instance.ty(cx.tcx, cx.typing_env()).kind()`
`183`		`- && let Some(LangItem::Option) = cx.tcx.lang_items().from_def_id(struct_def.did())`
	`183`	`+ && cx.tcx.is_lang_item(struct_def.did(), LangItem::Option)`
`184`	`184`	`&& let Some(first_arg) = generic_args.first()`
`185`	`185`	`&& let ty::FnPtr(sig, header) = first_arg.expect_ty().kind()`
`186`	`186`	`{`