Attachment 127868 Details for Bug 98595 – proposed fix (or work-around)

[patch] proposed fix (or work-around)

0001-ralloc-don-t-use-ralloc_set_destructor-for-linear-al.patch (text/plain), 2.77 KB, created by Brian Paul on 2016-11-09 18:03:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2016-11-09 18:03:25 UTC

Size: 2.77 KB

patch

obsolete

>From 7f55693f64811e2a8b5f61a3d04a49b616ca36d6 Mon Sep 17 00:00:00 2001
>From: Brian Paul <brianp@vmware.com>
>Date: Wed, 9 Nov 2016 10:58:59 -0700
>Subject: [PATCH] ralloc: don't use ralloc_set_destructor() for linear
> allocations
>
>With older gcc versions and MSVC we were using _ralloc_destructor() in
>with the linear allocator.  That led to a failed canary assertion.
>
>This patch prevents _ralloc_destructor() from being used in those cases.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98595
>---
> src/util/ralloc.h | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/src/util/ralloc.h b/src/util/ralloc.h
>index 3e2d342..f28d9c4 100644
>--- a/src/util/ralloc.h
>+++ b/src/util/ralloc.h
>@@ -417,7 +417,7 @@ bool ralloc_vasprintf_append(char **str, const char *fmt, va_list args);
>  *
>  * which is more idiomatic in C++ than calling ralloc.
>  */
>-#define DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(TYPE, ALLOC_FUNC)           \
>+#define DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(TYPE, ALLOC_FUNC, USE_DESTRUCTOR) \
> private:                                                                 \
>    static void _ralloc_destructor(void *p)                               \
>    {                                                                     \
>@@ -428,7 +428,7 @@ public:                                                                  \
>    {                                                                     \
>       void *p = ALLOC_FUNC(mem_ctx, size);                               \
>       assert(p != NULL);                                                 \
>-      if (!HAS_TRIVIAL_DESTRUCTOR(TYPE))                                 \
>+      if (USE_DESTRUCTOR && !HAS_TRIVIAL_DESTRUCTOR(TYPE))               \
>          ralloc_set_destructor(p, _ralloc_destructor);                   \
>       return p;                                                          \
>    }                                                                     \
>@@ -445,16 +445,16 @@ public:                                                                  \
>    }
> 
> #define DECLARE_RALLOC_CXX_OPERATORS(type) \
>-   DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, ralloc_size)
>+   DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, ralloc_size, true)
> 
> #define DECLARE_RZALLOC_CXX_OPERATORS(type) \
>-   DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, rzalloc_size)
>+   DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, rzalloc_size, true)
> 
> #define DECLARE_LINEAR_ALLOC_CXX_OPERATORS(type) \
>-   DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, linear_alloc_child)
>+   DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, linear_alloc_child, false)
> 
> #define DECLARE_LINEAR_ZALLOC_CXX_OPERATORS(type) \
>-   DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, linear_zalloc_child)
>+   DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, linear_zalloc_child, false)
> 
> 
> /**
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 98595: 127868

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.