From: Matt Turner <mattst88@gmail.com>
Date: Mon, 28 Nov 2016 21:24:04 +0000 (-0800)
Subject: i965/cfg: Initialize cfg_t::cycle_count.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca9e30e002db87946e93fe58118a740e6438d342;p=mesa.git

i965/cfg: Initialize cfg_t::cycle_count.

This reverts commit b4001af1744a02f472bd1204458662088307981b.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_cfg.cpp b/src/mesa/drivers/dri/i965/brw_cfg.cpp
index 53b32be510a..ff2cf6affad 100644
--- a/src/mesa/drivers/dri/i965/brw_cfg.cpp
+++ b/src/mesa/drivers/dri/i965/brw_cfg.cpp
@@ -158,6 +158,7 @@ cfg_t::cfg_t(exec_list *instructions)
    blocks = NULL;
    num_blocks = 0;
    idom_dirty = true;
+   cycle_count = 0;
 
    bblock_t *cur = NULL;
    int ip = 0;
diff --git a/src/mesa/drivers/dri/i965/brw_cfg.h b/src/mesa/drivers/dri/i965/brw_cfg.h
index ec21ae74c89..b8af40f725f 100644
--- a/src/mesa/drivers/dri/i965/brw_cfg.h
+++ b/src/mesa/drivers/dri/i965/brw_cfg.h
@@ -274,7 +274,7 @@ bblock_t::last_non_control_flow_inst()
 
 struct cfg_t {
 #ifdef __cplusplus
-   DECLARE_RZALLOC_CXX_OPERATORS(cfg_t)
+   DECLARE_RALLOC_CXX_OPERATORS(cfg_t)
 
    cfg_t(exec_list *instructions);
    ~cfg_t();