Skip to content

Commit 6eab89f

Browse files
VeykrilVeykril
committed
Use dyn cache for Semantics macro resolution
1 parent 8d5e14d commit 6eab89f

11 files changed

+44
-41
lines changed

‎src/tools/rust-analyzer/crates/hir/src/lib.rs

+6
Original file line numberDiff line numberDiff line change
@@ -2755,6 +2755,12 @@ impl Macro {
27552755
}
27562756
}
27572757

2758+
pub fn is_asm_or_global_asm(&self, db: &dyn HirDatabase) -> bool {
2759+
matches!(self.id, MacroId::Macro2Id(it) if {
2760+
matches!(it.lookup(db.upcast()).expander, MacroExpander::BuiltIn(m) if m.is_asm())
2761+
})
2762+
}
2763+
27582764
pub fn is_attr(&self, db: &dyn HirDatabase) -> bool {
27592765
matches!(self.kind(db), MacroKind::Attr)
27602766
}

‎src/tools/rust-analyzer/crates/hir/src/semantics.rs

+18-7
Original file line numberDiff line numberDiff line change
@@ -1317,9 +1317,15 @@ impl<'db> SemanticsImpl<'db> {
13171317
}
13181318

13191319
pub fn resolve_macro_call(&self, macro_call: &ast::MacroCall) -> Option<Macro> {
1320-
let sa = self.analyze(macro_call.syntax())?;
13211320
let macro_call = self.find_file(macro_call.syntax()).with_value(macro_call);
1322-
sa.resolve_macro_call(self.db, macro_call)
1321+
self.with_ctx(|ctx| {
1322+
ctx.macro_call_to_macro_call(macro_call)
1323+
.and_then(|call| macro_call_to_macro_id(ctx, call))
1324+
.map(Into::into)
1325+
})
1326+
.or_else(|| {
1327+
self.analyze(macro_call.value.syntax())?.resolve_macro_call(self.db, macro_call)
1328+
})
13231329
}
13241330

