rust-analyzer

diff --git a/crates/hir-expand/src/inert_attr_macro.rs b/crates/hir-expand/src/inert_attr_macro.rs
index ee15b1b5ce..5c25a55362 100644
--- a/crates/hir-expand/src/inert_attr_macro.rs
+++ b/crates/hir-expand/src/inert_attr_macro.rs

@@ -464,6 +464,9 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[

// Used by the `rustc::potential_query_instability` lint to warn methods which

// might not be stable during incremental compilation.

rustc_attr!(rustc_lint_query_instability, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE),

+ // Used by the `rustc::untracked_query_information` lint to warn methods which

+ // might break incremental compilation.

+ rustc_attr!(rustc_lint_untracked_query_information, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE),

// Used by the `rustc::untranslatable_diagnostic` and `rustc::diagnostic_outside_of_impl` lints

// to assist in changes to diagnostic APIs.

rustc_attr!(rustc_lint_diagnostics, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE),

diff --git a/crates/hir-ty/src/layout.rs b/crates/hir-ty/src/layout.rs
index 47cc2a2f1e..25362d23d5 100644
--- a/crates/hir-ty/src/layout.rs
+++ b/crates/hir-ty/src/layout.rs

@@ -1,13 +1,13 @@

//! Compute the binary representation of a type

-use std::{borrow::Cow, fmt};

+use std::fmt;

use base_db::salsa::Cycle;

use chalk_ir::{AdtId, FloatTy, IntTy, TyKind, UintTy};

use hir_def::{

layout::{

- Abi, FieldsShape, Float, Integer, LayoutCalculator, LayoutS, Primitive, ReprOptions,

- Scalar, Size, StructKind, TargetDataLayout, WrappingRange,

+ Abi, FieldsShape, Float, Integer, LayoutCalculator, LayoutCalculatorError, LayoutS,

+ Primitive, ReprOptions, Scalar, Size, StructKind, TargetDataLayout, WrappingRange,

LocalFieldId, StructId,

};

@@ -15,7 +15,6 @@ use la_arena::{Idx, RawIdx};

use rustc_abi::AddressSpace;

use rustc_index::{IndexSlice, IndexVec};

-use stdx::never;

use triomphe::Arc;

use crate::{

@@ -107,19 +106,24 @@ impl fmt::Display for LayoutError {

}

-struct LayoutCx<'a> {

- target: &'a TargetDataLayout,

+impl<F> From<LayoutCalculatorError<F>> for LayoutError {

+ fn from(err: LayoutCalculatorError<F>) -> Self {

+ match err {

+ LayoutCalculatorError::UnexpectedUnsized(_) | LayoutCalculatorError::EmptyUnion => {

+ LayoutError::Unknown

+ }

+ LayoutCalculatorError::SizeOverflow => LayoutError::SizeOverflow,

+ }

}

-impl<'a> LayoutCalculator for LayoutCx<'a> {

- type TargetDataLayoutRef = &'a TargetDataLayout;

- fn delayed_bug(&self, txt: impl Into<Cow<'static, str>>) {

- never!("{}", txt.into());

- }

+struct LayoutCx<'a> {

+ calc: LayoutCalculator<&'a TargetDataLayout>,

- fn current_data_layout(&self) -> &'a TargetDataLayout {

- self.target

+impl<'a> LayoutCx<'a> {

+ fn new(target: &'a TargetDataLayout) -> Self {

+ Self { calc: LayoutCalculator::new(target) }

}

@@ -205,8 +209,8 @@ pub fn layout_of_ty_query(

let Ok(target) = db.target_data_layout(krate) else {

return Err(LayoutError::TargetLayoutNotAvailable);

};

- let cx = LayoutCx { target: &target };

- let dl = cx.current_data_layout();

+ let dl = &*target;

+ let cx = LayoutCx::new(dl);

let ty = normalize(db, trait_env.clone(), ty);

let result = match ty.kind(Interner) {

TyKind::Adt(AdtId(def), subst) => {

@@ -281,7 +285,7 @@ pub fn layout_of_ty_query(

.collect::<Result<Vec<_>, _>>()?;

let fields = fields.iter().map(|it| &**it).collect::<Vec<_>>();

let fields = fields.iter().collect::<IndexVec<_, _>>();

- cx.univariant(dl, &fields, &ReprOptions::default(), kind).ok_or(LayoutError::Unknown)?

+ cx.calc.univariant(&fields, &ReprOptions::default(), kind)?

}

TyKind::Array(element, count) => {

let count = try_const_usize(db, count).ok_or(LayoutError::HasErrorConst)? as u64;

@@ -367,12 +371,12 @@ pub fn layout_of_ty_query(

};

// Effectively a (ptr, meta) tuple.

- cx.scalar_pair(data_ptr, metadata)

+ cx.calc.scalar_pair(data_ptr, metadata)

}

- TyKind::FnDef(_, _) => layout_of_unit(&cx, dl)?,

- TyKind::Never => cx.layout_of_never_type(),

+ TyKind::FnDef(_, _) => layout_of_unit(&cx)?,

+ TyKind::Never => cx.calc.layout_of_never_type(),

TyKind::Dyn(_) | TyKind::Foreign(_) => {

- let mut unit = layout_of_unit(&cx, dl)?;

+ let mut unit = layout_of_unit(&cx)?;

match &mut unit.abi {

Abi::Aggregate { sized } => *sized = false,

_ => return Err(LayoutError::Unknown),

@@ -414,8 +418,7 @@ pub fn layout_of_ty_query(

.collect::<Result<Vec<_>, _>>()?;

let fields = fields.iter().map(|it| &**it).collect::<Vec<_>>();

let fields = fields.iter().collect::<IndexVec<_, _>>();

- cx.univariant(dl, &fields, &ReprOptions::default(), StructKind::AlwaysSized)

- .ok_or(LayoutError::Unknown)?

+ cx.calc.univariant(&fields, &ReprOptions::default(), StructKind::AlwaysSized)?

}

TyKind::Coroutine(_, _) | TyKind::CoroutineWitness(_, _) => {

return Err(LayoutError::NotImplemented)

@@ -447,14 +450,14 @@ pub fn layout_of_ty_recover(

Err(LayoutError::RecursiveTypeWithoutIndirection)

}

-fn layout_of_unit(cx: &LayoutCx<'_>, dl: &TargetDataLayout) -> Result<Layout, LayoutError> {

- cx.univariant::<RustcFieldIdx, RustcEnumVariantIdx, &&Layout>(

- dl,

- IndexSlice::empty(),

- &ReprOptions::default(),

- StructKind::AlwaysSized,

- )

- .ok_or(LayoutError::Unknown)

+fn layout_of_unit(cx: &LayoutCx<'_>) -> Result<Layout, LayoutError> {

+ cx.calc

+ .univariant::<RustcFieldIdx, RustcEnumVariantIdx, &&Layout>(

+ IndexSlice::empty(),

+ &ReprOptions::default(),

+ StructKind::AlwaysSized,

+ )

+ .map_err(Into::into)

}

fn struct_tail_erasing_lifetimes(db: &dyn HirDatabase, pointee: Ty) -> Ty {

diff --git a/crates/hir-ty/src/layout/adt.rs b/crates/hir-ty/src/layout/adt.rs
index 3463e69097..a060ebfe6b 100644
--- a/crates/hir-ty/src/layout/adt.rs
+++ b/crates/hir-ty/src/layout/adt.rs

@@ -5,7 +5,7 @@ use std::{cmp, ops::Bound};

use base_db::salsa::Cycle;

use hir_def::{

data::adt::VariantData,

- layout::{Integer, LayoutCalculator, ReprOptions, TargetDataLayout},

+ layout::{Integer, ReprOptions, TargetDataLayout},

AdtId, VariantId,

};

use intern::sym;

@@ -36,8 +36,8 @@ pub fn layout_of_adt_query(

let Ok(target) = db.target_data_layout(krate) else {

return Err(LayoutError::TargetLayoutNotAvailable);

};

- let cx = LayoutCx { target: &target };

- let dl = cx.current_data_layout();

+ let dl = &*target;

+ let cx = LayoutCx::new(dl);

let handle_variant = |def: VariantId, var: &VariantData| {

var.fields()

.iter()

@@ -73,9 +73,9 @@ pub fn layout_of_adt_query(

.collect::<SmallVec<[_; 1]>>();

let variants = variants.iter().map(|it| it.iter().collect()).collect::<IndexVec<_, _>>();

let result = if matches!(def, AdtId::UnionId(..)) {

- cx.layout_of_union(&repr, &variants).ok_or(LayoutError::Unknown)?

+ cx.calc.layout_of_union(&repr, &variants)?

} else {

- cx.layout_of_struct_or_enum(

+ cx.calc.layout_of_struct_or_enum(

&repr,

&variants,

matches!(def, AdtId::EnumId(..)),

@@ -103,8 +103,7 @@ pub fn layout_of_adt_query(

.next()

.and_then(|it| it.iter().last().map(|it| !it.is_unsized()))

.unwrap_or(true),

- )

- .ok_or(LayoutError::SizeOverflow)?

+ )?

};

Ok(Arc::new(result))

}

diff --git a/crates/hir-ty/src/lib.rs b/crates/hir-ty/src/lib.rs
index 79ee9e9787..5ed41b99ba 100644
--- a/crates/hir-ty/src/lib.rs
+++ b/crates/hir-ty/src/lib.rs

@@ -379,6 +379,7 @@ pub enum FnAbi {

AvrNonBlockingInterrupt,

CCmseNonsecureCall,

+ CCmseNonsecureEntry,

CDecl,

CDeclUnwind,

CUnwind,

@@ -436,6 +437,7 @@ impl FnAbi {

s if *s == sym::avr_dash_interrupt => FnAbi::AvrInterrupt,

s if *s == sym::avr_dash_non_dash_blocking_dash_interrupt => FnAbi::AvrNonBlockingInterrupt,

s if *s == sym::C_dash_cmse_dash_nonsecure_dash_call => FnAbi::CCmseNonsecureCall,

+ s if *s == sym::C_dash_cmse_dash_nonsecure_dash_entry => FnAbi::CCmseNonsecureEntry,

s if *s == sym::C_dash_unwind => FnAbi::CUnwind,

s if *s == sym::C => FnAbi::C,

s if *s == sym::cdecl_dash_unwind => FnAbi::CDeclUnwind,

@@ -479,6 +481,7 @@ impl FnAbi {

FnAbi::AvrNonBlockingInterrupt => "avr-non-blocking-interrupt",

FnAbi::C => "C",

FnAbi::CCmseNonsecureCall => "C-cmse-nonsecure-call",

+ FnAbi::CCmseNonsecureEntry => "C-cmse-nonsecure-entry",

FnAbi::CDecl => "C-decl",

FnAbi::CDeclUnwind => "cdecl-unwind",

FnAbi::CUnwind => "C-unwind",

diff --git a/crates/ide-completion/src/completions/extern_abi.rs b/crates/ide-completion/src/completions/extern_abi.rs
index 1a06e0a3a0..b0e417e6b3 100644
--- a/crates/ide-completion/src/completions/extern_abi.rs
+++ b/crates/ide-completion/src/completions/extern_abi.rs

@@ -32,6 +32,7 @@ const SUPPORTED_CALLING_CONVENTIONS: &[&str] = &[

"riscv-interrupt-m",

"riscv-interrupt-s",

"C-cmse-nonsecure-call",

+ "C-cmse-nonsecure-entry",

"wasm",

"system",

"system-unwind",

diff --git a/crates/intern/src/symbol/symbols.rs b/crates/intern/src/symbol/symbols.rs
index 60070b8850..a62cbc7fb2 100644
--- a/crates/intern/src/symbol/symbols.rs
+++ b/crates/intern/src/symbol/symbols.rs

@@ -94,6 +94,7 @@ define_symbols! {

avr_dash_interrupt = "avr-interrupt",

avr_dash_non_dash_blocking_dash_interrupt = "avr-non-blocking-interrupt",

C_dash_cmse_dash_nonsecure_dash_call = "C-cmse-nonsecure-call",

+ C_dash_cmse_dash_nonsecure_dash_entry = "C-cmse-nonsecure-entry",

C_dash_unwind = "C-unwind",

cdecl_dash_unwind = "cdecl-unwind",

fastcall_dash_unwind = "fastcall-unwind",

diff --git a/crates/parser/src/lexed_str.rs b/crates/parser/src/lexed_str.rs
index ff924830ae..3590486bd2 100644
--- a/crates/parser/src/lexed_str.rs
+++ b/crates/parser/src/lexed_str.rs

@@ -198,6 +198,13 @@ impl<'a> Converter<'a> {

}

LIFETIME_IDENT

}

+ rustc_lexer::TokenKind::UnknownPrefixLifetime => {

+ err = "Unknown lifetime prefix";

+ LIFETIME_IDENT

+ }

+ rustc_lexer::TokenKind::RawLifetime => {

+ LIFETIME_IDENT

+ }

rustc_lexer::TokenKind::Semi => T![;],

rustc_lexer::TokenKind::Comma => T![,],