From: Philip Herron <philip.her...@embecosm.com>
Statics can be assigned to a block expression meaning they need to behave
similarly to constant items.
gcc/rust/ChangeLog:
* typecheck/rust-hir-type-check-toplevel.cc (TypeCheckTopLevel::visit):
Make static items behave more similarly to const items.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/rust/typecheck/rust-hir-type-check-toplevel.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcc/rust/typecheck/rust-hir-type-check-toplevel.cc
b/gcc/rust/typecheck/rust-hir-type-check-toplevel.cc
index b0ee292df10..594e527fdcf 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-toplevel.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-toplevel.cc
@@ -261,11 +261,11 @@ TypeCheckTopLevel::visit (HIR::StaticItem &var)
TyTy::BaseType *expr_type = TypeCheckExpr::Resolve (var.get_expr ());
TyTy::BaseType *unified
- = unify_site (var.get_mappings ().get_hirid (),
- TyTy::TyWithLocation (type, var.get_type ()->get_locus ()),
- TyTy::TyWithLocation (expr_type,
- var.get_expr ()->get_locus ()),
- var.get_locus ());
+ = coercion_site (var.get_mappings ().get_hirid (),
+ TyTy::TyWithLocation (type, var.get_type ()->get_locus ()),
+ TyTy::TyWithLocation (expr_type,
+ var.get_expr ()->get_locus ()),
+ var.get_locus ());
context->insert_type (var.get_mappings (), unified);
}
--
2.39.1
