-0ec370670220b712b042ee09aab067ec7e5878d5
+093241deae70ba38413aff823b31c23731debf14
extern crate rustc_errors;
extern crate rustc_interface;
extern crate rustc_metadata;
-extern crate syntax;
+extern crate rustc_span;
use std::io;
use std::io::Write;
impl<'tcx, 'hir> itemlikevisit::ItemLikeVisitor<'hir> for Visitor<'tcx> {
fn visit_item(&mut self, i: &'hir hir::Item) {
if let hir::ItemKind::Fn(.., body_id) = i.kind {
- if i.attrs.iter().any(|attr| attr.check_name(syntax::symbol::sym::test))
+ if i.attrs.iter().any(|attr| attr.check_name(rustc_span::symbol::sym::test))
{
let config = MiriConfig {
validate: true,
extern crate rustc_errors;
extern crate rustc_interface;
extern crate rustc_metadata;
-extern crate syntax;
+extern crate rustc_span;
use std::convert::TryFrom;
use std::env;
config: MiriConfig,
) -> InterpResult<'tcx, (InterpCx<'mir, 'tcx, Evaluator<'tcx>>, MPlaceTy<'tcx, Tag>)> {
let mut ecx = InterpCx::new(
- tcx.at(syntax::source_map::DUMMY_SP),
+ tcx.at(rustc_span::source_map::DUMMY_SP),
ty::ParamEnv::reveal_all(),
Evaluator::new(config.communicate),
MemoryExtra::new(
layout::{self, LayoutOf, Size, TyLayout},
List, TyCtxt,
};
-use syntax::source_map::DUMMY_SP;
+use rustc_span::source_map::DUMMY_SP;
use rand::RngCore;
extern crate syntax;
#[macro_use]
extern crate rustc;
+extern crate rustc_span;
extern crate rustc_data_structures;
extern crate rustc_mir;
extern crate rustc_target;
layout::{LayoutOf, Size},
Ty, TyCtxt,
};
-use syntax::{attr, source_map::Span, symbol::sym};
+use rustc_span::{source_map::Span, symbol::sym};
+use syntax::attr;
use crate::*;
#[inline(always)]
fn find_mir_or_eval_fn(
ecx: &mut InterpCx<'mir, 'tcx, Self>,
+ _span: Span,
instance: ty::Instance<'tcx>,
args: &[OpTy<'tcx, Tag>],
ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
use rustc::ty;
use rustc::ty::layout::{Align, LayoutOf, Size};
use rustc_apfloat::Float;
+use rustc_span::symbol::sym;
use syntax::attr;
-use syntax::symbol::sym;
use crate::*;
// lpBuffer : ptr to buffer that receives contents of the env_var as a null-terminated string.
// Return `# of chars` stored in the buffer pointed to by lpBuffer, excluding null-terminator.
// Return 0 upon failure.
-
+
// This is not the env var you are looking for.
this.set_last_error(Scalar::from_u32(203))?; // ERROR_ENVVAR_NOT_FOUND
this.write_null(dest)?;
use rustc::ty;
use rustc::ty::layout::{self, Align, LayoutOf, Size};
use rustc_apfloat::Float;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
use crate::*;
use rustc::mir;
use rustc::ty::{self, layout::LayoutOf};
use rustc_target::spec::PanicStrategy;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
use crate::*;
let msg = msg.description();
let msg = this.allocate_str(msg, MiriMemoryKind::Env.into());
- // Second arg: Caller location.
- let location = this.alloc_caller_location_for_span(span);
-
// Call the lang item.
let panic = this.tcx.lang_items().panic_fn().unwrap();
let panic = ty::Instance::mono(this.tcx.tcx, panic);
this.call_function(
panic,
- &[msg.to_ref(), location.ptr.into()],
+ &[msg.to_ref()],
None,
StackPopCleanup::Goto { ret: None, unwind },
)?;