Merge lp:~afrantzis/mir/fix-gcc-4.9-build into lp:mir
| Status: | Merged |
|---|---|
| Approved by: | Kevin DuBois |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 1757 |
| Proposed branch: | lp:~afrantzis/mir/fix-gcc-4.9-build |
| Merge into: | lp:mir |
| Diff against target: |
34 lines (+3/-3) 2 files modified
src/shared/graphics/android/syncfence.cpp (+1/-1) tests/unit-tests/graphics/android/test_sync_fence.cpp (+2/-2) |
| To merge this branch: | bzr merge lp:~afrantzis/mir/fix-gcc-4.9-build |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kevin DuBois (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Alan Griffiths | Approve | ||
|
Review via email:
|
|||
Commit message
android,tests: Fix g++ 4.9 build
It seems that g++-4.9 has become more aggressive about constant folding of
expressions that use sizeof(), thus triggering warnings/errors related to
constant overflows that didn't occur with g++-4.8.
For example, g++-4.8 warns about overflowing i3, but not i4, whereas g++-4.9
warns about both i3 and i4:
#define VALUE1 0x70000000UL
#define VALUE2 (VALUE1 >> sizeof(unsigned char))
#define VALUE3 0x80000000UL
#define VALUE4 (VALUE1 << sizeof(unsigned char))
int main()
{
int i1 = VALUE1;
int i2 = VALUE2;
int i3 = VALUE3;
int i4 = VALUE4;
}
This affects our ioctl() wrapper calls because we use 'int' for the request
parameter, whereas the request numbers produced by the kernel macros (using
sizeof() in the calculation) are 'unsigned long'. This MP fixes the problem by
casting the request numbers to 'int', which is a safe conversion since the
request numbers are constrained to 32 bits by design.
Note that we don't have a problem with all ioctl request numbers, although they
are produced by the same set of macros, because almost all of them don't have
the high bit set (like VALUE2 above) and don't trigger the overflow error. The
one we have a problem with, SYNC_IOC_MERGE, has the high bit set (like VALUE4
above).
Also note that the glibc ioctl() function signature uses 'unsigned long'
instead of 'int' for the request number. So, alternatively, we could fix the
problem by changing our wrappers to use 'unsigned long', too. However, the
glibc signature goes against POSIX and there have been discussions about
switching it back. See https:/
Description of the change
android,tests: Fix g++ 4.9 build
It seems that g++-4.9 has become more aggressive about constant folding of
expressions that use sizeof(), thus triggering warnings/errors related to
constant overflows that didn't occur with g++-4.8.
For example, g++-4.8 warns about overflowing i3, but not i4, whereas g++-4.9
warns about both i3 and i4:
#define VALUE1 0x70000000UL
#define VALUE2 (VALUE1 >> sizeof(unsigned char))
#define VALUE3 0x80000000UL
#define VALUE4 (VALUE1 << sizeof(unsigned char))
int main()
{
int i1 = VALUE1;
int i2 = VALUE2;
int i3 = VALUE3;
int i4 = VALUE4;
}
This affects our ioctl() wrapper calls because we use 'int' for the request
parameter, whereas the request numbers produced by the kernel macros (using
sizeof() in the calculation) are 'unsigned long'. This MP fixes the problem by
casting the request numbers to 'int', which is a safe conversion since the
request numbers are constrained to 32 bits by design.
Note that we don't have a problem with all ioctl request numbers, although they
are produced by the same set of macros, because almost all of them don't have
the high bit set (like VALUE2 above) and don't trigger the overflow error. The
one we have a problem with, SYNC_IOC_MERGE, has the high bit set (like VALUE4
above).
Also note that the glibc ioctl() function signature uses 'unsigned long'
instead of 'int' for the request number. So, alternatively, we could fix the
problem by changing our wrappers to use 'unsigned long', too. However, the
glibc signature goes against POSIX and there have been discussions about
switching it back. See https:/
| Alexandros Frantzis (afrantzis) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
http://