Skip to content

Commit ee2d5fe

Browse files
committed
Auto merge of #12795 - jonas-schievink:proc-macro-abi-1.64, r=jonas-schievink
feat: Support the 1.64 nightly proc macro ABI Should resolve #12600 Not sure why I thought the Rust version was the same as on beta, that's never the case (but future nightly changes can break the ABI again).
2 parents 8e379ce + 6cb0746 commit ee2d5fe

File tree

15 files changed

+4443
-1
lines changed

15 files changed

+4443
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
//! Macro ABI for version 1.63 of rustc
2+
3+
#[allow(dead_code)]
4+
#[doc(hidden)]
5+
mod proc_macro;
6+
7+
#[allow(dead_code)]
8+
#[doc(hidden)]
9+
mod rustc_server;
10+
11+
use libloading::Library;
12+
use proc_macro_api::ProcMacroKind;
13+
14+
use super::PanicMessage;
15+
16+
pub(crate) struct Abi {
17+
exported_macros: Vec<proc_macro::bridge::client::ProcMacro>,
18+
}
19+
20+
impl From<proc_macro::bridge::PanicMessage> for PanicMessage {
21+
fn from(p: proc_macro::bridge::PanicMessage) -> Self {
22+
Self { message: p.as_str().map(|s| s.to_string()) }
23+
}
24+
}
25+
26+
impl Abi {
27+
pub unsafe fn from_lib(lib: &Library, symbol_name: String) -> Result<Abi, libloading::Error> {
28+
let macros: libloading::Symbol<&&[proc_macro::bridge::client::ProcMacro]> =
29+
lib.get(symbol_name.as_bytes())?;
30+
Ok(Self { exported_macros: macros.to_vec() })
31+
}
32+
33+
pub fn expand(
34+
&self,
35+
macro_name: &str,
36+
macro_body: &tt::Subtree,
37+
attributes: Option<&tt::Subtree>,
38+
) -> Result<tt::Subtree, PanicMessage> {
39+
let parsed_body = rustc_server::TokenStream::with_subtree(macro_body.clone());
40+
41+
let parsed_attributes = attributes.map_or(rustc_server::TokenStream::new(), |attr| {
42+
rustc_server::TokenStream::with_subtree(attr.clone())
43+
});
44+
45+
for proc_macro in &self.exported_macros {
46+
match proc_macro {
47+
proc_macro::bridge::client::ProcMacro::CustomDerive {
48+
trait_name, client, ..
49+
} if *trait_name == macro_name => {
50+
let res = client.run(
51+
&proc_macro::bridge::server::SameThread,
52+
rustc_server::Rustc::default(),
53+
parsed_body,
54+
true,
55+
);
56+
return res.map(|it| it.into_subtree()).map_err(PanicMessage::from);
57+
}
58+
proc_macro::bridge::client::ProcMacro::Bang { name, client }
59+
if *name == macro_name =>
60+
{
61+
let res = client.run(
62+
&proc_macro::bridge::server::SameThread,
63+
rustc_server::Rustc::default(),
64+
parsed_body,
65+
true,
66+
);
67+
return res.map(|it| it.into_subtree()).map_err(PanicMessage::from);
68+
}
69+
proc_macro::bridge::client::ProcMacro::Attr { name, client }
70+
if *name == macro_name =>
71+
{
72+
let res = client.run(
73+
&proc_macro::bridge::server::SameThread,
74+
rustc_server::Rustc::default(),
75+
parsed_attributes,
76+
parsed_body,
77+
true,
78+
);
79+
return res.map(|it| it.into_subtree()).map_err(PanicMessage::from);
80+
}
81+
_ => continue,
82+
}
83+
}
84+
85+
Err(proc_macro::bridge::PanicMessage::String("Nothing to expand".to_string()).into())
86+
}
87+
88+
pub fn list_macros(&self) -> Vec<(String, ProcMacroKind)> {
89+
self.exported_macros
90+
.iter()
91+
.map(|proc_macro| match proc_macro {
92+
proc_macro::bridge::client::ProcMacro::CustomDerive { trait_name, .. } => {
93+
(trait_name.to_string(), ProcMacroKind::CustomDerive)
94+
}
95+
proc_macro::bridge::client::ProcMacro::Bang { name, .. } => {
96+
(name.to_string(), ProcMacroKind::FuncLike)
97+
}
98+
proc_macro::bridge::client::ProcMacro::Attr { name, .. } => {
99+
(name.to_string(), ProcMacroKind::Attr)
100+
}
101+
})
102+
.collect()
103+
}
104+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
//! Buffer management for same-process client<->server communication.
2+
3+
use std::io::{self, Write};
4+
use std::mem;
5+
use std::ops::{Deref, DerefMut};
6+
use std::slice;
7+
8+
#[repr(C)]
9+
pub struct Buffer {
10+
data: *mut u8,
11+
len: usize,
12+
capacity: usize,
13+
reserve: extern "C" fn(Buffer, usize) -> Buffer,
14+
drop: extern "C" fn(Buffer),
15+
}
16+
17+
unsafe impl Sync for Buffer {}
18+
unsafe impl Send for Buffer {}
19+
20+
impl Default for Buffer {
21+
#[inline]
22+
fn default() -> Self {
23+
Self::from(vec![])
24+
}
25+
}
26+
27+
impl Deref for Buffer {
28+
type Target = [u8];
29+
#[inline]
30+
fn deref(&self) -> &[u8] {
31+
unsafe { slice::from_raw_parts(self.data as *const u8, self.len) }
32+
}
33+
}
34+
35+
impl DerefMut for Buffer {
36+
#[inline]
37+
fn deref_mut(&mut self) -> &mut [u8] {
38+
unsafe { slice::from_raw_parts_mut(self.data, self.len) }
39+
}
40+
}
41+
42+
impl Buffer {
43+
#[inline]
44+
pub(super) fn new() -> Self {
45+
Self::default()
46+
}
47+
48+
#[inline]
49+
pub(super) fn clear(&mut self) {
50+
self.len = 0;
51+
}
52+
53+
#[inline]
54+
pub(super) fn take(&mut self) -> Self {
55+
mem::take(self)
56+
}
57+
58+
// We have the array method separate from extending from a slice. This is
59+
// because in the case of small arrays, codegen can be more efficient
60+
// (avoiding a memmove call). With extend_from_slice, LLVM at least
61+
// currently is not able to make that optimization.
62+
#[inline]
63+
pub(super) fn extend_from_array<const N: usize>(&mut self, xs: &[u8; N]) {
64+
if xs.len() > (self.capacity - self.len) {
65+
let b = self.take();
66+
*self = (b.reserve)(b, xs.len());
67+
}
68+
unsafe {
69+
xs.as_ptr().copy_to_nonoverlapping(self.data.add(self.len), xs.len());
70+
self.len += xs.len();
71+
}
72+
}
73+
74+
#[inline]
75+
pub(super) fn extend_from_slice(&mut self, xs: &[u8]) {
76+
if xs.len() > (self.capacity - self.len) {
77+
let b = self.take();
78+
*self = (b.reserve)(b, xs.len());
79+
}
80+
unsafe {
81+
xs.as_ptr().copy_to_nonoverlapping(self.data.add(self.len), xs.len());
82+
self.len += xs.len();
83+
}
84+
}
85+
86+
#[inline]
87+
pub(super) fn push(&mut self, v: u8) {
88+
// The code here is taken from Vec::push, and we know that reserve()
89+
// will panic if we're exceeding isize::MAX bytes and so there's no need
90+
// to check for overflow.
91+
if self.len == self.capacity {
92+
let b = self.take();
93+
*self = (b.reserve)(b, 1);
94+
}
95+
unsafe {
96+
*self.data.add(self.len) = v;
97+
self.len += 1;
98+
}
99+
}
100+
}
101+
102+
impl Write for Buffer {
103+
#[inline]
104+
fn write(&mut self, xs: &[u8]) -> io::Result<usize> {
105+
self.extend_from_slice(xs);
106+
Ok(xs.len())
107+
}
108+
109+
#[inline]
110+
fn write_all(&mut self, xs: &[u8]) -> io::Result<()> {
111+
self.extend_from_slice(xs);
112+
Ok(())
113+
}
114+
115+
#[inline]
116+
fn flush(&mut self) -> io::Result<()> {
117+
Ok(())
118+
}
119+
}
120+
121+
impl Drop for Buffer {
122+
#[inline]
123+
fn drop(&mut self) {
124+
let b = self.take();
125+
(b.drop)(b);
126+
}
127+
}
128+
129+
impl From<Vec<u8>> for Buffer {
130+
fn from(mut v: Vec<u8>) -> Self {
131+
let (data, len, capacity) = (v.as_mut_ptr(), v.len(), v.capacity());
132+
mem::forget(v);
133+
134+
// This utility function is nested in here because it can *only*
135+
// be safely called on `Buffer`s created by *this* `proc_macro`.
136+
fn to_vec(b: Buffer) -> Vec<u8> {
137+
unsafe {
138+
let Buffer { data, len, capacity, .. } = b;
139+
mem::forget(b);
140+
Vec::from_raw_parts(data, len, capacity)
141+
}
142+
}
143+
144+
extern "C" fn reserve(b: Buffer, additional: usize) -> Buffer {
145+
let mut v = to_vec(b);
146+
v.reserve(additional);
147+
Buffer::from(v)
148+
}
149+
150+
extern "C" fn drop(b: Buffer) {
151+
mem::drop(to_vec(b));
152+
}
153+
154+
Buffer { data, len, capacity, reserve, drop }
155+
}
156+
}

0 commit comments

Comments
 (0)