From d06384ac29098c3a4b3e21eb2f70093e800bd1b6 Mon Sep 17 00:00:00 2001
From: RustyYato <krishna.sd.2012@gmail.com>
Date: Wed, 3 Feb 2021 16:59:28 -0500
Subject: [PATCH] make Allocator object-safe

add test to ensure object-safety
This allows for runtime polymorphic allocators
---
 library/core/src/alloc/mod.rs        |  5 ++++-
 src/test/ui/allocator/object-safe.rs | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 src/test/ui/allocator/object-safe.rs

diff --git a/library/core/src/alloc/mod.rs b/library/core/src/alloc/mod.rs
index 045eb58d0135a..9c2a0146e2c3d 100644
--- a/library/core/src/alloc/mod.rs
+++ b/library/core/src/alloc/mod.rs
@@ -342,7 +342,10 @@ pub unsafe trait Allocator {
     ///
     /// The returned adaptor also implements `Allocator` and will simply borrow this.
     #[inline(always)]
-    fn by_ref(&self) -> &Self {
+    fn by_ref(&self) -> &Self
+    where
+        Self: Sized,
+    {
         self
     }
 }
diff --git a/src/test/ui/allocator/object-safe.rs b/src/test/ui/allocator/object-safe.rs
new file mode 100644
index 0000000000000..fae7ab7fe3319
--- /dev/null
+++ b/src/test/ui/allocator/object-safe.rs
@@ -0,0 +1,13 @@
+// run-pass
+
+// Check that `Allocator` is object safe, this allows for polymorphic allocators
+
+#![feature(allocator_api)]
+
+use std::alloc::{Allocator, System};
+
+fn ensure_object_safe(_: &dyn Allocator) {}
+
+fn main() {
+    ensure_object_safe(&System);
+}