From ad96f02bdb92202739779c8062fad972897303b1 Mon Sep 17 00:00:00 2001
From: Philip Chimento <philip.chimento@gmail.com>
Date: Fri, 12 Mar 2021 15:41:28 -0800
Subject: [PATCH] glib.supp: Generalize some suppressions

Some versions of compilers inline gobject_init_ctor() and
type_class_init_Wm(), so the existing suppression rules would no longer
match. Try to generalize them to handle these cases.
---
 glib.supp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/glib.supp b/glib.supp
index b70addb9b..283166361 100644
--- a/glib.supp
+++ b/glib.supp
@@ -90,7 +90,7 @@
 	match-leak-kinds:reachable
 	fun:malloc
 	...
-	fun:gobject_init_ctor
+	fun:gobject_init*
 }
 
 {
@@ -99,7 +99,7 @@
 	match-leak-kinds:reachable
 	fun:realloc
 	...
-	fun:gobject_init_ctor
+	fun:gobject_init*
 }
 
 {
@@ -108,7 +108,7 @@
 	match-leak-kinds:possible,reachable
 	fun:calloc
 	...
-	fun:gobject_init_ctor
+	fun:gobject_init*
 }
 
 {
@@ -366,6 +366,16 @@
         fun:g_type_class_ref
 }
 
+{
+	g-type-class-ref-inlined
+	Memcheck:Leak
+	fun:calloc
+	...
+	fun:UnknownInlinedFun
+	...
+	fun:g_type_class_ref
+}
+
 {
 	g-io-module-default-singleton-malloc
 	Memcheck:Leak