Skip to content

Use DeclEngine::insert_modified instead of replace #7717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ironcev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use DeclEngine::insert_modified instead of replace #7717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions sway-core/src/decl_engine/id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ impl SubstTypes for DeclId<TyFunctionDecl> {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(self)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(*self, decl);
*self = *decl_engine.insert_modified(decl, *self).id();
HasChanges::Yes
} else {
HasChanges::No
Expand All @@ -160,7 +160,7 @@ impl SubstTypes for DeclId<TyTraitDecl> {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(self)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(*self, decl);
*self = *decl_engine.insert_modified(decl, *self).id();
HasChanges::Yes
} else {
HasChanges::No
Expand All @@ -172,7 +172,7 @@ impl SubstTypes for DeclId<TyTraitFn> {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(self)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(*self, decl);
*self = *decl_engine.insert_modified(decl, *self).id();
HasChanges::Yes
} else {
HasChanges::No
Expand All @@ -184,7 +184,7 @@ impl SubstTypes for DeclId<TyImplSelfOrTrait> {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(self)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(*self, decl);
*self = *decl_engine.insert_modified(decl, *self).id();
HasChanges::Yes
} else {
HasChanges::No
Expand All @@ -196,7 +196,7 @@ impl SubstTypes for DeclId<TyStructDecl> {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(self)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(*self, decl);
*self = *decl_engine.insert_modified(decl, *self).id();
HasChanges::Yes
} else {
HasChanges::No
Expand All @@ -208,7 +208,7 @@ impl SubstTypes for DeclId<TyEnumDecl> {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(self)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(*self, decl);
*self = *decl_engine.insert_modified(decl, *self).id();
HasChanges::Yes
} else {
HasChanges::No
Expand All @@ -220,7 +220,7 @@ impl SubstTypes for DeclId<TyTypeAliasDecl> {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(self)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(*self, decl);
*self = *decl_engine.insert_modified(decl, *self).id();
HasChanges::Yes
} else {
HasChanges::No
Expand All @@ -233,23 +233,14 @@ impl SubstTypes for DeclId<TyTraitType> {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(self)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(*self, decl);
*self = *decl_engine.insert_modified(decl, *self).id();
HasChanges::Yes
} else {
HasChanges::No
}
}
}

// This implementation deviates from all other DeclId<...> implementations.
// For more, see https://github.com/FuelLabs/sway/pull/7440#discussion_r2428833840.
// A better solution will be implemented in the future.
//
// TL;DR:
// When a constant is declared inside a function, its value is shared by every
// “version” of that function—that is, by all monomorphizations. If we “replace” the
// constant, as other implementations do, we would change its value in *every* version,
// which is incorrect.
impl SubstTypes for DeclId<TyConstantDecl> {
fn subst_inner(&mut self, ctx: &SubstTypesContext) -> HasChanges {
let decl_engine = ctx.engines.de();
Expand Down
5 changes: 3 additions & 2 deletions sway-core/src/decl_engine/ref.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,14 @@ impl<I> Spanned for DeclRef<I> {
impl<T> SubstTypes for DeclRef<DeclId<T>>
where
DeclEngine: DeclEngineIndex<T>,
T: Named + Spanned + SubstTypes + Clone,
DeclEngine: DeclEngineInsert<T>,
T: Named + Spanned + SubstTypes + Clone + TyDeclParsedType,
{
fn subst_inner(&mut self, ctx: &SubstTypesContext) -> HasChanges {
let decl_engine = ctx.engines.de();
let mut decl = (*decl_engine.get(&self.id)).clone();
if decl.subst(ctx).has_changes() {
decl_engine.replace(self.id, decl);
*self = decl_engine.insert_modified(decl, self.id);
HasChanges::Yes
} else {
HasChanges::No
Expand Down
2 changes: 1 addition & 1 deletion sway-core/src/language/ty/expression/expression_variant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ impl ReplaceDecls for TyExpressionVariant {
.replace_decls(&inner_decl_mapping, handler, ctx)?
.has_changes()
{
decl_engine.replace(*fn_ref.id(), method);
*fn_ref = decl_engine.insert_modified(method, *fn_ref.id());
Comment thread
ironcev marked this conversation as resolved.
Comment thread
ironcev marked this conversation as resolved.
has_changes = HasChanges::Yes;
}

Expand Down
Loading