Changeset 69076 in vbox for trunk

Timestamp:

Oct 13, 2017 2:42:00 PM (7 years ago)

Author:

vboxsync

Message:

bldprogs/gccplugin: Made it build with gcc 7.2.0 on ArchLinux.

Location:

trunk/src/bldprogs

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxCompilerPlugIns.h (modified) (1 diff)
• VBoxCompilerPlugInsGcc.cpp (modified) (32 diffs)

trunk/src/bldprogs/Makefile.kmk

@@ -79 +79 @@
 VBoxCompilerPlugInsGcc.o VBoxCompilerPlugInsCommon.o VBoxCompilerPlugIns.o gccplugin: gccplugin$(SUFF_DLL)
 gccplugin$(SUFF_DLL): VBoxCompilerPlugInsGcc.cpp VBoxCompilerPlugInsCommon.cpp VBoxCompilerPlugIns.h
-        $(TOOL_GXX3_CXX) -shared -fPIC -g \
+        $(TOOL_GXX3_CXX) -shared -fPIC -fno-rtti -g \
                 -DIN_RING3 \
                 $(if-expr "$(KBUILD_TYPE)" != "release",-DDEBUG,) \

trunk/src/bldprogs/VBoxCompilerPlugIns.h

@@ -38 +38 @@
 typedef struct VFMTCHKSTATE
 {
-    long        iFmt;
-    long        iArgs;
-    const char *pszFmt;
-    bool        fMaybeNull;
+    long            iFmt;
+    long            iArgs;
+    const char     *pszFmt;
+    bool            fMaybeNull;
 #if defined(__GNUC__) && !defined(VBOX_COMPILER_PLUG_IN_AGNOSTIC)
-    gimple      hStmt;
-    location_t  hFmtLoc;
+# if RT_GNUC_PREREQ(6, 0)
+    gimple const   *hStmt;
+# else
+    gimple          hStmt;
+# endif
+    location_t      hFmtLoc;
 #endif
 } VFMTCHKSTATE;

trunk/src/bldprogs/VBoxCompilerPlugInsGcc.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 #include <iprt/stdarg.h>
 
+#if RT_GNUC_PREREQ(5, 1)
+# include "gcc-plugin.h"
+# include "plugin-version.h"
+#endif
 #if __GNUC__ == 4 && __GNUC_MINOR__ == 5
 # include "gmp.h"
@@ -32 +36 @@
 #endif
 #include "plugin.h"
-#include "gimple.h"
 #include "basic-block.h"
 #include "tree.h"
 #include "tree-pass.h"
+#include "gimple.h"
+#if RT_GNUC_PREREQ(4, 9)
+# include "gimple-iterator.h"
+# include "context.h" /* for g */
+#endif
 #include "cp/cp-tree.h"
 #if __GNUC__ == 4 && __GNUC_MINOR__ == 5
@@ -57 +65 @@
 #ifndef VAR_P
 # define VAR_P(a_hNode) (TREE_CODE(a_hNode) == VAR_DECL)
+#endif
+/** Replacement for the 4.9.0 get_tree_code_name function. */
+#if !RT_GNUC_PREREQ(4, 9)
+# define get_tree_code_name(a_enmTreeCode) (tree_code_name[a_enmTreeCode])
 #endif
 
@@ -89 +101 @@
 }
 #endif
