rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure '\0' atom is static & never inlined (#2880)

Browse Source
This commit is contained in:
Mark Thom
2025-04-12 18:48:47 -07:00
committed by Mark Thom
parent 907e64e185
commit 1297a24469
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/static_string_indexing.rs
View File

@@ -87,7 +87,7 @@ impl<'ast> Visit<'ast> for StaticStrVisitor {
const INLINED_ATOM_MAX_LEN: usize = 6;
fn static_string_index(string: &str, index: usize) -> u64 {
if 0 < string.len() && string.len() <= INLINED_ATOM_MAX_LEN {
if !string.is_empty() && string.len() <= INLINED_ATOM_MAX_LEN && !string.contains('\u{0}') {
let mut string_buf: [u8; 8] = [0u8; 8];
string_buf[..string.len()].copy_from_slice(string.as_bytes());
(u64::from_le_bytes(string_buf) << 1) | 1
@@ -183,8 +183,7 @@ pub fn index_static_strings(instruction_rs_path: &std::path::Path) -> TokenStrea
})
.collect();
let static_strs_len = static_strs.len(); // visitor.static_strs.len();
//let static_strs: &Vec<_> = &visitor.static_strs.into_iter().collect();
let static_strs_len = static_strs.len();
quote! {
static STRINGS: [&str; #static_strs_len] = [