1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YJIT: Do not create CodeBlock.asm_comments if the asm_comments feature is disabled (#5863)

Browse Source
This commit is contained in:
Dmitry Dygalo 2022-04-29 16:07:48 +02:00 committed by GitHub
parent 5741ae379b
commit f8e4488e5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-04-29 23:08:19 +09:00 
Merged-By: maximecb <maximecb@ruby-lang.org>
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
yjit/src/asm/mod.rs
View File

@ -92,6 +92,7 @@ pub struct CodeBlock {
label_refs: Vec<LabelRef>, label_refs: Vec<LabelRef>,
// Comments for assembly instructions, if that feature is enabled // Comments for assembly instructions, if that feature is enabled
#[cfg(feature = "asm_comments")]
asm_comments: BTreeMap<usize, Vec<String>>, asm_comments: BTreeMap<usize, Vec<String>>,
// Keep track of the current aligned write position. // Keep track of the current aligned write position.
@ -122,6 +123,7 @@ impl CodeBlock {
label_addrs: Vec::new(), label_addrs: Vec::new(),
label_names: Vec::new(), label_names: Vec::new(),
label_refs: Vec::new(), label_refs: Vec::new(),
#[cfg(feature = "asm_comments")]
asm_comments: BTreeMap::new(), asm_comments: BTreeMap::new(),
current_aligned_write_pos: ALIGNED_WRITE_POSITION_NONE, current_aligned_write_pos: ALIGNED_WRITE_POSITION_NONE,
page_size: 4096, page_size: 4096,
@ -138,6 +140,7 @@ impl CodeBlock {
label_addrs: Vec::new(), label_addrs: Vec::new(),
label_names: Vec::new(), label_names: Vec::new(),
label_refs: Vec::new(), label_refs: Vec::new(),
#[cfg(feature = "asm_comments")]
asm_comments: BTreeMap::new(), asm_comments: BTreeMap::new(),
current_aligned_write_pos: ALIGNED_WRITE_POSITION_NONE, current_aligned_write_pos: ALIGNED_WRITE_POSITION_NONE,
page_size, page_size,
@ -152,24 +155,31 @@ impl CodeBlock {
/// Add an assembly comment if the feature is on. /// Add an assembly comment if the feature is on.
/// If not, this becomes an inline no-op. /// If not, this becomes an inline no-op.
#[inline] #[cfg(feature = "asm_comments")]
pub fn add_comment(&mut self, comment: &str) { pub fn add_comment(&mut self, comment: &str) {
if cfg!(feature = "asm_comments") { let cur_ptr = self.get_write_ptr().into_usize();
let cur_ptr = self.get_write_ptr().into_usize();
// If there's no current list of comments for this line number, add one. // If there's no current list of comments for this line number, add one.
let this_line_comments = self.asm_comments.entry(cur_ptr).or_default(); let this_line_comments = self.asm_comments.entry(cur_ptr).or_default();
// Unless this comment is the same as the last one at this same line, add it. // Unless this comment is the same as the last one at this same line, add it.
if this_line_comments.last().map(String::as_str) != Some(comment) { if this_line_comments.last().map(String::as_str) != Some(comment) {
this_line_comments.push(comment.to_string()); this_line_comments.push(comment.to_string());
}
} }
} }
#[cfg(not(feature = "asm_comments"))]
#[inline]
pub fn add_comment(&mut self, _: &str) {}
#[cfg(feature = "asm_comments")]
pub fn comments_at(&self, pos: usize) -> Option<&Vec<String>> { pub fn comments_at(&self, pos: usize) -> Option<&Vec<String>> {
self.asm_comments.get(&pos) self.asm_comments.get(&pos)
} }
#[cfg(not(feature = "asm_comments"))]
#[inline]
pub fn comments_at(&self, _: usize) -> Option<&Vec<String>> {
None
}
pub fn get_mem_size(&self) -> usize { pub fn get_mem_size(&self) -> usize {
self.mem_size self.mem_size