Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Bugfixes

- Don't allow unsafe code in initialisation expression of `#[percore]` variables.

## 0.2.5

### New features
Expand Down
6 changes: 4 additions & 2 deletions percore-derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ pub fn percore(_attr: TokenStream, item: TokenStream) -> TokenStream {
quote! {
#[cfg_attr(target_os = "none", unsafe(link_section = ".percore"))]
#(#attrs)*
#vis static #name: percore::derive::LinkedPerCore<#ty> =
unsafe { percore::derive::LinkedPerCore::new(#expr) };
#vis static #name: percore::derive::LinkedPerCore<#ty> = const {
let value = #expr;
unsafe { percore::derive::LinkedPerCore::new(value) }
};
}
.into()
}
9 changes: 8 additions & 1 deletion src/derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ mod tests {
use super::*;
use crate as percore;
use crate::ExceptionFree;
use core::cell::RefCell;
use core::{cell::RefCell, num::NonZero};

#[percore]
static VALUE: ExceptionLock<RefCell<u64>> =
Expand All @@ -265,4 +265,11 @@ mod tests {
*VALUE.get().borrow_mut(token) = 10;
assert_eq!(10, *VALUE.get().borrow(token).borrow());
}

#[test]
fn derive_unsafe() {
#[percore]
static VALUE: ExceptionLock<NonZero<u64>> =
ExceptionLock::new(unsafe { NonZero::new_unchecked(42) });
}
}
Loading