diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 55da5b921af0064ce0745ce3fb0d2c0b98815af2..a92a2c916b266f3eae0e431e208a20829edb5915 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -118,8 +118,8 @@ pub struct Session {
/// The metadata::creader module may inject an allocator/panic_runtime
/// dependency if it didn't already find one, and this tracks what was
/// injected.
- pub injected_allocator: Cell>,
- pub allocator_kind: Cell >,
+ pub injected_allocator: Once >,
+ pub allocator_kind: Once >,
pub injected_panic_runtime: Cell >,
/// Map from imported macro spans (which consist of
@@ -1105,8 +1105,8 @@ pub fn build_session_(
const_eval_stack_frame_limit: 100,
const_eval_step_limit: 1_000_000,
next_node_id: OneThread::new(Cell::new(NodeId::new(1))),
- injected_allocator: Cell::new(None),
- allocator_kind: Cell::new(None),
+ injected_allocator: Once::new(),
+ allocator_kind: Once::new(),
injected_panic_runtime: Cell::new(None),
imported_macro_spans: OneThread::new(RefCell::new(HashMap::new())),
incr_comp_session: OneThread::new(RefCell::new(IncrCompSession::NotInitialized)),
diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 5b54994b9ceab5d2ba917ee053541aabd9055990..06baea53cd535461bc206cd535853f81b62d129a 100644
--- a/src/librustc_metadata/creader.rs
+++ b/src/librustc_metadata/creader.rs
@@ -823,6 +823,8 @@ fn inject_allocator_crate(&mut self, krate: &ast::Crate) {
needs_allocator = needs_allocator || data.needs_allocator(self.sess);
});
if !needs_allocator {
+ self.sess.injected_allocator.set(None);
+ self.sess.allocator_kind.set(None);
return
}
@@ -842,6 +844,8 @@ fn inject_allocator_crate(&mut self, krate: &ast::Crate) {
}
}
if !need_lib_alloc && !need_exe_alloc {
+ self.sess.injected_allocator.set(None);
+ self.sess.allocator_kind.set(None);
return
}
@@ -879,6 +883,7 @@ fn inject_allocator_crate(&mut self, krate: &ast::Crate) {
});
if global_allocator.is_some() {
self.sess.allocator_kind.set(Some(AllocatorKind::Global));
+ self.sess.injected_allocator.set(None);
return
}
@@ -922,6 +927,9 @@ fn inject_allocator_crate(&mut self, krate: &ast::Crate) {
};
let allocation_crate_data = exe_allocation_crate_data.or_else(|| {
+ // No allocator was injected
+ self.sess.injected_allocator.set(None);
+
if attr::contains_name(&krate.attrs, "default_lib_allocator") {
// Prefer self as the allocator if there's a collision
return None;
diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs
index c2d94a17f03dd828a7834ca9fca76cb8f57b651d..f181275326c7133a141ca57144f7d0493b36aa79 100644
--- a/src/librustc_trans/base.rs
+++ b/src/librustc_trans/base.rs
@@ -795,7 +795,7 @@ pub fn trans_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
codegen_units.len());
// Translate an allocator shim, if any
- let allocator_module = if let Some(kind) = tcx.sess.allocator_kind.get() {
+ let allocator_module = if let Some(kind) = *tcx.sess.allocator_kind.get() {
unsafe {
let llmod_id = "allocator";
let (llcx, llmod) =