callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/kalev/gcc-11' into 'master'

Browse Source 
Avoid diagnostics for gcc-11 false positive out of bounds accesses

See merge request GNOME/gtk!3064

(cherry picked from commit 5044031b53988627c2937c6b5f8919a37e18f21f)

c514c41d Avoid diagnostics for gcc-11 false positive out of bounds accesses
This commit is contained in:
Matthias Clasen 2021-01-11 22:04:52 +00:00 committed by Emmanuele Bassi
parent 4868656ebb
commit b4e110920a
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtktextchild.c
View File

@ -129,6 +129,12 @@ const GtkTextLineSegmentClass gtk_text_pixbuf_type = {
GtkTextLineSegment * GtkTextLineSegment *
_gtk_pixbuf_segment_new (GdkPixbuf *pixbuf) _gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
{ {
/* gcc-11 issues a diagnostic here because the size allocated
for SEG does not cover the entire size of a GtkTextLineSegment
and gcc has no way to know that the union will only be used
for limited types and the additional space is not needed. */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
GtkTextLineSegment *seg; GtkTextLineSegment *seg;
seg = g_slice_alloc (PIXBUF_SEG_SIZE); seg = g_slice_alloc (PIXBUF_SEG_SIZE);
@ -148,6 +154,7 @@ _gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
g_object_ref (pixbuf); g_object_ref (pixbuf);
return seg; return seg;
#pragma GCC diagnostic pop
} }
@ -224,6 +231,12 @@ const GtkTextLineSegmentClass gtk_text_child_type = {
GtkTextLineSegment * GtkTextLineSegment *
_gtk_widget_segment_new (GtkTextChildAnchor *anchor) _gtk_widget_segment_new (GtkTextChildAnchor *anchor)
{ {
/* gcc-11 issues a diagnostic here because the size allocated
for SEG does not cover the entire size of a GtkTextLineSegment
and gcc has no way to know that the union will only be used
for limited types and the additional space is not needed. */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
GtkTextLineSegment *seg; GtkTextLineSegment *seg;
seg = g_slice_alloc (WIDGET_SEG_SIZE); seg = g_slice_alloc (WIDGET_SEG_SIZE);
@ -247,6 +260,7 @@ _gtk_widget_segment_new (GtkTextChildAnchor *anchor)
g_object_ref (anchor); g_object_ref (anchor);
return seg; return seg;
#pragma GCC diagnostic pop
} }
void void

7
gtk/gtktextsegment.c
View File

@ -426,6 +426,12 @@ char_segment_check_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
GtkTextLineSegment* GtkTextLineSegment*
_gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on) _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
{ {
/* gcc-11 issues a diagnostic here because the size allocated
for SEG does not cover the entire size of a GtkTextLineSegment
and gcc has no way to know that the union will only be used
for limited types and the additional space is not needed. */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
GtkTextLineSegment *seg; GtkTextLineSegment *seg;
seg = g_slice_alloc (TSEG_SIZE); seg = g_slice_alloc (TSEG_SIZE);
@ -441,6 +447,7 @@ _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
seg->body.toggle.inNodeCounts = 0; seg->body.toggle.inNodeCounts = 0;
return seg; return seg;
#pragma GCC diagnostic pop
} }
void void