diff options
| author | bors <bors@rust-lang.org> | 2019-05-02 04:47:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-02 04:47:36 +0000 |
| commit | 92b5e20ad59b183a2e6cd79423f54b8aa7ac9cbf (patch) | |
| tree | 6506cb8294055f817bc903b0f14d9b08a2c29592 /src/librustc_codegen_ssa | |
| parent | 767f59462663fbc55a69d39fc5e1f7f83b6fb37d (diff) | |
| parent | a68ed060bdab2d4c5d36062cda24f89d22488271 (diff) | |
| download | rust-92b5e20ad59b183a2e6cd79423f54b8aa7ac9cbf.tar.gz rust-92b5e20ad59b183a2e6cd79423f54b8aa7ac9cbf.zip | |
Auto merge of #59008 - varkor:const-generics-infer, r=eddyb
Add const generics to infer (and transitive dependencies) Split out from #53645. This work is a collaborative effort with @yodaldevoid. There are a number of stubs. These are mainly to ensure we don't overlook them when completing the implementation, but are not necessary for the initial implementation. We plan to address these in follow up PRs. r? @eddyb / @nikomatsakis
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/mir/operand.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_codegen_ssa/mir/operand.rs b/src/librustc_codegen_ssa/mir/operand.rs index c2b1021f816..3b8e5b44953 100644 --- a/src/librustc_codegen_ssa/mir/operand.rs +++ b/src/librustc_codegen_ssa/mir/operand.rs @@ -79,6 +79,7 @@ impl<'a, 'tcx: 'a, V: CodegenObject> OperandRef<'tcx, V> { ConstValue::Unevaluated(..) => bug!("unevaluated constant in `OperandRef::from_const`"), ConstValue::Param(_) => bug!("encountered a ConstValue::Param in codegen"), ConstValue::Infer(_) => bug!("encountered a ConstValue::Infer in codegen"), + ConstValue::Placeholder(_) => bug!("encountered a ConstValue::Placeholder in codegen"), ConstValue::Scalar(x) => { let scalar = match layout.abi { layout::Abi::Scalar(ref x) => x, |