android: gallium/util: fix u_debug_stack_android build

Submitted by Mauro Rossi on April 22, 2018, 11:11 a.m.

Details

Message ID 20180422111101.2353-1-issor.oruam@gmail.com
State New
Headers show
Series "android: gallium/util: fix u_debug_stack_android build" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Mauro Rossi April 22, 2018, 11:11 a.m.
Fix for build errors in src/gallium/auxiliary/util/u_debug_stack_android.cpp
error: cast to 'void *' from smaller integer type pid_t

Fixes: ff904978a1 ("gallium/util: Android backtrace support")

Cc: "18.1" <mesa-stable@lists.freedesktop.org>
---
 src/gallium/auxiliary/util/u_debug_stack_android.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/gallium/auxiliary/util/u_debug_stack_android.cpp b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
index b3d56aebe6..11e2d3962b 100644
--- a/src/gallium/auxiliary/util/u_debug_stack_android.cpp
+++ b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
@@ -49,10 +49,10 @@  debug_backtrace_capture(debug_stack_frame *mesa_backtrace,
       backtrace_table = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
                                                 _mesa_key_pointer_equal);
 
-   backtrace_entry = _mesa_hash_table_search(backtrace_table, (void*) tid);
+   backtrace_entry = _mesa_hash_table_search(backtrace_table, (void*)(uintptr_t) tid);
    if (!backtrace_entry) {
       backtrace = Backtrace::Create(getpid(), tid);
-      _mesa_hash_table_insert(backtrace_table, (void*) tid, backtrace);
+      _mesa_hash_table_insert(backtrace_table, (void*)(uintptr_t) tid, backtrace);
    } else {
       backtrace = (Backtrace *) backtrace_entry->data;
    }

Comments

On Sun, Apr 22, 2018 at 1:11 PM, Mauro Rossi <issor.oruam@gmail.com> wrote:
> Fix for build errors in src/gallium/auxiliary/util/u_debug_stack_android.cpp
> error: cast to 'void *' from smaller integer type pid_t
>
> Fixes: ff904978a1 ("gallium/util: Android backtrace support")
>
> Cc: "18.1" <mesa-stable@lists.freedesktop.org>
> ---
>  src/gallium/auxiliary/util/u_debug_stack_android.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/auxiliary/util/u_debug_stack_android.cpp b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
> index b3d56aebe6..11e2d3962b 100644
> --- a/src/gallium/auxiliary/util/u_debug_stack_android.cpp
> +++ b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
> @@ -49,10 +49,10 @@ debug_backtrace_capture(debug_stack_frame *mesa_backtrace,
>        backtrace_table = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
>                                                  _mesa_key_pointer_equal);
>
> -   backtrace_entry = _mesa_hash_table_search(backtrace_table, (void*) tid);
> +   backtrace_entry = _mesa_hash_table_search(backtrace_table, (void*)(uintptr_t) tid);
>     if (!backtrace_entry) {
>        backtrace = Backtrace::Create(getpid(), tid);
> -      _mesa_hash_table_insert(backtrace_table, (void*) tid, backtrace);
> +      _mesa_hash_table_insert(backtrace_table, (void*)(uintptr_t) tid, backtrace);
>     } else {
>        backtrace = (Backtrace *) backtrace_entry->data;
>     }
> --
> 2.14.1
>

Sorry, I'm doing ARMv7/32-bit builds so this slipped through.

Reviewed-By: Stefan Schake <stschake@gmail.com>

Thanks!
Hi there,

2018-04-22 15:36 GMT+02:00 Stefan Schake <stschake@gmail.com>:

