diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-25 19:53:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-25 19:53:22 +0200 |
| commit | d6d5581d5fba846c8476ad4d593da662306765d7 (patch) | |
| tree | 7a864e15d2c5007b7c3298487a59f11f15c55c75 /mesalib/src/util | |
| parent | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (diff) | |
| download | vcxsrv-d6d5581d5fba846c8476ad4d593da662306765d7.tar.gz vcxsrv-d6d5581d5fba846c8476ad4d593da662306765d7.tar.bz2 vcxsrv-d6d5581d5fba846c8476ad4d593da662306765d7.zip | |
libXft mesa xserver pixman xkeyboard-config git update 25 Oct 2014
xserver commit 16a32c53f6e9ad1f3284d4596edfa33e9efb740e
xkeyboard-config commit 0d4c3d9d891536aa1ec4f1fff5e3df51cfd2718d
pixman commit 594e6a6c93e92fcfb495e987aec5617f6c37f467
libXft commit e8a83226bc10afb587f6f34daac44d2ef809c85e
mesa commit 13862812dc910a4ef57cb72cb9fe777ce3c14515
Diffstat (limited to 'mesalib/src/util')
| -rw-r--r-- | mesalib/src/util/macros.h | 14 | ||||
| -rw-r--r-- | mesalib/src/util/register_allocate.c | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/mesalib/src/util/macros.h b/mesalib/src/util/macros.h index 40ebf02da..ff37a7d63 100644 --- a/mesalib/src/util/macros.h +++ b/mesalib/src/util/macros.h @@ -75,6 +75,20 @@ do { \ #define unreachable(str) #endif +/** + * Assume macro. Useful for expressing our assumptions to the compiler, + * typically for purposes of silencing warnings. + */ +#ifdef HAVE___BUILTIN_UNREACHABLE +#define assume(expr) ((expr) ? ((void) 0) \ + : (assert(!"assumption failed"), \ + __builtin_unreachable())) +#elif _MSC_VER >= 1200 +#define assume(expr) __assume(expr) +#else +#define assume(expr) assert(expr) +#endif + #ifdef HAVE_FUNC_ATTRIBUTE_FLATTEN #define FLATTEN __attribute__((__flatten__)) #else diff --git a/mesalib/src/util/register_allocate.c b/mesalib/src/util/register_allocate.c index afab9ddd3..6cf7ce721 100644 --- a/mesalib/src/util/register_allocate.c +++ b/mesalib/src/util/register_allocate.c @@ -335,7 +335,7 @@ ra_set_finalize(struct ra_regs *regs, unsigned int **q_values) for (i = 0; i < regs->regs[rc].num_conflicts; i++) { unsigned int rb = regs->regs[rc].conflict_list[i]; - if (BITSET_TEST(regs->classes[b]->regs, rb)) + if (reg_belongs_to_class(rb, regs->classes[b])) conflicts++; } max_conflicts = MAX2(max_conflicts, conflicts); |