-#if __GNUC__ > 4 || __GNUC_MINOR__ > 5
-# define MY_INT_FITS_SHWI(hNode)    (hNode).fits_shwi()
-# define MY_INT_TO_SHWI(hNode)      (hNode).to_shwi()
+
+///* Integer to HOST_WIDE_INT conversion fun. */
+//#if RT_GNUC_PREREQ(4, 6)
+//# define MY_INT_FITS_SHWI(hNode)    (hNode).fits_shwi()
+//# define MY_INT_TO_SHWI(hNode)      (hNode).to_shwi()
+//#else
+//# define MY_INT_FITS_SHWI(hNode)    double_int_fits_in_shwi_p(hNode)
+//# define MY_INT_TO_SHWI(hNode)      double_int_to_shwi(hNode)
+//#endif
+
+/* Integer to HOST_WIDE_INT conversion fun. */
+#if RT_GNUC_PREREQ(5, 1)
+# define MY_DOUBLE_INT_FITS_SHWI(hNode)     tree_fits_shwi_p(hNode)
+# define MY_DOUBLE_INT_TO_SHWI(hNode)       tree_to_shwi(hNode)
+#elif RT_GNUC_PREREQ(4, 6)
+# define MY_DOUBLE_INT_FITS_SHWI(hNode)     (TREE_INT_CST(hNode).fits_shwi())
+# define MY_DOUBLE_INT_TO_SHWI(hNode)       (TREE_INT_CST(hNode).to_shwi())
 #else
-# define MY_INT_FITS_SHWI(hNode)    double_int_fits_in_shwi_p(hNode)
-# define MY_INT_TO_SHWI(hNode)      double_int_to_shwi(hNode)
-#endif
+# define MY_DOUBLE_INT_FITS_SHWI(hNode)     double_int_fits_in_shwi_p(TREE_INT_CST(hNode))
+# define MY_DOUBLE_INT_TO_SHWI(hNode)       double_int_to_shwi(TREE_INT_CST(hNode))
+#endif
+
 #ifndef EXPR_LOC_OR_LOC
 # define EXPR_LOC_OR_LOC(a,b) (b)
@@ -107 +134 @@
 static bool             MyPassGateCallback(void);
 static unsigned int     MyPassExecuteCallback(void);
+static unsigned int     MyPassExecuteCallbackWithFunction(struct function *pFun);
 static tree             AttributeHandler(tree *, tree, tree, int, bool *);
 
@@ -120 +148 @@
 };
 
+#if RT_GNUC_PREREQ(4, 9)
+/** My pass. */
+static const pass_data g_MyPassData =
+{
+    type                    : GIMPLE_PASS,
+    name                    : "*iprt-format-checks", /* asterisk = no dump */
+    optinfo_flags           : 0,
+    tv_id                   : TV_NONE,
+    properties_required     : 0,
+    properties_provided     : 0,
+    properties_destroyed    : 0,
+    todo_flags_start        : 0,
+    todo_flags_finish       : 0,
+};
+
+class MyPass : public gimple_opt_pass
+{
+public:
+    MyPass(gcc::context *pCtx) : gimple_opt_pass(g_MyPassData, pCtx)
+    { }
+
+    virtual bool gate(function *pFun)
+    {
+        NOREF(pFun);
+        return MyPassGateCallback();
+    }
+
+    virtual unsigned int execute(function *pFun)
+    {
+        NOREF(pFun);
+        return MyPassExecuteCallbackWithFunction(pFun);
+    }
+};
+
+#else /* < 4.9.0 */
+
 /** My pass. */
 static struct gimple_opt_pass g_MyPass =
@@ -127 +191 @@
         type                    : GIMPLE_PASS,
         name                    : "*iprt-format-checks", /* asterisk = no dump */
-#if __GNUC__ != 4 || __GNUC_MINOR__ != 5
+# if __GNUC__ != 4 || __GNUC_MINOR__ != 5
         optinfo_flags           : 0,
-#endif
+# endif
         gate                    : MyPassGateCallback,
         execute                 : MyPassExecuteCallback,
@@ -153 +217 @@
 };
 
+#endif /* < 4.9.0 */
+
 
 /** Attribute specifications. */
@@ -224 +290 @@
 #endif
 
-    dprintf("%s ", tree_code_name[enmDeclCode]);
+    dprintf("%s ", get_tree_code_name(enmDeclCode));
     dprintScope(hDecl);
     dprintf("::%s", DECL_NAME(hDecl) ? IDENTIFIER_POINTER(DECL_NAME(hDecl)) : "<noname>");
     if (hType)
-        dprintf(" type %s", tree_code_name[enmTypeCode]);
+        dprintf(" type %s", get_tree_code_name(enmTypeCode));
     dprintf(" @%s:%d", DECL_SOURCE_FILE(hDecl),  DECL_SOURCE_LINE(hDecl));
 }
