Changeset 2251 for trunk

Timestamp:

Jul 16, 2005, 12:27:42 AM (20 years ago)

Author:

bird

Message:

Attempt at fixing thunk exporting.

File:

• trunk/src/gcc/gcc/config/i386/emx.c (modified) (11 diffs, 1 prop)

trunk/src/gcc/gcc/config/i386/emx.c

@@ -38 +38 @@
 #endif
 
-/** @todo remove debug code */
 /*#define BIRD_DEBUG - DO NOT COMMIT WITH THIS DEFINED!!! */
 
@@ -92 +91 @@
         return psznone;
 
-    attr = (DECL_P (node) ? DECL_ATTRIBUTES (node) : TYPE_ATTRIBUTES (node));
+    attr = DECL_P (node) ? DECL_ATTRIBUTES (node) : TYPE_P (node) ? TYPE_ATTRIBUTES (node) : NULL_TREE;
     if (!attr)
         return pszdefault;
@@ -640 +639 @@
   if (TREE_CODE (TREE_TYPE (decl)) == METHOD_TYPE)
     {
+#if 0
       /* Artificial methods are not affected by the import/export status of
          their class unless they are virtual.  */
       if (! DECL_ARTIFICIAL (decl) || DECL_VINDEX (decl))
         t = TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (decl))));
+#else /* from the CVS 3.4 branch. */
+      /* Artificial methods are not affected by the import/export status
+         of their class unless they are COMDAT.  Implicit copy ctor's and
+         dtor's are not affected by class status but virtual and
+         non-virtual thunks are.  */
+      if (!DECL_ARTIFICIAL (decl) || DECL_COMDAT (decl))
+        t = TYPE_MAIN_VARIANT
+          (TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (decl)))));
+      dfprintf((stderr, "trace: associated_type: decl=%p t=%p\n", decl, t));
+      DUMP(decl);
+      DUMP(t);
+#endif 
     }
   else if (DECL_CONTEXT (decl)
@@ -745 +757 @@
         }
 
+#if 0
       /* Since we can't treat a pointer to a dllimport'd symbol as a
          constant address, we turn off the attribute on C++ virtual
@@ -751 +764 @@
                && (DECL_VIRTUAL_P (decl)))
            return 0;
+#else /* From the CVS 3.4 branch */
+      /* Since we can't treat a pointer to a dllimport'd symbol as a
+         constant address, we turn off the attribute on C++ virtual
+         methods to allow creation of vtables using thunks.  Don't mark
+         artificial methods either (in associated_type, only COMDAT
+         artificial method get import status from class context).  */
+      else if (TREE_CODE (TREE_TYPE (decl)) == METHOD_TYPE
+               && (DECL_VIRTUAL_P (decl) || DECL_ARTIFICIAL (decl)))
+        return 0;
+#endif 
 
       return 1;
@@ -808 +831 @@
       warning_with_decl (decl,"inconsistent dll linkage for '%s': dllexport assumed.");
      /* Remove DLL_IMPORT_PREFIX.  */
-      oldname += 9;
+      oldname += 3; /* not 9 since we're not doing the __imp_ bit. */
       DECL_NON_ADDR_CONST_P (decl) = 0;
     }
@@ -834 +857 @@
 {
   const char *oldname;
-  char  *newname;
-  tree idp;
-  rtx rtlname, newrtl;
+  /*char  *newname;*/
+  /*tree idp;*/
+  rtx rtlname/*, newrtl*/;
   dfprintf ((stderr, "trace: i386_emx_mark_dllimport\n"));
 
@@ -864 +887 @@
     }
 
+#if 0 /* we're only tagging along for the error handling but need no special handling. */
   newname = alloca (strlen (oldname) + 11);
   sprintf (newname, "%ci.%s", DLL_IMPORT_EXPORT_PREFIX, oldname);
@@ -880 +904 @@
   /* Can't treat a pointer to this as a constant address */
   DECL_NON_ADDR_CONST_P (decl) = 1;
+#endif 
 }
 
@@ -1095 +1120 @@
             {
               DUMP(decl);
+              /* breaks thunks. Windows ain't doing this either.
+                 If it turns out to break stuff, try add "|| DECL_COMDAT (decl)".
               if (!TREE_STATIC (decl))
                 {
@@ -1100 +1127 @@
                   continue;
                 }
+               */
               if (!q->asm_name)
                 q->asm_name = q->exported_name ? q->exported_name