Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types #87529

FabianWolff · 2021-07-27T22:10:18Z

Fixes #87496. There is also another function in the same file that looks fishy, but I haven't been able to produce an ICE there, and in any case, it's not related to #87496:

rust/compiler/rustc_lint/src/types.rs

Lines 720 to 734 in fd853c0

    
           fn get_nullable_type<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'tcx>> { 
        
               let tcx = cx.tcx; 
        
               Some(match *ty.kind() { 
        
                   ty::Adt(field_def, field_substs) => { 
        
                       let inner_field_ty = { 
        
                           let first_non_zst_ty = 
        
                               field_def.variants.iter().filter_map(|v| transparent_newtype_field(cx.tcx, v)); 
        
                           debug_assert_eq!( 
        
                               first_non_zst_ty.clone().count(), 
        
                               1, 
        
                               "Wrong number of fields for transparent type" 
        
                           ); 
        
                           first_non_zst_ty 
        
                               .last() 
        
                               .expect("No non-zst fields in transparent type.")

r? @JohnTitor

hellow554 · 2021-07-28T06:17:19Z

src/test/ui/repr/repr-transparent-issue-87496.rs

+struct TransparentCustomZst(());
+extern "C" {
+    fn good17(p: TransparentCustomZst);
+}


you could make the struct and extern fn pub to avoid warnings :)

JohnTitor · 2021-07-28T08:40:13Z

LGTM, thanks for the follow-up! But I'm not part of t-compiler, so r? @nikomatsakis for the final review

compiler/rustc_lint/src/types.rs

src/test/ui/repr/repr-transparent-issue-87496.rs

nikomatsakis

Per @camelid's point, the behavior for "all ZST fields" seems incorrect.

…t types

FabianWolff · 2021-07-31T14:01:47Z

@rustbot ready

JohnCSimon · 2021-09-13T02:59:25Z

Triage:
@FabianWolff can you mark the change request from nikomatsakis as completed if you've completed it? Thanks.

FabianWolff · 2021-09-14T23:40:36Z

Triage:
@FabianWolff can you mark the change request from nikomatsakis as completed if you've completed it? Thanks.

@JohnCSimon What exactly do you mean by this? I thought that's what the @rustbot ready is for (though it doesn't really seem to have had an effect above...). In any case, I've clicked on "Re-request review" for now.

nikomatsakis · 2021-09-15T16:44:41Z

Ugh! Sorry @FabianWolff, reading now!

nikomatsakis · 2021-09-15T16:46:16Z

@bors r+

bors · 2021-09-15T16:46:17Z

📌 Commit 4e76c38 has been approved by nikomatsakis

bors · 2021-09-15T16:46:18Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

…akis Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types Fixes rust-lang#87496. There is also another function in the same file that looks fishy, but I haven't been able to produce an ICE there, and in any case, it's not related to rust-lang#87496: https://github.com/rust-lang/rust/blob/fd853c00e255559255885aadff9e93a1760c8728/compiler/rustc_lint/src/types.rs#L720-L734 r? `@JohnTitor`

…akis Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types Fixes rust-lang#87496. There is also another function in the same file that looks fishy, but I haven't been able to produce an ICE there, and in any case, it's not related to rust-lang#87496: https://github.com/rust-lang/rust/blob/fd853c00e255559255885aadff9e93a1760c8728/compiler/rustc_lint/src/types.rs#L720-L734 r? ``@JohnTitor``

Rollup of 10 pull requests Successful merges: - rust-lang#86382 (Make diagnostics clearer for `?` operators) - rust-lang#87529 (Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types) - rust-lang#88339 (Add TcpListener::into_incoming and IntoIncoming) - rust-lang#88735 (Don't lint about missing code examples in derived traits) - rust-lang#88751 (Couple of changes to FileSearch and SearchPath) - rust-lang#88883 (Move some tests to more reasonable directories - 7) - rust-lang#88887 (Const Deref) - rust-lang#88911 (Improve error message for type mismatch in generator arguments) - rust-lang#89014 (PassWrapper: handle separate Module*SanitizerPass) - rust-lang#89033 (Set the library path in sysroot-crates-are-unstable) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned JohnTitor Jul 27, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 27, 2021

FabianWolff mentioned this pull request Jul 27, 2021

ICE: compiler/rustc_lint/src/types.rs:859:17: malformed transparent type #87496

Closed

hellow554 reviewed Jul 28, 2021

View reviewed changes

JohnTitor approved these changes Jul 28, 2021

View reviewed changes

rust-highfive assigned nikomatsakis and unassigned JohnTitor Jul 28, 2021

camelid reviewed Jul 29, 2021

View reviewed changes

compiler/rustc_lint/src/types.rs Outdated Show resolved Hide resolved

src/test/ui/repr/repr-transparent-issue-87496.rs Show resolved Hide resolved

camelid added the A-FFI Area: Foreign function interface (FFI) label Jul 29, 2021

nikomatsakis requested changes Jul 30, 2021

View reviewed changes

Fix ICE in improper_ctypes_definitions lint with all-ZST transparen…

4e76c38

…t types

FabianWolff force-pushed the issue-87496 branch from d134664 to 4e76c38 Compare July 31, 2021 13:58

JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 15, 2021

inquisitivecrystal added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 24, 2021

FabianWolff requested a review from nikomatsakis September 14, 2021 23:36

nikomatsakis approved these changes Sep 15, 2021

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 15, 2021

Manishearth mentioned this pull request Sep 16, 2021

Rollup of 14 pull requests #89002

Closed

GuillaumeGomez mentioned this pull request Sep 16, 2021

Rollup of 13 pull requests #89005

Closed

JohnTitor mentioned this pull request Sep 17, 2021

Rollup of 10 pull requests #89037

Merged

bors merged commit 81dc216 into rust-lang:master Sep 17, 2021

rustbot added this to the 1.57.0 milestone Sep 17, 2021

ChrisDenton mentioned this pull request Jan 28, 2022

error: internal compiler error: compiler\rustc_lint\src\types.rs:859:17: malformed transparent type #93419

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types #87529

Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types #87529

FabianWolff commented Jul 27, 2021

hellow554 Jul 28, 2021

JohnTitor commented Jul 28, 2021

nikomatsakis left a comment

FabianWolff commented Jul 31, 2021

JohnCSimon commented Sep 13, 2021

FabianWolff commented Sep 14, 2021

nikomatsakis commented Sep 15, 2021

nikomatsakis commented Sep 15, 2021

bors commented Sep 15, 2021

bors commented Sep 15, 2021

	fn get_nullable_type<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'tcx>> {
	let tcx = cx.tcx;
	Some(match *ty.kind() {
	ty::Adt(field_def, field_substs) => {
	let inner_field_ty = {
	let first_non_zst_ty =
	field_def.variants.iter().filter_map(\|v\| transparent_newtype_field(cx.tcx, v));
	debug_assert_eq!(
	first_non_zst_ty.clone().count(),
	1,
	"Wrong number of fields for transparent type"
	);
	first_non_zst_ty
	.last()
	.expect("No non-zst fields in transparent type.")

Fix ICE in improper_ctypes_definitions lint with all-ZST transparent types #87529

Fix ICE in improper_ctypes_definitions lint with all-ZST transparent types #87529

Conversation

FabianWolff commented Jul 27, 2021

hellow554 Jul 28, 2021

Choose a reason for hiding this comment

JohnTitor commented Jul 28, 2021

nikomatsakis left a comment

Choose a reason for hiding this comment

FabianWolff commented Jul 31, 2021

JohnCSimon commented Sep 13, 2021

FabianWolff commented Sep 14, 2021

nikomatsakis commented Sep 15, 2021

nikomatsakis commented Sep 15, 2021

bors commented Sep 15, 2021

bors commented Sep 15, 2021

Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types #87529

Fix ICE in `improper_ctypes_definitions` lint with all-ZST transparent types #87529