> On Sun, Apr 22, 2018 at 1:11 PM, Mauro Rossi <issor.oruam@gmail.com>
> wrote:
> > Fix for build errors in src/gallium/auxiliary/util/u_
> debug_stack_android.cpp
> > error: cast to 'void *' from smaller integer type pid_t
> >
> > Fixes: ff904978a1 ("gallium/util: Android backtrace support")
> >
> > Cc: "18.1" <mesa-stable@lists.freedesktop.org>
> > ---
> >  src/gallium/auxiliary/util/u_debug_stack_android.cpp | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/gallium/auxiliary/util/u_debug_stack_android.cpp
> b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
> > index b3d56aebe6..11e2d3962b 100644
> > --- a/src/gallium/auxiliary/util/u_debug_stack_android.cpp
> > +++ b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
> > @@ -49,10 +49,10 @@ debug_backtrace_capture(debug_stack_frame
> *mesa_backtrace,
> >        backtrace_table = _mesa_hash_table_create(NULL,
> _mesa_hash_pointer,
> >
> _mesa_key_pointer_equal);
> >
> > -   backtrace_entry = _mesa_hash_table_search(backtrace_table, (void*)
> tid);
> > +   backtrace_entry = _mesa_hash_table_search(backtrace_table,
> (void*)(uintptr_t) tid);
> >     if (!backtrace_entry) {
> >        backtrace = Backtrace::Create(getpid(), tid);
> > -      _mesa_hash_table_insert(backtrace_table, (void*) tid, backtrace);
> > +      _mesa_hash_table_insert(backtrace_table, (void*)(uintptr_t) tid,
> backtrace);
> >     } else {
> >        backtrace = (Backtrace *) backtrace_entry->data;
> >     }
> > --
> > 2.14.1
> >
>
> Sorry, I'm doing ARMv7/32-bit builds so this slipped through.
>
> Reviewed-By: Stefan Schake <stschake@gmail.com>
>
> Thanks!
>

May I ask a second review by for intel x86 based platforms to Emil or other
developer in Cc: ?
Thanks

Mauro
A related note on this:

Seems this file (src/gallium/auxiliary/util/u_debug_stack_android.cpp)
doesn't make it into the tarballs (didn't for 18.1.0). Probably needs to be
added to Makefile.source and meson.build somewhere so that building the
tarball finds it. I checked for commits to both since 18.1.0 and saw
nothing, so I suspect it's still missing (though not tested).


On 1 June 2018 at 15:49, Mauro Rossi <issor.oruam@gmail.com> wrote:

> Hi there,
>
> 2018-04-22 15:36 GMT+02:00 Stefan Schake <stschake@gmail.com>:
>
>> On Sun, Apr 22, 2018 at 1:11 PM, Mauro Rossi <issor.oruam@gmail.com>
>> wrote:
>> > Fix for build errors in src/gallium/auxiliary/util/u_d
>> ebug_stack_android.cpp
>> > error: cast to 'void *' from smaller integer type pid_t
>> >
>> > Fixes: ff904978a1 ("gallium/util: Android backtrace support")
>> >
>> > Cc: "18.1" <mesa-stable@lists.freedesktop.org>
>> > ---
>> >  src/gallium/auxiliary/util/u_debug_stack_android.cpp | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/src/gallium/auxiliary/util/u_debug_stack_android.cpp
>> b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
>> > index b3d56aebe6..11e2d3962b 100644
>> > --- a/src/gallium/auxiliary/util/u_debug_stack_android.cpp
>> > +++ b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
>> > @@ -49,10 +49,10 @@ debug_backtrace_capture(debug_stack_frame
>> *mesa_backtrace,
>> >        backtrace_table = _mesa_hash_table_create(NULL,
>> _mesa_hash_pointer,
>> >
>> _mesa_key_pointer_equal);
>> >
>> > -   backtrace_entry = _mesa_hash_table_search(backtrace_table, (void*)
>> tid);
>> > +   backtrace_entry = _mesa_hash_table_search(backtrace_table,
>> (void*)(uintptr_t) tid);
>> >     if (!backtrace_entry) {
>> >        backtrace = Backtrace::Create(getpid(), tid);
>> > -      _mesa_hash_table_insert(backtrace_table, (void*) tid,
>> backtrace);
>> > +      _mesa_hash_table_insert(backtrace_table, (void*)(uintptr_t)
>> tid, backtrace);
>> >     } else {
>> >        backtrace = (Backtrace *) backtrace_entry->data;
>> >     }
>> > --
>> > 2.14.1
>> >
>>
>> Sorry, I'm doing ARMv7/32-bit builds so this slipped through.
>>
>> Reviewed-By: Stefan Schake <stschake@gmail.com>
>>
>> Thanks!
>>
>
> May I ask a second review by for intel x86 based platforms to Emil or
> other developer in Cc: ?
> Thanks
>
> Mauro
>
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
>