mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 19:18:13 +00:00
The `BitAnd` operation combines two `FacetTypeInfo` structures by concatenating their lists, but did not apply the current specific to the instructions in the `FacetTypeInfo` as it forgot to go through `GetContantFacetTypeInfo`. `WhereExpr` handling duplicates a lot of the logic in `GetConstantFacetTypeInfo` by calling `GetConstantValue` on things, instead of calling `GetConstantFacetTypeInfo` on the `FacetTypeInfo` it constructs. This meant it also needed to call `GetConstantFacetTypeInfo` on the base facet type, and on any `impls`-requirement facet types before merging their values together into a single `FacetTypeInfo`. Instead, make `WhereExpr` more like `BitAnd`, and have it concatenate things together as-is to construct a `FacetTypeInfo`. Then call `GetConstantFacetTypeInfo` to canonicalize it and return a constant value referring to it. In `GetConstantFacetTypeInfo` we fix a crasher by propagating errors inserted into the `FacetTypeInfo` out to the `Phase` so that the resulting instruction depending on the `FacetTypeInfo` is not resolved to a constant value with errors inside it. A test is added for this, which was crashing on import of the `FacetType` with an error within from the imported `impl` decl. This refactoring gives us three benefits: * There's now only a single place that does `ResolveRewriteConstraintsAndCanonicalize`, which is inside `GetConstantFacetTypeInfo`. This makes the inputs/behaviour of `ResolveRewriteConstraintsAndCanonicalize` more consistent. * There's now only a single place that updates the instructions in `FacetTypeInfo` constraints with new constant values, so that changes that rely on observing and interacting with that code only need to be written in a single place. This will avoid duplicating logic in https://github.com/carbon-language/carbon-lang/pull/5644. * This will make it easier to move `WhereExpr` handling to a `EvalConstantInst` function, as it no longer directly depends on `GetConstantValue()` from `eval.cpp`.