nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-11 16:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline bridge::Buffer methods.

Browse Source 
This fixes a performance regression caused by making `Buffer`
non-generic in #97004.
This commit is contained in:
Nicholas Nethercote 2022-06-01 09:21:35 +10:00
parent bef2b7cd1c
commit dee353da1d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/proc_macro/src/bridge/buffer.rs
View File

@ -18,6 +18,7 @@ unsafe impl Sync for Buffer {}
unsafe impl Send for Buffer {} unsafe impl Send for Buffer {}
impl Default for Buffer { impl Default for Buffer {
#[inline]
fn default() -> Self { fn default() -> Self {
Self::from(vec![]) Self::from(vec![])
} }
@ -25,26 +26,31 @@ impl Default for Buffer {
impl Deref for Buffer { impl Deref for Buffer {
type Target = [u8]; type Target = [u8];
#[inline]
fn deref(&self) -> &[u8] { fn deref(&self) -> &[u8] {
unsafe { slice::from_raw_parts(self.data as *const u8, self.len) } unsafe { slice::from_raw_parts(self.data as *const u8, self.len) }
} }
} }
impl DerefMut for Buffer { impl DerefMut for Buffer {
#[inline]
fn deref_mut(&mut self) -> &mut [u8] { fn deref_mut(&mut self) -> &mut [u8] {
unsafe { slice::from_raw_parts_mut(self.data, self.len) } unsafe { slice::from_raw_parts_mut(self.data, self.len) }
} }
} }
impl Buffer { impl Buffer {
#[inline]
pub(super) fn new() -> Self { pub(super) fn new() -> Self {
Self::default() Self::default()
} }
#[inline]
pub(super) fn clear(&mut self) { pub(super) fn clear(&mut self) {
self.len = 0; self.len = 0;
} }
#[inline]
pub(super) fn take(&mut self) -> Self { pub(super) fn take(&mut self) -> Self {
mem::take(self) mem::take(self)
} }
@ -53,6 +59,7 @@ impl Buffer {
// because in the case of small arrays, codegen can be more efficient // because in the case of small arrays, codegen can be more efficient
// (avoiding a memmove call). With extend_from_slice, LLVM at least // (avoiding a memmove call). With extend_from_slice, LLVM at least
// currently is not able to make that optimization. // currently is not able to make that optimization.
#[inline]
pub(super) fn extend_from_array<const N: usize>(&mut self, xs: &[u8; N]) { pub(super) fn extend_from_array<const N: usize>(&mut self, xs: &[u8; N]) {
if xs.len() > (self.capacity - self.len) { if xs.len() > (self.capacity - self.len) {
let b = self.take(); let b = self.take();
@ -64,6 +71,7 @@ impl Buffer {
} }
} }
#[inline]
pub(super) fn extend_from_slice(&mut self, xs: &[u8]) { pub(super) fn extend_from_slice(&mut self, xs: &[u8]) {
if xs.len() > (self.capacity - self.len) { if xs.len() > (self.capacity - self.len) {
let b = self.take(); let b = self.take();
@ -75,6 +83,7 @@ impl Buffer {
} }
} }
#[inline]
pub(super) fn push(&mut self, v: u8) { pub(super) fn push(&mut self, v: u8) {
// The code here is taken from Vec::push, and we know that reserve() // The code here is taken from Vec::push, and we know that reserve()
// will panic if we're exceeding isize::MAX bytes and so there's no need // will panic if we're exceeding isize::MAX bytes and so there's no need
@ -91,22 +100,26 @@ impl Buffer {
} }
impl Write for Buffer { impl Write for Buffer {
#[inline]
fn write(&mut self, xs: &[u8]) -> io::Result<usize> { fn write(&mut self, xs: &[u8]) -> io::Result<usize> {
self.extend_from_slice(xs); self.extend_from_slice(xs);
Ok(xs.len()) Ok(xs.len())
} }
#[inline]
fn write_all(&mut self, xs: &[u8]) -> io::Result<()> { fn write_all(&mut self, xs: &[u8]) -> io::Result<()> {
self.extend_from_slice(xs); self.extend_from_slice(xs);
Ok(()) Ok(())
} }
#[inline]
fn flush(&mut self) -> io::Result<()> { fn flush(&mut self) -> io::Result<()> {
Ok(()) Ok(())
} }
} }
impl Drop for Buffer { impl Drop for Buffer {
#[inline]
fn drop(&mut self) { fn drop(&mut self) {
let b = self.take(); let b = self.take();
(b.drop)(b); (b.drop)(b);