Mesa (master): aco: fix copy of uninitialized boolean

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c11c4d8d4c1c862883652b24c26365e9772d8e54
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c11c4d8d4c1c862883652b24c26365e9772d8e54

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri Apr  3 17:44:47 2020 +0100

aco: fix copy of uninitialized boolean

This should be harmless but UBSan seems to complain.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6013>

---

 src/amd/compiler/aco_insert_waitcnt.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index 196b45fbb75..aedcad1b573 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -293,7 +293,8 @@ struct wait_ctx {
              max_exp_cnt(6),
              max_lgkm_cnt(program_->chip_class >= GFX10 ? 62 : 14),
              max_vs_cnt(program_->chip_class >= GFX10 ? 62 : 0),
-             unordered_events(event_smem | (program_->chip_class < GFX10 ? event_flat : 0)) {}
+             unordered_events(event_smem | (program_->chip_class < GFX10 ? event_flat : 0)),
+             collect_statistics(program_->collect_statistics) {}
 
    bool join(const wait_ctx* other, bool logical)
    {
@@ -847,8 +848,6 @@ void handle_block(Program *program, Block& block, wait_ctx& ctx)
 
    wait_imm queued_imm;
 
-   ctx.collect_statistics = program->collect_statistics;
-
    for (aco_ptr<Instruction>& instr : block.instructions) {
       bool is_wait = !parse_wait_instr(ctx, instr.get()).empty();