Skip to content

Rustup #379

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.

Sign up for GitHub

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 16 commits into from
Jun 3, 2018
Merged

Rustup #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
68378a7
Rustup to rustc 1.27.0-nightly (ff2ac35db 2018-05-12)
bjorn3 May 13, 2018
1bf0ffc
Enable backtraces for tests
bjorn3 May 13, 2018
d3b9085
Rustup to rustc 1.28.0-nightly (952f344cd 2018-05-18)
bjorn3 May 19, 2018
0460801
trans -> codegen_backend
oli-obk May 19, 2018
7d953a6
Rustup to rustc 1.28.0-nightly (a3085756e 2018-05-19)
bjorn3 May 20, 2018
850841e
s/allocate_cached/allocate_bytes
bjorn3 May 25, 2018
49ca174
Partial rustup
bjorn3 May 26, 2018
b0ee05e
`memcmp` returns `i32`
oli-obk May 30, 2018
f927014
Comparing Scalar's with differend `defined` values is false
oli-obk May 30, 2018
ac667d3
Comparing non-pointer-size types should be possible
oli-obk May 30, 2018
e4f0754
TlsKey is messy because it changes types between systems
oli-obk May 30, 2018
ea2c8bf
`align_offset` intrinsic is now a lang item
oli-obk May 30, 2018
066a284
`to_u64` and `to_bytes` are horribly easy to use wrongly.
oli-obk May 30, 2018
e29b696
Use correct bit size when reading usize values
oli-obk Jun 3, 2018
dbadf1e
Update cargo-miri
oli-obk Jun 3, 2018
10078dd
Reenable the rustc tester
oli-obk Jun 3, 2018
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ script:
- |
# Test plain miri
cargo build --release --all-features &&
cargo test --release --all-features --all &&
RUST_BACKTRACE=1 cargo test --release --all-features --all &&
cargo install --all-features --force
- |
# Test cargo miri
Expand Down
9 changes: 3 additions & 6 deletions benches/helpers/miri_helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,13 @@ impl<'a> CompilerCalls<'a> for MiriCompilerCalls<'a> {
state.session.abort_if_errors();

let tcx = state.tcx.unwrap();
let (entry_node_id, _) = state.session.entry_fn.borrow().expect(
let (entry_node_id, _, _) = state.session.entry_fn.borrow().expect(
"no main or start function found",
);
let entry_def_id = tcx.map.local_def_id(entry_node_id);
let entry_def_id = tcx.hir.local_def_id(entry_node_id);

let memory_size = 100 * 1024 * 1024; // 100MB
let step_limit = 1000_000;
let stack_limit = 100;
bencher.borrow_mut().iter(|| {
eval_main(tcx, entry_def_id, memory_size, step_limit, stack_limit);
eval_main(tcx, entry_def_id, None);
});

state.session.abort_if_errors();
Expand Down
12 changes: 6 additions & 6 deletions cargo-miri-test/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

203 changes: 127 additions & 76 deletions rustc_tests/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions rustc_tests/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extern crate getopts;
extern crate rustc;
extern crate rustc_driver;
extern crate rustc_errors;
extern crate rustc_trans_utils;
extern crate rustc_codegen_utils;
extern crate syntax;

use std::path::{PathBuf, Path};
Expand All @@ -19,7 +19,7 @@ use rustc_driver::{Compilation, CompilerCalls, RustcDefaultCalls};
use rustc_driver::driver::{CompileState, CompileController};
use rustc::session::config::{self, Input, ErrorOutputType};
use rustc::hir::{self, itemlikevisit};
use rustc_trans_utils::trans_crate::TransCrate;
use rustc_codegen_utils::codegen_backend::CodegenBackend;
use rustc::ty::TyCtxt;
use syntax::ast;

Expand Down Expand Up @@ -53,7 +53,7 @@ impl<'a> CompilerCalls<'a> for MiriCompilerCalls {
}
fn late_callback(
&mut self,
trans: &TransCrate,
trans: &CodegenBackend,
matches: &getopts::Matches,
sess: &Session,
cstore: &CrateStore,
Expand Down Expand Up @@ -104,9 +104,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) {
state.hir_crate.unwrap().visit_all_item_likes(&mut Visitor(tcx, state));
} else if let Some((entry_node_id, _, _)) = *state.session.entry_fn.borrow() {
let entry_def_id = tcx.hir.local_def_id(entry_node_id);
let start_wrapper = tcx.lang_items().start_fn().and_then(|start_fn|
if tcx.is_mir_available(start_fn) { Some(start_fn) } else { None });
miri::eval_main(tcx, entry_def_id, start_wrapper);
miri::eval_main(tcx, entry_def_id, None);

state.session.abort_if_errors();
} else {
Expand Down
Loading