intel/compiler: Nest definition of live variables block_data structures
When this commit was originally written, these two structures had the
exact same name. Subsequently in commit 12a8f2616a
(intel/compiler:
Fix C++ one definition rule violations) they were renamed.
Original commit message:
> These two structures have exactly the same name which prevents the two
> files from being included at the same time and could cause serious
> trouble in the future if it ever leads to a (silent) violation of the
> C++ one definition rule.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4012>
This commit is contained in:

committed by
Matt Turner

parent
310aef6b59
commit
06c5c49646
@@ -33,34 +33,34 @@
|
||||
|
||||
namespace brw {
|
||||
|
||||
struct vec4_block_data {
|
||||
/**
|
||||
* Which variables are defined before being used in the block.
|
||||
*
|
||||
* Note that for our purposes, "defined" means unconditionally, completely
|
||||
* defined.
|
||||
*/
|
||||
BITSET_WORD *def;
|
||||
|
||||
/**
|
||||
* Which variables are used before being defined in the block.
|
||||
*/
|
||||
BITSET_WORD *use;
|
||||
|
||||
/** Which defs reach the entry point of the block. */
|
||||
BITSET_WORD *livein;
|
||||
|
||||
/** Which defs reach the exit point of the block. */
|
||||
BITSET_WORD *liveout;
|
||||
|
||||
BITSET_WORD flag_def[1];
|
||||
BITSET_WORD flag_use[1];
|
||||
BITSET_WORD flag_livein[1];
|
||||
BITSET_WORD flag_liveout[1];
|
||||
};
|
||||
|
||||
class vec4_live_variables {
|
||||
public:
|
||||
struct block_data {
|
||||
/**
|
||||
* Which variables are defined before being used in the block.
|
||||
*
|
||||
* Note that for our purposes, "defined" means unconditionally, completely
|
||||
* defined.
|
||||
*/
|
||||
BITSET_WORD *def;
|
||||
|
||||
/**
|
||||
* Which variables are used before being defined in the block.
|
||||
*/
|
||||
BITSET_WORD *use;
|
||||
|
||||
/** Which defs reach the entry point of the block. */
|
||||
BITSET_WORD *livein;
|
||||
|
||||
/** Which defs reach the exit point of the block. */
|
||||
BITSET_WORD *liveout;
|
||||
|
||||
BITSET_WORD flag_def[1];
|
||||
BITSET_WORD flag_use[1];
|
||||
BITSET_WORD flag_livein[1];
|
||||
BITSET_WORD flag_liveout[1];
|
||||
};
|
||||
|
||||
DECLARE_RALLOC_CXX_OPERATORS(vec4_live_variables)
|
||||
|
||||
vec4_live_variables(const simple_allocator &alloc, cfg_t *cfg);
|
||||
@@ -70,7 +70,7 @@ public:
|
||||
int bitset_words;
|
||||
|
||||
/** Per-basic-block information on live variables */
|
||||
struct vec4_block_data *block_data;
|
||||
struct block_data *block_data;
|
||||
|
||||
protected:
|
||||
void setup_def_use();
|
||||
|
Reference in New Issue
Block a user