Changeset 85502 in vbox for trunk

Timestamp:

Jul 29, 2020 9:52:10 AM (4 years ago)

Author:

vboxsync

Message:

gccplugin: gcc 10 fixes. bugref:9746

File:

• trunk/src/bldprogs/VBoxCompilerPlugInsGcc.cpp (modified) (9 diffs)

trunk/src/bldprogs/VBoxCompilerPlugInsGcc.cpp

@@ -49 +49 @@
 #endif
 #include "cp/cp-tree.h"
+#if RT_GNUC_PREREQ(10, 0)
+# include "stringpool.h"
+# include "attribs.h"
+#endif
 #if __GNUC__ == 4 && __GNUC_MINOR__ == 5
 }
@@ -153 +157 @@
 
 #if RT_GNUC_PREREQ(4, 9)
+
 /** My pass. */
 static const pass_data g_MyPassData =
@@ -158 +163 @@
     type                    : GIMPLE_PASS,
     name                    : "*iprt-format-checks", /* asterisk = no dump */
+# if RT_GNUC_PREREQ(10, 0)
+    optinfo_flags           : OPTGROUP_NONE,
+# else
     optinfo_flags           : 0,
+# endif
     tv_id                   : TV_NONE,
     properties_required     : 0,
@@ -195 +204 @@
         type                    : GIMPLE_PASS,
         name                    : "*iprt-format-checks", /* asterisk = no dump */
-# if __GNUC__ != 4 || __GNUC_MINOR__ != 5
+# if RT_GNUC_PREREQ(4, 6)
         optinfo_flags           : 0,
 # endif
@@ -234 +243 @@
         type_required           : true,
         function_type_required  : true,
+# if RT_GNUC_PREREQ(4, 6)
+        affects_type_identity   : false,
+#endif
         handler                 : AttributeHandler,
-#if __GNUC__ != 4 || __GNUC_MINOR__ != 5
-        affects_type_identity   : false
-#endif
+# if RT_GNUC_PREREQ(10, 0)
+        exclude                 : NULL,
+# endif
     },
     {
@@ -246 +258 @@
         type_required           : true,
         function_type_required  : true,
+# if RT_GNUC_PREREQ(4, 6)
+        affects_type_identity   : false,
+#endif
         handler                 : AttributeHandler,
-#if __GNUC__ != 4 || __GNUC_MINOR__ != 5
-        affects_type_identity   : false
-#endif
+# if RT_GNUC_PREREQ(10, 0)
+        exclude                 : NULL,
+# endif
     }
 };
@@ -361 +376 @@
 
 
+#if 0
+DECLINLINE(int) MyGetLineLength(const char *pszLine)
+{
+    if (pszLine)
+    {
+        const char *pszEol = strpbrk(pszLine, "\n\r");
+        if (!pszEol)
+            pszEol = strchr(pszLine, '\0');
+        return (int)(pszEol - pszLine);
+    }
+    return 0;
+}
+#endif
+
 static location_t MyGetFormatStringLocation(PVFMTCHKSTATE pState, const char *pszLoc)
 {
@@ -370 +399 @@
     {
         unsigned            uCol    = 1 + offString;
+# if 0 /* apparently not needed */
         expanded_location   XLoc    = expand_location_to_spelling_point(hLoc);
+# if RT_GNUC_PREREQ(10,0)
+        char_span           Span    = location_get_source_line(XLoc.file, XLoc.line);
+        const char         *pszLine = Span.m_ptr; /** @todo if enabled */
+        int                 cchLine = (int)Span.m_n_elts;
+# elif RT_GNUC_PREREQ(6,0)
         int                 cchLine = 0;
-# if RT_GNUC_PREREQ(6,0)
         const char         *pszLine = location_get_source_line(XLoc.file, XLoc.line, &cchLine);
 # elif RT_GNUC_PREREQ(5,0)
+        int                 cchLine = 0;
         const char         *pszLine = location_get_source_line(XLoc, &cchLine);
 # else
         const char         *pszLine = location_get_source_line(XLoc);
-        if (pszLine)
-        {
-            const char *pszEol = strpbrk(pszLine, "\n\r");
-            if (!pszEol)
-                pszEol = strchr(pszLine, '\0');
-            cchLine = (int)(pszEol - pszLine);
-        }
+        int                 cchLine = MyGetLineLength(pszLine);
 # endif
         if (pszLine)
@@ -392 +421 @@
             cchLine -= XLoc.column - 1;
         }
+# endif
 
         hLoc = MyGetLocationPlusColumnOffset(hLoc, uCol);