diff options
| author | Rich Kadel <richkadel@google.com> | 2021-05-11 20:56:23 -0700 |
|---|---|---|
| committer | Rich Kadel <richkadel@google.com> | 2021-05-12 20:27:07 -0700 |
| commit | aed8ef5a4d81bb66917ca31a589d5922c9bcf065 (patch) | |
| tree | 5c31d374aa6e077cd28c98f23fd8a7a29baa19ca /compiler/rustc_codegen_ssa/src/mir | |
| parent | 31f523ff94247fd030473979782dda90923da1ef (diff) | |
| download | rust-aed8ef5a4d81bb66917ca31a589d5922c9bcf065.tar.gz rust-aed8ef5a4d81bb66917ca31a589d5922c9bcf065.zip | |
`coverageinfo` query needs to use the same MIR as codegen
I ran into an error trying to fix dead block coverage and realized the `coverageinfo` query is getting a different MIR compared to the codegenned MIR, which can sometimes be a problem during mapgen. I changed that query to use the `InstandeDef` (which includes the generic parameter substitutions, prosibly specific to const params) instead of the `DefId` (without unknown/default const substitutions).
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/mir')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs b/compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs index 621ec0519c9..a283bf1de76 100644 --- a/compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs +++ b/compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs @@ -31,7 +31,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { bx.add_coverage_counter(instance, id, code_region); } - let coverageinfo = bx.tcx().coverageinfo(instance.def_id()); + let coverageinfo = bx.tcx().coverageinfo(instance.def); let fn_name = bx.get_pgo_func_name_var(instance); let hash = bx.const_u64(function_source_hash); |
