Skip to content

Commit

Permalink
ok to NOT have const-attr/info for integral consts
Browse files Browse the repository at this point in the history
  • Loading branch information
ranjitjhala committed Dec 12, 2024
1 parent 180bde5 commit 366f071
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 8 additions & 6 deletions crates/flux-desugar/src/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,15 @@ impl<'genv, 'tcx> CrateResolver<'genv, 'tcx> {
}

fn resolve_constant(&mut self, owner_id: MaybeExternId<OwnerId>) -> Result {
let constant = &self.specs.constants[&owner_id.local_id()];
ItemResolver::run(self, owner_id, |item_resolver| {
item_resolver.visit_constant(constant);
})?;
RefinementResolver::resolve_constant(self, constant)
if let Some(constant) = self.specs.constants.get(&owner_id.local_id()) {
ItemResolver::run(self, owner_id, |item_resolver| {
item_resolver.visit_constant(constant);
})?;
RefinementResolver::resolve_constant(self, constant)?;
}
Ok(())
}

fn resolve_fn_sig(&mut self, owner_id: MaybeExternId<OwnerId>) -> Result {
if let Some(fn_sig) = &self.specs.fn_sigs[&owner_id.local_id()].fn_sig {
ItemResolver::run(self, owner_id, |item_resolver| {
Expand Down
8 changes: 3 additions & 5 deletions crates/flux-driver/src/collector/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,9 @@ impl<'a, 'tcx> SpecCollector<'a, 'tcx> {
}

fn parse_constant_spec(&mut self, owner_id: OwnerId, mut attrs: FluxAttrs) -> Result {
let span = self.tcx.source_span(owner_id);
let constant = attrs
.constant()
.ok_or_else(|| self.errors.emit(errors::InvalidAttr { span }))?;
self.specs.constants.insert(owner_id, constant);
if let Some(constant) = attrs.constant() {
self.specs.constants.insert(owner_id, constant);
}
Ok(())
}

Expand Down

0 comments on commit 366f071

Please sign in to comment.