hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 16:55:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rust: add diagnostics about item expansion not working properly

Browse Source
This commit is contained in:
Paolo Tranquilli
2025-05-02 13:43:00 +02:00
parent 6ecaf65132
commit 82736ea621
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
rust/extractor/src/translate/base.rs
View File

@@ -159,21 +159,24 @@ impl<'a> Translator<'a> {
Some(node.syntax().text_range())
}
}
pub fn emit_location<T: TrapClass>(&mut self, label: Label<T>, node: &impl ast::AstNode) {
if let Some((start, end)) = self
.text_range_for_node(node)
fn location_for_node(&mut self, node: &impl ast::AstNode) -> (LineCol, LineCol) {
self.text_range_for_node(node)
.and_then(|r| self.location(r))
{
self.trap.emit_location(self.label, label, start, end)
} else {
self.emit_diagnostic(
.unwrap_or(UNKNOWN_LOCATION)
}
pub fn emit_location<T: TrapClass>(&mut self, label: Label<T>, node: &impl ast::AstNode) {
match self.location_for_node(node) {
UNKNOWN_LOCATION => self.emit_diagnostic(
DiagnosticSeverity::Debug,
"locations".to_owned(),
"missing location for AstNode".to_owned(),
"missing location for AstNode".to_owned(),
UNKNOWN_LOCATION,
);
}
),
(start, end) => self.trap.emit_location(self.label, label, start, end),
};
}
pub fn emit_location_token(
&mut self,
@@ -657,9 +660,19 @@ impl<'a> Translator<'a> {
let ExpandResult {
value: expanded, ..
} = semantics.expand_attr_macro(node)?;
// TODO emit err?
self.emit_macro_expansion_parse_errors(node, &expanded);
let macro_items = ast::MacroItems::cast(expanded)?;
let macro_items = ast::MacroItems::cast(expanded).or_else(|| {
let message = "attribute macro expansion cannot be cast to MacroItems".to_owned();
let location = self.location_for_node(node);
self.emit_diagnostic(
DiagnosticSeverity::Warning,
"item_expansion".to_owned(),
message.clone(),
message,
location,
);
None
})?;
let expanded = self.emit_macro_items(&macro_items)?;
generated::Item::emit_attribute_macro_expansion(label, expanded, &mut self.trap.writer);
Some(())