* decl.c (declare_global_var): Set DECL_CONTEXT.

From-SVN: r250786

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 76d1de09c4dd708f99ff871e91f87251b1da33d9..03a9d0864084ab52774e18ecdf7f428ba9a8f690 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-31  Jason Merrill  <jason@redhat.com>
+
+       * decl.c (declare_global_var): Set DECL_CONTEXT.
+
 2017-07-31  Jan Hubicka <hubicka@ucw.cz>
            Martin Liska  <mliska@suse.cz>
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 4ec38b82aa98f640a14bd7eccaa348e4011955d5..aab2019f9cd48e0c19ad3e1f9e5f9d555e7f3576 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7583,6 +7583,7 @@ declare_global_var (tree name, tree type)
   TREE_PUBLIC (decl) = 1;
   DECL_EXTERNAL (decl) = 1;
   DECL_ARTIFICIAL (decl) = 1;
+  DECL_CONTEXT (decl) = FROB_CONTEXT (global_namespace);
   /* If the user has explicitly declared this variable (perhaps
      because the code we are compiling is part of a low-level runtime
      library), then it is possible that our declaration will be merged