lto.c (compare_tree_sccs_1): Compare DECL_FINAL_P...

	* lto.c (compare_tree_sccs_1): Compare  DECL_FINAL_P,
	DECL_CXX_CONSTRUCTOR_P, DECL_CXX_DESTRUCTOR_P and
	TYPE_FINAL_P.

	* lto-streamer-out.c (hash_tree): Stream DECL_FINAL_P.
	DECL_CXX_CONSTRUCTOR_P. DECL_CXX_DESTRUCTOR_P.
	TYPE_FINAL_P.
	* lto-streamer-in.c (unpack_ts_decl_with_vis_value_fields):
	DECL_FINAL_P. DECL_CXX_CONSTRUCTOR_P and DECL_CXX_DESTRUCTOR_P.
	(unpack_ts_type_common_value_fields): Stream TYPE_FINAL_P.
	* tree-streamer-out.c (pack_ts_decl_with_vis_value_fields):
	Add DECL_FINAL_P, DECL_CXX_CONSTRUCTOR_P, DECL_CXX_DESTRUCTOR_P
	(pack_ts_type_common_value_fields): Add TYPE_FINAL_P.

From-SVN: r202079

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fedf7c42007a4336f28261607fe6f64f52c5f40a..2c92fd0e3b1d87a82f138b33325b39fa543dc994 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2013-08-29  Jan Hubicka  <jh@suse.cz>
+
+       * lto-streamer-out.c (hash_tree): Stream DECL_FINAL_P.
+       DECL_CXX_CONSTRUCTOR_P. DECL_CXX_DESTRUCTOR_P.
+       TYPE_FINAL_P.
+       * lto-streamer-in.c (unpack_ts_decl_with_vis_value_fields):
+       DECL_FINAL_P. DECL_CXX_CONSTRUCTOR_P and DECL_CXX_DESTRUCTOR_P.
+       (unpack_ts_type_common_value_fields): Stream TYPE_FINAL_P.
+       * tree-streamer-out.c (pack_ts_decl_with_vis_value_fields):
+       Add DECL_FINAL_P, DECL_CXX_CONSTRUCTOR_P, DECL_CXX_DESTRUCTOR_P
+       (pack_ts_type_common_value_fields): Add TYPE_FINAL_P.
+
 2013-08-29  Teresa Johnson  <tejohnson@google.com>
 
        * dumpfile.c (dump_loc): Output column number.

diff --git a/gcc/config/linux-android.c b/gcc/config/linux-android.c
index 4a4b48d9882e6bd99f030b8822b2f164a376a0e6..bbe69e5490ac40f56bc4192aa448e5f4d27b0831 100644 (file)
--- a/gcc/config/linux-android.c
+++ b/gcc/config/linux-android.c
@@ -37,7 +37,7 @@ linux_android_libc_has_function (enum function_class fn_class)
 {
   if (OPTION_GLIBC)
     return true;
-  if (OPTION_BIONIC)
+  /*if (OPTION_BIONIC)*/
     if (fn_class == function_c94
        || fn_class == function_c99_misc
        || fn_class == function_sincos)

diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index d11756842d36f1d9838a5e96c8fa7958379aad35..dfcd135717939919d8da5a8a62b5b4787ee899e6 100644 (file)
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -795,6 +795,11 @@ hash_tree (struct streamer_tree_cache_d *cache, tree t)
                                            v);
          v = iterative_hash_host_wide_int (DECL_TLS_MODEL (t), v);
        }
+      if (TREE_CODE (t) == FUNCTION_DECL)
+       v = iterative_hash_host_wide_int (DECL_FINAL_P (t)
+                                         | (DECL_CXX_CONSTRUCTOR_P (t) << 1)
+                                         | (DECL_CXX_DESTRUCTOR_P (t) << 2),
+                                         v);
       if (VAR_OR_FUNCTION_DECL_P (t))
        v = iterative_hash_host_wide_int (DECL_INIT_PRIORITY (t), v);
     }
@@ -835,7 +840,10 @@ hash_tree (struct streamer_tree_cache_d *cache, tree t)
                                        | (TYPE_USER_ALIGN (t) << 5)
                                        | (TYPE_READONLY (t) << 6), v);
       if (RECORD_OR_UNION_TYPE_P (t))
-       v = iterative_hash_host_wide_int (TYPE_TRANSPARENT_AGGR (t), v);
+       {
+         v = iterative_hash_host_wide_int (TYPE_TRANSPARENT_AGGR (t)
+                                           | (TYPE_FINAL_P (t) << 1), v);
+       }
       else if (code == ARRAY_TYPE)
        v = iterative_hash_host_wide_int (TYPE_NONALIASED_COMPONENT (t), v);
       v = iterative_hash_host_wide_int (TYPE_PRECISION (t), v);

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 0fb1fc0eedd354d66ddb2e02f7dbc0e6c7a91ae1..ab81a7874a3255c92b7cd31e55afecebe0d72604 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-29  Jan Hubicka  <jh@suse.cz>
+
+       * lto.c (compare_tree_sccs_1): Compare  DECL_FINAL_P,
+       DECL_CXX_CONSTRUCTOR_P, DECL_CXX_DESTRUCTOR_P and
+       TYPE_FINAL_P.
+
 2013-08-28  Jan Hubicka  <jh@suse.cz>
 
        * lto.c (compare_tree_sccs_1): Drop DECL_ERROR_ISSUED,

diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index d3d9fabc15133f6b94dfa34bcf393a3f38dc6743..f6e1f970caa2f2553ccadacd4122dac7d35ef0f4 100644 (file)
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -1889,6 +1889,9 @@ compare_tree_sccs_1 (tree t1, tree t2, tree **map)
       compare_values (DECL_DISREGARD_INLINE_LIMITS);
       compare_values (DECL_PURE_P);
       compare_values (DECL_LOOPING_CONST_OR_PURE_P);
+      compare_values (DECL_FINAL_P);
+      compare_values (DECL_CXX_CONSTRUCTOR_P);
+      compare_values (DECL_CXX_DESTRUCTOR_P);
       if (DECL_BUILT_IN_CLASS (t1) != NOT_BUILT_IN)
        compare_values (DECL_FUNCTION_CODE);
       if (DECL_STATIC_DESTRUCTOR (t1))
@@ -1902,7 +1905,10 @@ compare_tree_sccs_1 (tree t1, tree t2, tree **map)
       compare_values (TYPE_NO_FORCE_BLK);
       compare_values (TYPE_NEEDS_CONSTRUCTING);
       if (RECORD_OR_UNION_TYPE_P (t1))
-       compare_values (TYPE_TRANSPARENT_AGGR);
+       {
+         compare_values (TYPE_TRANSPARENT_AGGR);
+         compare_values (TYPE_FINAL_P);
+       }
       else if (code == ARRAY_TYPE)
        compare_values (TYPE_NONALIASED_COMPONENT);
       compare_values (TYPE_PACKED);

diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index 47a539acac78463eec80b39a07b44036a0dee778..a86bcd87c1a81509fbb04cf7db7f5e6b033dc7b3 100644 (file)
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -272,6 +272,12 @@ unpack_ts_decl_with_vis_value_fields (struct bitpack_d *bp, tree expr)
       DECL_TLS_MODEL (expr) = (enum tls_model) bp_unpack_value (bp,  3);
     }
 
+  if (TREE_CODE (expr) == FUNCTION_DECL)
+    {
+      DECL_FINAL_P (expr) = (unsigned) bp_unpack_value (bp, 1);
+      DECL_CXX_CONSTRUCTOR_P (expr) = (unsigned) bp_unpack_value (bp, 1);
+      DECL_CXX_DESTRUCTOR_P (expr) = (unsigned) bp_unpack_value (bp, 1);
+    }
   if (VAR_OR_FUNCTION_DECL_P (expr))
     {
       priority_type p;
@@ -343,7 +349,10 @@ unpack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr)
   TYPE_NO_FORCE_BLK (expr) = (unsigned) bp_unpack_value (bp, 1);
   TYPE_NEEDS_CONSTRUCTING (expr) = (unsigned) bp_unpack_value (bp, 1);
   if (RECORD_OR_UNION_TYPE_P (expr))
-    TYPE_TRANSPARENT_AGGR (expr) = (unsigned) bp_unpack_value (bp, 1);
+    {
+      TYPE_TRANSPARENT_AGGR (expr) = (unsigned) bp_unpack_value (bp, 1);
+      TYPE_FINAL_P (expr) = (unsigned) bp_unpack_value (bp, 1);
+    }
   else if (TREE_CODE (expr) == ARRAY_TYPE)
     TYPE_NONALIASED_COMPONENT (expr) = (unsigned) bp_unpack_value (bp, 1);
   TYPE_PACKED (expr) = (unsigned) bp_unpack_value (bp, 1);

diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index 095d55936a37b75909ff68d36de55164aff5ea9a..98e5cf577859ab78bddfdd278a018034e196e2f6 100644 (file)
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -240,6 +240,12 @@ pack_ts_decl_with_vis_value_fields (struct bitpack_d *bp, tree expr)
       bp_pack_value (bp, DECL_TLS_MODEL (expr),  3);
     }
 
+  if (TREE_CODE (expr) == FUNCTION_DECL)
+    {
+      bp_pack_value (bp, DECL_FINAL_P (expr), 1);
+      bp_pack_value (bp, DECL_CXX_CONSTRUCTOR_P (expr), 1);
+      bp_pack_value (bp, DECL_CXX_DESTRUCTOR_P (expr), 1);
+    }
   if (VAR_OR_FUNCTION_DECL_P (expr))
     bp_pack_var_len_unsigned (bp, DECL_INIT_PRIORITY (expr));
 }
@@ -291,7 +297,10 @@ pack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr)
   bp_pack_value (bp, TYPE_NO_FORCE_BLK (expr), 1);
   bp_pack_value (bp, TYPE_NEEDS_CONSTRUCTING (expr), 1);
   if (RECORD_OR_UNION_TYPE_P (expr))
-    bp_pack_value (bp, TYPE_TRANSPARENT_AGGR (expr), 1);
+    {
+      bp_pack_value (bp, TYPE_TRANSPARENT_AGGR (expr), 1);
+      bp_pack_value (bp, TYPE_FINAL_P (expr), 1);
+    }
   else if (TREE_CODE (expr) == ARRAY_TYPE)
     bp_pack_value (bp, TYPE_NONALIASED_COMPONENT (expr), 1);
   bp_pack_value (bp, TYPE_PACKED (expr), 1);