Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not ICE in codegen when using a extern_type static #58192

Merged
merged 1 commit into from
Feb 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/librustc_codegen_ssa/mir/place.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,21 @@ impl<'a, 'tcx: 'a, V: CodegenObject> PlaceRef<'tcx, V> {
}
}

fn new_thin_place<Bx: BuilderMethods<'a, 'tcx, Value = V>>(
bx: &mut Bx,
llval: V,
layout: TyLayout<'tcx>,
align: Align,
) -> PlaceRef<'tcx, V> {
assert!(!bx.cx().type_has_metadata(layout.ty));
PlaceRef {
llval,
llextra: None,
layout,
align
}
}

pub fn alloca<Bx: BuilderMethods<'a, 'tcx, Value = V>>(
bx: &mut Bx,
layout: TyLayout<'tcx>,
Expand Down Expand Up @@ -421,8 +436,10 @@ impl<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
}
}
mir::Place::Static(box mir::Static { def_id, ty }) => {
// NB: The layout of a static may be unsized as is the case when working
// with a static that is an extern_type.
let layout = cx.layout_of(self.monomorphize(&ty));
PlaceRef::new_sized(bx.get_static(def_id), layout, layout.align.abi)
PlaceRef::new_thin_place(bx, bx.get_static(def_id), layout, layout.align.abi)
},
mir::Place::Projection(box mir::Projection {
ref base,
Expand Down
5 changes: 5 additions & 0 deletions src/test/run-make-fulldeps/static-extern-type/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-include ../tools.mk

all: $(call NATIVE_STATICLIB,define-foo)
$(RUSTC) -ldefine-foo use-foo.rs
$(call RUN,use-foo) || exit 1
11 changes: 11 additions & 0 deletions src/test/run-make-fulldeps/static-extern-type/define-foo.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#include <stdint.h>

struct Foo {
uint8_t x;
};

struct Foo FOO = { 42 };

uint8_t bar(const struct Foo* foo) {
return foo->x;
}
14 changes: 14 additions & 0 deletions src/test/run-make-fulldeps/static-extern-type/use-foo.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#![feature(extern_types)]

extern "C" {
type Foo;
static FOO: Foo;
fn bar(foo: *const Foo) -> u8;
}

fn main() {
unsafe {
let foo = &FOO;
assert_eq!(bar(foo), 42);
}
}