@@ -294 +360 @@
 {
     location_t hLoc = pState->hFmtLoc;
-#if __GNUC__ != 4 || __GNUC_MINOR__ > 5
+#if RT_GNUC_PREREQ(4,6)
     intptr_t   offString = pszLoc - pState->pszFmt;
     if (   offString >= 0
@@ -302 +368 @@
         expanded_location   XLoc    = expand_location_to_spelling_point(hLoc);
         int                 cchLine = 0;
-# if __GNUC__ >= 5 /** @todo figure this... */
-        const char         *pszLine = location_get_source_line(XLoc, &cchLine);
+# if RT_GNUC_PREREQ(5,0)
+        const char         *pszLine = location_get_source_line(XLoc.file, XLoc.line, &cchLine);
 # else
         const char         *pszLine = location_get_source_line(XLoc);
@@ -339 +405 @@
 DECL_NO_INLINE(static, void) MyCheckFormatNonRecursive(PVFMTCHKSTATE pState, tree hFmtArg)
 {
-    dprintf("checker: hFmtArg=%p %s\n", hFmtArg, tree_code_name[TREE_CODE(hFmtArg)]);
+    dprintf("checker: hFmtArg=%p %s\n", hFmtArg, get_tree_code_name(TREE_CODE(hFmtArg)));
 
     /*
@@ -348 +414 @@
         hFmtArg = decl_constant_value(hFmtArg);
         STRIP_NOPS(hFmtArg); /* Used as argument and assigned call result. */
-        dprintf("checker1: variable => hFmtArg=%p %s\n", hFmtArg, tree_code_name[TREE_CODE(hFmtArg)]);
+        dprintf("checker1: variable => hFmtArg=%p %s\n", hFmtArg, get_tree_code_name(TREE_CODE(hFmtArg)));
     }
 
@@ -365 +431 @@
      */
     else if (TREE_CODE(hFmtArg) != ADDR_EXPR)
-        dprintf("checker1: Not address expression (%s)\n", tree_code_name[TREE_CODE(hFmtArg)]);
+        dprintf("checker1: Not address expression (%s)\n", get_tree_code_name(TREE_CODE(hFmtArg)));
     else
     {
@@ -376 +442 @@
         HOST_WIDE_INT off = 0;
         if (   TREE_CODE(hFmtArg) == ARRAY_REF
-            && MY_INT_FITS_SHWI(TREE_INT_CST(TREE_OPERAND(hFmtArg, 1)))
-            && MY_INT_FITS_SHWI(TREE_INT_CST(TREE_OPERAND(hFmtArg, 1))) )
+            && MY_DOUBLE_INT_FITS_SHWI(TREE_OPERAND(hFmtArg, 1))
+            && MY_DOUBLE_INT_FITS_SHWI(TREE_OPERAND(hFmtArg, 1)) )
         {
-            off = MY_INT_TO_SHWI(TREE_INT_CST(TREE_OPERAND(hFmtArg, 1)));
+            off = MY_DOUBLE_INT_TO_SHWI(TREE_OPERAND(hFmtArg, 1));
             if (off < 0)
             {
@@ -386 +452 @@
             }
             hFmtArg = TREE_OPERAND(hFmtArg, 0);
-            dprintf("checker1: ARRAY_REF => hFmtArg=%p %s, off=%ld\n", hFmtArg, tree_code_name[TREE_CODE(hFmtArg)], off);
+            dprintf("checker1: ARRAY_REF => hFmtArg=%p %s, off=%ld\n", hFmtArg, get_tree_code_name(TREE_CODE(hFmtArg)), off);
         }
 
@@ -410 +476 @@
          */
         if (TREE_CODE(hFmtArg) != STRING_CST)
-            dprintf("checker1: Not string literal (%s)\n", tree_code_name[TREE_CODE(hFmtArg)]);
+            dprintf("checker1: Not string literal (%s)\n", get_tree_code_name(TREE_CODE(hFmtArg)));
         else if (TYPE_MAIN_VARIANT(TREE_TYPE(TREE_TYPE(hFmtArg))) != char_type_node)
             warning_at(pState->hFmtLoc, 0, "expected 'char' type string literal");
@@ -425 +491 @@
             {
                 if (TREE_CODE(hArraySize) != INTEGER_CST)
-                    warning_at(pState->hFmtLoc, 0, "Expected integer array size (not %s)", tree_code_name[TREE_CODE(hArraySize)]);
-                else if (!MY_INT_FITS_SHWI(TREE_INT_CST(hArraySize)))
+                    warning_at(pState->hFmtLoc, 0, "Expected integer array size (not %s)", get_tree_code_name(TREE_CODE(hArraySize)));
+                else if (!MY_DOUBLE_INT_FITS_SHWI(hArraySize))
                     warning_at(pState->hFmtLoc, 0, "Unexpected integer overflow in array size constant");
                 else
                 {
-                    HOST_WIDE_INT cbArray = MY_INT_TO_SHWI(TREE_INT_CST(hArraySize));
+                    HOST_WIDE_INT cbArray = MY_DOUBLE_INT_TO_SHWI(hArraySize);
                     if (   cbArray <= 0
                         || cbArray != (int)cbArray)
@@ -517 +583 @@
 
 
+#if !RT_GNUC_PREREQ(4, 9)
 /**
  * Execute my pass.
@@ -522 +589 @@
  */
 static unsigned int     MyPassExecuteCallback(void)
+{
+    return MyPassExecuteCallbackWithFunction(cfun);
+}
+#endif
+
+/**
+ * Execute my pass.
+ * @returns Flags indicates stuff todo, we return 0.
+ */
+static unsigned int     MyPassExecuteCallbackWithFunction(struct function *pFun)
 {
     dprintf("MyPassExecuteCallback:\n");
@@ -529 +606 @@
      */
     basic_block hBasicBlock;
-    FOR_EACH_BB(hBasicBlock)
+    FOR_EACH_BB_FN(hBasicBlock, pFun)
     {
         dprintf(" hBasicBlock=%p\n", hBasicBlock);
@@ -539 +616 @@
         for (gimple_stmt_iterator hStmtItr = gsi_start_bb(hBasicBlock); !gsi_end_p(hStmtItr); gsi_next(&hStmtItr))
         {
+#if RT_GNUC_PREREQ(6, 0)
+            const gimple * const    hStmt   = gsi_stmt(hStmtItr);
+#else
             gimple const            hStmt   = gsi_stmt(hStmtItr);
+#endif
+
             enum gimple_code const  enmCode = gimple_code(hStmt);
 #ifdef DEBUG
@@ -548 +630 @@
                 tree const hOp = gimple_op(hStmt, iOp);
                 if (hOp)
-                    dprintf("     %02d: %p, code %s(%d)\n", iOp, hOp, tree_code_name[TREE_CODE(hOp)], TREE_CODE(hOp));
+                    dprintf("     %02d: %p, code %s(%d)\n", iOp, hOp, get_tree_code_name(TREE_CODE(hOp)), TREE_CODE(hOp));
                 else
                     dprintf("     %02d: NULL_TREE\n", iOp);
@@ -560 +642 @@
                 tree const hFn = gimple_call_fn(hStmt);
                 dprintf("     hFn    =%p %s(%d); args=%d\n",
-                        hFn, tree_code_name[TREE_CODE(hFn)], TREE_CODE(hFn), gimple_call_num_args(hStmt));
+                        hFn, get_tree_code_name(TREE_CODE(hFn)), TREE_CODE(hFn), gimple_call_num_args(hStmt));
 #ifdef DEBUG
                 if (DECL_P(hFn))
@@ -570 +652 @@
                 if (hFnDecl)
                     dprintf("     hFnDecl=%p %s(%d) %s type=%p %s:%d\n",
-                            hFnDecl, tree_code_name[TREE_CODE(hFnDecl)], TREE_CODE(hFnDecl),
+                            hFnDecl, get_tree_code_name(TREE_CODE(hFnDecl)), TREE_CODE(hFnDecl),
                             DECL_NAME(hFnDecl) ? IDENTIFIER_POINTER(DECL_NAME(hFnDecl)) : "<unamed>",
                             TREE_TYPE(hFnDecl), DECL_SOURCE_FILE(hFnDecl), DECL_SOURCE_LINE(hFnDecl));
@@ -576 +658 @@
                 if (hFnType == NULL_TREE)
                     error_at(gimple_location(hStmt), "Failed to resolve function type [fn=%s]\n",
-                             tree_code_name[TREE_CODE(hFn)]);
+                             get_tree_code_name(TREE_CODE(hFn)));
                 else if (POINTER_TYPE_P(hFnType))
                     error_at(gimple_location(hStmt), "Got a POINTER_TYPE when expecting a function type [fn=%s]\n",
-                             tree_code_name[TREE_CODE(hFn)]);
+                             get_tree_code_name(TREE_CODE(hFn)));
                 if (hFnType)
-                    dprintf("     hFnType=%p %s(%d) %s\n", hFnType, tree_code_name[TREE_CODE(hFnType)], TREE_CODE(hFnType),
-                            TYPE_NAME(hFnType) ? IDENTIFIER_POINTER(TYPE_NAME(hFnType)) : "<unamed>");
+                    dprintf("     hFnType=%p %s(%d) %s\n", hFnType, get_tree_code_name(TREE_CODE(hFnType)), TREE_CODE(hFnType),
+                              TYPE_NAME(hFnType) && DECL_NAME(TYPE_NAME(hFnType))
+                            ? IDENTIFIER_POINTER(DECL_NAME(TYPE_NAME(hFnType))) : "<unamed>");
 
                 tree const hAttr        = hFnType ? lookup_attribute("iprt_format", TYPE_ATTRIBUTES(hFnType))            : NULL_TREE;
@@ -593 +676 @@
                     tree const hAttrArgs = hAttr ? TREE_VALUE(hAttr) : TREE_VALUE(hAttrMaybe0);
                     VFMTCHKSTATE State;
-                    State.iFmt          = MY_INT_TO_SHWI(TREE_INT_CST(TREE_VALUE(hAttrArgs)));
-                    State.iArgs         = MY_INT_TO_SHWI(TREE_INT_CST(TREE_VALUE(TREE_CHAIN(hAttrArgs))));
+                    State.iFmt          = MY_DOUBLE_INT_TO_SHWI(TREE_VALUE(hAttrArgs));
+                    State.iArgs         = MY_DOUBLE_INT_TO_SHWI(TREE_VALUE(TREE_CHAIN(hAttrArgs)));
                     State.pszFmt        = NULL;
                     State.fMaybeNull    = hAttr == NULL_TREE;
@@ -642 +725 @@
 {
     dprintf("AttributeHandler: name=%s fFlags=%#x", IDENTIFIER_POINTER(hAttrName), fFlags);
-    long iFmt  = MY_INT_TO_SHWI(TREE_INT_CST(TREE_VALUE(hAttrArgs)));
-    long iArgs = MY_INT_TO_SHWI(TREE_INT_CST(TREE_VALUE(TREE_CHAIN(hAttrArgs))));
+    long iFmt  = MY_DOUBLE_INT_TO_SHWI(TREE_VALUE(hAttrArgs));
+    long iArgs = MY_DOUBLE_INT_TO_SHWI(TREE_VALUE(TREE_CHAIN(hAttrArgs)));
     dprintf(" iFmt=%ld iArgs=%ld", iFmt, iArgs);
 
     tree hType = *phOnNode;
-    dprintf(" hType=%p %s(%d)\n", hType, tree_code_name[TREE_CODE(hType)], TREE_CODE(hType));
+    dprintf(" hType=%p %s(%d)\n", hType, get_tree_code_name(TREE_CODE(hType)), TREE_CODE(hType));
 
     if (pfDontAddAttrib)
@@ -688 +771 @@
 
     /* Register our pass. */
+#if RT_GNUC_PREREQ(4, 9)
+    /** The registration info for my pass. */
+    struct register_pass_info MyPassInfo;
+    MyPassInfo.pass                     = new MyPass(g);
+    MyPassInfo.reference_pass_name      = "ssa";
+    MyPassInfo.ref_pass_instance_number = 1;
+    MyPassInfo.pos_op                   = PASS_POS_INSERT_BEFORE;
+    register_callback(pPlugInInfo->base_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &MyPassInfo);
+#else
     register_callback(pPlugInInfo->base_name, PLUGIN_PASS_MANAGER_SETUP, NULL, (void *)&g_MyPassInfo);
+#endif
 
     /* Register plug-in info. */
@@ -749 +842 @@
                 error_at(MY_LOC(hArg, pState), "%u extra arguments not consumed by format string", cArgs - iArg);
             else if (   TREE_CODE(hArg) != INTEGER_CST
-                     || !MY_INT_FITS_SHWI(TREE_INT_CST(hArg))
-                     || MY_INT_TO_SHWI(TREE_INT_CST(hArg)) != -99) /* ignore final dummy argument: ..., -99); */
+                     || !MY_DOUBLE_INT_FITS_SHWI(hArg)
+                     || MY_DOUBLE_INT_TO_SHWI(hArg) != -99) /* ignore final dummy argument: ..., -99); */
                 error_at(MY_LOC(hArg, pState), "one extra argument not consumed by format string");
         }
@@ -776 +869 @@
         tree hArg  = gimple_call_arg(pState->hStmt, iArg);
         tree hType = TREE_TYPE(hArg);
-        dprintf("arg%u: hArg=%p [%s] hType=%p [%s] cls=%s\n", iArg, hArg, tree_code_name[TREE_CODE(hArg)],
-                hType, tree_code_name[TREE_CODE(hType)], tree_code_class_strings[TREE_CODE_CLASS(TREE_CODE(hType))]);
+        dprintf("arg%u: hArg=%p [%s] hType=%p [%s] cls=%s\n", iArg, hArg, get_tree_code_name(TREE_CODE(hArg)),
+                hType, get_tree_code_name(TREE_CODE(hType)), tree_code_class_strings[TREE_CODE_CLASS(TREE_CODE(hType))]);
         dprintf("      nm=%p\n", TYPE_NAME(hType));
-        dprintf("      cb=%p %s value=%ld\n", TYPE_SIZE(hType), tree_code_name[TREE_CODE(TYPE_SIZE(hType))],
-                MY_INT_TO_SHWI(TREE_INT_CST(TYPE_SIZE(hType))) );
-        dprintf("      unit=%p %s value=%ld\n", TYPE_SIZE_UNIT(hType), tree_code_name[TREE_CODE(TYPE_SIZE_UNIT(hType))],
-                MY_INT_TO_SHWI(TREE_INT_CST(TYPE_SIZE_UNIT(hType))) );
+        dprintf("      cb=%p %s value=%ld\n", TYPE_SIZE(hType), get_tree_code_name(TREE_CODE(TYPE_SIZE(hType))),
+                MY_DOUBLE_INT_TO_SHWI(TYPE_SIZE(hType)) );
+        dprintf("      unit=%p %s value=%ld\n", TYPE_SIZE_UNIT(hType), get_tree_code_name(TREE_CODE(TYPE_SIZE_UNIT(hType))),
+                MY_DOUBLE_INT_TO_SHWI(TYPE_SIZE_UNIT(hType)) );
         tree hTypeNm = TYPE_NAME(hType);
         if (hTypeNm)
-            dprintf("      typenm=%p %s '%s'\n", hTypeNm, tree_code_name[TREE_CODE(hTypeNm)],
+            dprintf("      typenm=%p %s '%s'\n", hTypeNm, get_tree_code_name(TREE_CODE(hTypeNm)),
                     IDENTIFIER_POINTER(DECL_NAME(hTypeNm)));
     }