diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd2dc3c56bf9b22575e7475c3d69ee215b639ccf..d9d4f92fc9eb634922e56ba60f439b9f9b7df490 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-16  Richard Guenther  <rguenther@suse.de>
+
+	* tree.h (struct tree_decl_minimal): Move pt_uid ...
+	(struct tree_decl_common): ... here.
+	(DECL_PT_UID): Adjust.
+	(SET_DECL_PT_UID): Likewise.
+	(DECL_PT_UID_SET_P): Likewise.
+
 2010-04-16  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/43572
diff --git a/gcc/tree.h b/gcc/tree.h
index ad958119a222689ea5c4964925982b5532f154a3..ee6f1a4f598d579ff80588d6800342574dc5acd8 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2491,12 +2491,12 @@ struct function;
 
 /* Every ..._DECL node gets a unique number that stays the same even
    when the decl is copied by the inliner once it is set.  */
-#define DECL_PT_UID(NODE) (DECL_MINIMAL_CHECK (NODE)->decl_minimal.pt_uid == -1u ? (NODE)->decl_minimal.uid : (NODE)->decl_minimal.pt_uid)
+#define DECL_PT_UID(NODE) (DECL_COMMON_CHECK (NODE)->decl_common.pt_uid == -1u ? (NODE)->decl_minimal.uid : (NODE)->decl_common.pt_uid)
 /* Initialize the ..._DECL node pt-uid to the decls uid.  */
-#define SET_DECL_PT_UID(NODE, UID) (DECL_MINIMAL_CHECK (NODE)->decl_minimal.pt_uid = (UID))
+#define SET_DECL_PT_UID(NODE, UID) (DECL_COMMON_CHECK (NODE)->decl_common.pt_uid = (UID))
 /* Whether the ..._DECL node pt-uid has been initialized and thus needs to
    be preserved when copyin the decl.  */
-#define DECL_PT_UID_SET_P(NODE) (DECL_MINIMAL_CHECK (NODE)->decl_minimal.pt_uid != -1u)
+#define DECL_PT_UID_SET_P(NODE) (DECL_COMMON_CHECK (NODE)->decl_common.pt_uid != -1u)
 
 /* These two fields describe where in the source code the declaration
    was.  If the declaration appears in several places (as for a C
@@ -2521,7 +2521,6 @@ struct GTY(()) tree_decl_minimal {
   struct tree_common common;
   location_t locus;
   unsigned int uid;
-  unsigned int pt_uid;
   tree name;
   tree context;
 };
@@ -2720,6 +2719,9 @@ struct GTY(()) tree_decl_common {
   /* DECL_ALIGN.  It should have the same size as TYPE_ALIGN.  */
   unsigned int align;
 
+  /* UID for points-to sets, stable over copying from inlining.  */
+  unsigned int pt_uid;
+
   tree size_unit;
   tree initial;
   tree attributes;