mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-06 04:08:40 +00:00
Rustup to rustc 1.43.0-nightly (442ae7f04
2020-02-06)
This commit is contained in:
parent
fbe36ad68a
commit
01f6f40ac2
@ -41,7 +41,7 @@ const MIN_ALIGN: usize = 8;
|
|||||||
target_arch = "sparc64")))]
|
target_arch = "sparc64")))]
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
const MIN_ALIGN: usize = 16;
|
const MIN_ALIGN: usize = 16;
|
||||||
use core::alloc::{Alloc, GlobalAlloc, AllocErr, Layout};
|
use core::alloc::{AllocRef, GlobalAlloc, AllocErr, Layout};
|
||||||
use core::ptr::NonNull;
|
use core::ptr::NonNull;
|
||||||
/// The default memory allocator provided by the operating system.
|
/// The default memory allocator provided by the operating system.
|
||||||
///
|
///
|
||||||
@ -70,7 +70,7 @@ use core::ptr::NonNull;
|
|||||||
#[stable(feature = "alloc_system_type", since = "1.28.0")]
|
#[stable(feature = "alloc_system_type", since = "1.28.0")]
|
||||||
pub struct System;
|
pub struct System;
|
||||||
#[unstable(feature = "allocator_api", issue = "32838")]
|
#[unstable(feature = "allocator_api", issue = "32838")]
|
||||||
unsafe impl Alloc for System {
|
unsafe impl AllocRef for System {
|
||||||
#[inline]
|
#[inline]
|
||||||
unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
|
unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
|
||||||
NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr)
|
NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr)
|
||||||
|
@ -1 +1 @@
|
|||||||
nightly-2020-02-01
|
nightly-2020-02-07
|
||||||
|
@ -329,6 +329,7 @@ impl<'tcx, B: Backend> BackendTypes for FunctionCx<'_, 'tcx, B> {
|
|||||||
type Type = Type;
|
type Type = Type;
|
||||||
type Funclet = !;
|
type Funclet = !;
|
||||||
type DIScope = !;
|
type DIScope = !;
|
||||||
|
type DIVariable = !;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'tcx, B: Backend + 'static> FunctionCx<'_, 'tcx, B> {
|
impl<'tcx, B: Backend + 'static> FunctionCx<'_, 'tcx, B> {
|
||||||
|
14
src/lib.rs
14
src/lib.rs
@ -213,11 +213,19 @@ impl CodegenBackend for CraneliftCodegenBackend {
|
|||||||
res
|
res
|
||||||
}
|
}
|
||||||
|
|
||||||
fn join_codegen_and_link(
|
fn join_codegen(
|
||||||
&self,
|
&self,
|
||||||
res: Box<dyn Any>,
|
ongoing_codegen: Box<dyn Any>,
|
||||||
sess: &Session,
|
_sess: &Session,
|
||||||
_dep_graph: &DepGraph,
|
_dep_graph: &DepGraph,
|
||||||
|
) -> Result<Box<dyn Any>, ErrorReported> {
|
||||||
|
Ok(ongoing_codegen)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn link(
|
||||||
|
&self,
|
||||||
|
sess: &Session,
|
||||||
|
res: Box<dyn Any>,
|
||||||
outputs: &OutputFilenames,
|
outputs: &OutputFilenames,
|
||||||
) -> Result<(), ErrorReported> {
|
) -> Result<(), ErrorReported> {
|
||||||
use rustc_codegen_ssa::back::link::link_binary;
|
use rustc_codegen_ssa::back::link::link_binary;
|
||||||
|
Loading…
Reference in New Issue
Block a user