Skip to content

Ice lang item #26910

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

Merged
merged 1 commit into from
Jul 13, 2015
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
6 changes: 4 additions & 2 deletions src/librustc/middle/fast_reject.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ pub fn simplify_type(tcx: &ty::ctxt,
}
ty::TyBox(_) => {
// treat like we would treat `Box`
let def_id = tcx.lang_items.owned_box().unwrap();
Some(StructSimplifiedType(def_id))
match tcx.lang_items.require_owned_box() {
Ok(def_id) => Some(StructSimplifiedType(def_id)),
Err(msg) => tcx.sess.fatal(&msg),
}
}
ty::TyClosure(def_id, _) => {
Some(ClosureSimplifiedType(def_id))
Expand Down
4 changes: 4 additions & 0 deletions src/librustc/middle/lang_items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ impl LanguageItems {
}
}

pub fn require_owned_box(&self) -> Result<ast::DefId, String> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other places that do this sort of thing just write the self.require(...) call inline, maybe it's ok to do that here too instead of introducing a special method?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My reasoning was:

  • owned_box is already somewhat special - it doesn't follow the idioms of the others
  • we could have done that but didn't, which indicates that we need to do something differently
  • the 'right' thing should be at least as ergonomic as the 'wrong' thing (.owned_box())

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the 'right' thing should be at least as ergonomic as the 'wrong' thing (.owned_box())

Hm, actually, I'm not totally clear why owned_box is wrong? Doesn't it return an Option, and the ICE caused by the unwrap call?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right, but there's not a great way to handle the error unless you get the error message which comes with the require version. I guess you could make up your own message. That's why I use "'right'" rather than "right" - it's not too important. But it is an error if its not there, so Result feels right.

self.require(OwnedBoxLangItem)
}

pub fn from_builtin_kind(&self, bound: ty::BuiltinBound)
-> Result<ast::DefId, String>
{
Expand Down
5 changes: 4 additions & 1 deletion src/librustc_typeck/coherence/orphan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ impl<'cx, 'tcx> OrphanChecker<'cx, 'tcx> {
self.check_def_id(item, data.principal_def_id());
}
ty::TyBox(..) => {
self.check_def_id(item, self.tcx.lang_items.owned_box().unwrap());
match self.tcx.lang_items.require_owned_box() {
Ok(trait_id) => self.check_def_id(item, trait_id),
Err(msg) => self.tcx.sess.span_fatal(item.span, &msg),
}
}
ty::TyChar => {
self.check_primitive_impl(def_id,
Expand Down
26 changes: 26 additions & 0 deletions src/test/compile-fail/no_owned_box_lang_item.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Test that we don't ICE when we are missing the owned_box lang item.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't this file need an error pattern?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it has one (admittedly it was missing on my first push :-) )


// error-pattern: requires `owned_box` lang_item

#![no_std]
#![feature(lang_items, no_std, box_syntax)]

extern crate core;

fn main() {
let x = box 1i32;
}

#[lang = "stack_exhausted"] extern fn stack_exhausted() {}
#[lang = "eh_personality"] extern fn eh_personality() {}
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }