backport: re PR c/88568 ('dllimport' no longer implies 'extern' in C)

	Backported from mainline
	2019-01-10  Jakub Jelinek  <jakub@redhat.com>

	PR c/88568
	* tree.c (handle_dll_attribute): Clear TREE_STATIC after setting
	DECL_EXTERNAL.

	* gcc.dg/pr88568.c: New test.

From-SVN: r275086

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22045257e812deb2a3d139ed13f86dcef13b68f6..7b77ef9622db1249f4884d6ef8f4911276a4a731 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2019-08-30  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2019-01-10  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/88568
+       * tree.c (handle_dll_attribute): Clear TREE_STATIC after setting
+       DECL_EXTERNAL.
+
        2019-01-05  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/82564

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5bdf54d367796c984f355a5051eda1e72f0a6495..808983ea6a39cdd9f3266f081dc34a7ed6a3e202 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2019-08-30  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2019-01-10  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/88568
+       * gcc.dg/pr88568.c: New test.
+
        2019-01-05  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/82564

diff --git a/gcc/testsuite/gcc.dg/pr88568.c b/gcc/testsuite/gcc.dg/pr88568.c
new file mode 100644 (file)
index 0000000..65d57d7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr88568.c
@@ -0,0 +1,4 @@
+/* PR c/88568 */
+/* { dg-do compile } */
+/* { dg-require-dll "" } */
+__attribute__((dllimport)) struct S var;       /* { dg-bogus "storage size of .var. isn.t known" } */

diff --git a/gcc/tree.c b/gcc/tree.c
index d00753482646a1f98637cb8ab7e8160ccee83d23..f92ce9ebce801a87f0d7f396c23d5cf41250020f 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -6456,6 +6456,8 @@ handle_dll_attribute (tree * pnode, tree name, tree args, int flags,
             a function global scope, unless declared static.  */
          if (current_function_decl != NULL_TREE && !TREE_STATIC (node))
            TREE_PUBLIC (node) = 1;
+         /* Clear TREE_STATIC because DECL_EXTERNAL is set.  */
+         TREE_STATIC (node) = 0;
        }
 
       if (*no_add_attrs == false)