13251331
pub fn is_proc_macro_call(&self, macro_call: &ast::MacroCall) -> bool {
@@ -1339,12 +1345,17 @@ impl<'db> SemanticsImpl<'db> {
13391345
}
13401346

13411347
pub fn is_unsafe_macro_call(&self, macro_call: &ast::MacroCall) -> bool {
1342-
let sa = match self.analyze(macro_call.syntax()) {
1343-
Some(it) => it,
1344-
None => return false,
1345-
};
1348+
let Some(mac) = self.resolve_macro_call(macro_call) else { return false };
1349+
if mac.is_asm_or_global_asm(self.db) {
1350+
return true;
1351+
}
1352+
1353+
let Some(sa) = self.analyze(macro_call.syntax()) else { return false };
13461354
let macro_call = self.find_file(macro_call.syntax()).with_value(macro_call);
1347-
sa.is_unsafe_macro_call(self.db, macro_call)
1355+
match macro_call.map(|it| it.syntax().parent().and_then(ast::MacroExpr::cast)).transpose() {
1356+
Some(it) => sa.is_unsafe_macro_call_expr(self.db, it.as_ref()),
1357+
None => false,
1358+
}
13481359
}
13491360

13501361
pub fn resolve_attr_macro_call(&self, item: &ast::Item) -> Option<Macro> {

‎src/tools/rust-analyzer/crates/hir/src/source_analyzer.rs

+3-22
Original file line numberDiff line numberDiff line change
@@ -842,32 +842,13 @@ impl SourceAnalyzer {
842842
infer.variant_resolution_for_expr(expr_id)
843843
}
844844

845-
pub(crate) fn is_unsafe_macro_call(
845+
pub(crate) fn is_unsafe_macro_call_expr(
846846
&self,
847847
db: &dyn HirDatabase,
848-
macro_call: InFile<&ast::MacroCall>,
848+
macro_expr: InFile<&ast::MacroExpr>,
849849
) -> bool {
850-
// check for asm/global_asm
851-
if let Some(mac) = self.resolve_macro_call(db, macro_call) {
852-
let ex = match mac.id {
853-
hir_def::MacroId::Macro2Id(it) => it.lookup(db.upcast()).expander,
854-
hir_def::MacroId::MacroRulesId(it) => it.lookup(db.upcast()).expander,
855-
_ => hir_def::MacroExpander::Declarative,
856-
};
857-
if matches!(ex, hir_def::MacroExpander::BuiltIn(ex) if ex.is_asm()) {
858-
return true;
859-
}
860-
}
861-
let macro_expr = match macro_call
862-
.map(|it| it.syntax().parent().and_then(ast::MacroExpr::cast))
863-
.transpose()
864-
{
865-
Some(it) => it,
866-
None => return false,
867-
};
868-
869850
if let (Some((def, body, sm)), Some(infer)) = (&self.def, &self.infer) {
870-
if let Some(expanded_expr) = sm.macro_expansion_expr(macro_expr.as_ref()) {
851+
if let Some(expanded_expr) = sm.macro_expansion_expr(macro_expr) {
871852
let mut is_unsafe = false;
872853
unsafe_expressions(
873854
db,

‎src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/highlight.rs

+3
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,9 @@ fn highlight_method_call(
584584
if func.is_async(sema.db) {
585585
h |= HlMod::Async;
586586
}
587+
if func.is_const(sema.db) {
588+
h |= HlMod::Const;
589+
}
587590
if func
588591
.as_assoc_item(sema.db)
589592
.and_then(|it| it.container_or_implemented_trait(sema.db))

‎src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_block_mod_items.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,15 @@
4848
<pre><code><span class="keyword">macro_rules</span><span class="macro_bang">!</span> <span class="macro declaration">foo</span> <span class="brace">{</span>
4949
<span class="parenthesis">(</span><span class="punctuation">$</span>foo<span class="colon">:</span>ident<span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span>
5050
<span class="keyword">mod</span> y <span class="brace">{</span>
51-
<span class="keyword">struct</span> <span class="punctuation">$</span>foo<span class="semicolon">;</span>
51+
<span class="keyword">pub</span> <span class="keyword">struct</span> <span class="punctuation">$</span>foo<span class="semicolon">;</span>
5252
<span class="brace">}</span>
5353
<span class="brace">}</span><span class="semicolon">;</span>
5454
<span class="brace">}</span>
5555
<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
56-
<span class="macro">foo</span><span class="macro_bang">!</span><span class="parenthesis macro">(</span><span class="struct declaration macro">Foo</span><span class="parenthesis macro">)</span><span class="semicolon">;</span>
56+
<span class="macro">foo</span><span class="macro_bang">!</span><span class="parenthesis macro">(</span><span class="struct declaration macro public">Foo</span><span class="parenthesis macro">)</span><span class="semicolon">;</span>
5757
<span class="keyword">mod</span> <span class="module declaration">module</span> <span class="brace">{</span>
58-
<span class="comment">// FIXME: IDE layer has this unresolved</span>
59-
<span class="unresolved_reference">foo</span><span class="macro_bang">!</span><span class="parenthesis macro">(</span><span class="none macro">Bar</span><span class="parenthesis macro">)</span><span class="semicolon">;</span>
60-
<span class="keyword">fn</span> <span class="function declaration">func</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
58+
<span class="macro">foo</span><span class="macro_bang">!</span><span class="parenthesis macro">(</span><span class="struct declaration macro public">Bar</span><span class="parenthesis macro">)</span><span class="semicolon">;</span>
59+
<span class="keyword">fn</span> <span class="function declaration">func</span><span class="parenthesis">(</span><span class="punctuation">_</span><span class="colon">:</span> <span class="module">y</span><span class="operator">::</span><span class="struct public">Bar</span><span class="parenthesis">)</span> <span class="brace">{</span>
6160
<span class="keyword">mod</span> <span class="module declaration">inner</span> <span class="brace">{</span>
6261
<span class="keyword">struct</span> <span class="struct declaration">Innerest</span><span class="angle">&lt;</span><span class="keyword">const</span> <span class="const_param const declaration">C</span><span class="colon">:</span> <span class="unresolved_reference">usize</span><span class="angle">&gt;</span> <span class="brace">{</span> <span class="field declaration">field</span><span class="colon">:</span> <span class="bracket">[</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span> <span class="brace">{</span><span class="const_param const">C</span><span class="brace">}</span><span class="bracket">]</span> <span class="brace">}</span>
6362
<span class="brace">}</span>

‎src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_const.html

+2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@
6666
<span class="operator macro">&</span><span class="keyword macro">raw</span> <span class="keyword macro">const</span> <span class="parenthesis macro">(</span><span class="parenthesis macro">)</span><span class="semicolon macro">;</span>
6767
<span class="keyword macro">const</span>
6868
<span class="parenthesis macro">)</span><span class="semicolon">;</span>
69+
<span class="parenthesis">(</span><span class="parenthesis">)</span><span class="operator">.</span><span class="method const consuming trait">assoc_const_method</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
6970
<span class="brace">}</span>
7071
<span class="keyword">trait</span> <span class="trait declaration">ConstTrait</span> <span class="brace">{</span>
7172
<span class="keyword const">const</span> <span class="constant associated const declaration static trait">ASSOC_CONST</span><span class="colon">:</span> <span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">=</span> <span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
7273
<span class="keyword const">const</span> <span class="keyword">fn</span> <span class="function associated const declaration static trait">assoc_const_fn</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
74+
<span class="keyword const">const</span> <span class="keyword">fn</span> <span class="method associated const consuming declaration trait">assoc_const_method</span><span class="parenthesis">(</span><span class="self_keyword declaration">self</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
7375
<span class="brace">}</span>
7476
<span class="keyword">impl</span> <span class="keyword const">const</span> <span class="trait">ConstTrait</span> <span class="keyword">for</span> <span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
7577
<span class="keyword const">const</span> <span class="constant associated const declaration static trait">ASSOC_CONST</span><span class="colon">:</span> <span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">=</span> <span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>

‎src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_default_library.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@
4949

5050
<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
5151
<span class="keyword">let</span> <span class="variable declaration">foo</span> <span class="operator">=</span> <span class="enum_variant default_library library">Some</span><span class="parenthesis">(</span><span class="numeric_literal">92</span><span class="parenthesis">)</span><span class="semicolon">;</span>
52-
<span class="keyword">let</span> <span class="variable declaration">nums</span> <span class="operator">=</span> <span class="module default_library library">iter</span><span class="operator">::</span><span class="function default_library library">repeat</span><span class="parenthesis">(</span><span class="variable">foo</span><span class="operator">.</span><span class="method default_library library">unwrap</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="parenthesis">)</span><span class="semicolon">;</span>
52+
<span class="keyword">let</span> <span class="variable declaration">nums</span> <span class="operator">=</span> <span class="module default_library library">iter</span><span class="operator">::</span><span class="function default_library library">repeat</span><span class="parenthesis">(</span><span class="variable">foo</span><span class="operator">.</span><span class="method const default_library library">unwrap</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="parenthesis">)</span><span class="semicolon">;</span>
5353
<span class="brace">}</span></code></pre>

‎src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_general.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
<span class="bool_literal">true</span>
219219
<span class="brace">}</span>
220220
<span class="brace">}</span>
221-
<span class="keyword const">const</span> <span class="constant const declaration">USAGE_OF_BOOL</span><span class="colon">:</span> <span class="builtin_type">bool</span> <span class="operator">=</span> <span class="enum public">Bool</span><span class="operator">::</span><span class="enum_variant public">True</span><span class="operator">.</span><span class="method consuming public">to_primitive</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
221+
<span class="keyword const">const</span> <span class="constant const declaration">USAGE_OF_BOOL</span><span class="colon">:</span> <span class="builtin_type">bool</span> <span class="operator">=</span> <span class="enum public">Bool</span><span class="operator">::</span><span class="enum_variant public">True</span><span class="operator">.</span><span class="method const consuming public">to_primitive</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
222222

223223
<span class="keyword">trait</span> <span class="trait declaration">Baz</span> <span class="brace">{</span>
224224
<span class="keyword">type</span> <span class="type_alias associated declaration static trait">Qux</span><span class="semicolon">;</span>

‎src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<span class="macro">toho</span><span class="macro_bang">!</span><span class="parenthesis macro">(</span><span class="string_literal macro">"{}fmt"</span><span class="comma macro">,</span> <span class="numeric_literal macro">0</span><span class="parenthesis macro">)</span><span class="semicolon">;</span>
166166
<span class="keyword">let</span> <span class="variable declaration">i</span><span class="colon">:</span> <span class="builtin_type">u64</span> <span class="operator">=</span> <span class="numeric_literal">3</span><span class="semicolon">;</span>
167167
<span class="keyword">let</span> <span class="variable declaration">o</span><span class="colon">:</span> <span class="builtin_type">u64</span><span class="semicolon">;</span>
168-
<span class="macro default_library library unsafe">asm</span><span class="macro_bang">!</span><span class="parenthesis macro">(</span>
168+
<span class="macro default_library library">asm</span><span class="macro_bang">!</span><span class="parenthesis macro">(</span>
169169
<span class="string_literal macro">"mov </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal macro">, </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal macro">"</span><span class="comma macro">,</span>
170170
<span class="string_literal macro">"add </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal macro">, 5"</span><span class="comma macro">,</span>
171171
<span class="none macro">out</span><span class="parenthesis macro">(</span><span class="none macro">reg</span><span class="parenthesis macro">)</span> <span class="none macro">o</span><span class="comma macro">,</span>

‎src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/tests.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -657,10 +657,12 @@ const fn const_fn<const CONST_PARAM: ()>(const {}: const fn()) where (): const C
657657
&raw const ();
658658
const
659659
);
660+
().assoc_const_method();
660661
}
661662
trait ConstTrait {
662663
const ASSOC_CONST: () = ();
663664
const fn assoc_const_fn() {}
665+
const fn assoc_const_method(self) {}
664666
}
665667
impl const ConstTrait for () {
666668
const ASSOC_CONST: () = ();
@@ -1070,16 +1072,15 @@ fn test_block_mod_items() {
10701072
macro_rules! foo {
10711073
($foo:ident) => {
10721074
mod y {
1073-
struct $foo;
1075+
pub struct $foo;
10741076
}
10751077
};
10761078
}
10771079
fn main() {
10781080
foo!(Foo);
10791081
mod module {
1080-
// FIXME: IDE layer has this unresolved
10811082
foo!(Bar);
1082-
fn func() {
1083+
fn func(_: y::Bar) {
10831084
mod inner {
10841085
struct Innerest<const C: usize> { field: [(); {C}] }
10851086
}

‎src/tools/rust-analyzer/crates/rust-analyzer/src/integrated_benchmarks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fn integrated_completion_benchmark() {
160160
analysis.completions(&config, position, None).unwrap();
161161
}
162162

163-
let _g = crate::tracing::hprof::init("*");
163+
let _g = crate::tracing::hprof::init("*>10");
164164

165165
let completion_offset = {
166166
let _it = stdx::timeit("change");

0 commit comments

Comments
 (0)