mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-02 15:15:50 +01:00
Dana Jansens
3689a3b3e4
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`.
44 lines
1.8 KiB
Plaintext
44 lines
1.8 KiB
Plaintext
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/facet_types.carbon
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/impl/lookup/import_error.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/impl/lookup/import_error.carbon
|
|
|
|
// --- fail_error_interface_z.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Z {
|
|
let X:! type;
|
|
}
|
|
|
|
// The value of .X is an error.
|
|
// CHECK:STDERR: fail_error_interface_z.carbon:[[@LINE+4]]:35: error: associated constant `.(Z.X)` given two different values `{}` and `()` [AssociatedConstantWithDifferentValues]
|
|
// CHECK:STDERR: final impl forall [T:! type] T as Z where .X = {} and .X = () {}
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
final impl forall [T:! type] T as Z where .X = {} and .X = () {}
|
|
|
|
// --- fail_import_error.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "error_interface_z";
|
|
|
|
fn F[U:! type](T:! Z) {
|
|
// The value of `.X` is an error. It should not crash though.
|
|
//
|
|
// CHECK:STDERR: fail_import_error.carbon:[[@LINE+7]]:16: error: cannot implicitly convert expression of type `()` to `T.(Z.X)` [ConversionFailure]
|
|
// CHECK:STDERR: let a: T.X = ();
|
|
// CHECK:STDERR: ^~
|
|
// CHECK:STDERR: fail_import_error.carbon:[[@LINE+4]]:16: note: type `()` does not implement interface `Core.ImplicitAs(T.(Z.X))` [MissingImplInMemberAccessNote]
|
|
// CHECK:STDERR: let a: T.X = ();
|
|
// CHECK:STDERR: ^~
|
|
// CHECK:STDERR:
|
|
let a: T.X = ();
|
|
}
|