diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 274af16b7a9..e9652f85439 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-09  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* calls.c (mem_overlaps_already_clobbered_arg_p): Use SBITMAP_SIZE
+	instead of looking at sbitmap n_bits member directly.
+	* gcse.c (hoist_code): Likewise.
+	* sched-rgn.c (split_edges): Likewise.
+	* tree-into-ssa.c (is_old_name, is_new_name, add_new_name_mapping,
+	update_ssa): Likewise.
+
 2012-08-09  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.h (LIMIT_RELOAD_CLASS): Return preferred
diff --git a/gcc/calls.c b/gcc/calls.c
index d4bcd7b67d4..5bc1b1ebb87 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -1850,7 +1850,7 @@ mem_overlaps_already_clobbered_arg_p (rtx addr, unsigned HOST_WIDE_INT size)
       unsigned HOST_WIDE_INT k;
 
       for (k = 0; k < size; k++)
-	if (i + k < stored_args_map->n_bits
+	if (i + k < SBITMAP_SIZE (stored_args_map)
 	    && TEST_BIT (stored_args_map, i + k))
 	  return true;
     }
diff --git a/gcc/gcse.c b/gcc/gcse.c
index f7c42d20092..fd285de5d88 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -2982,7 +2982,7 @@ hoist_code (void)
 
       /* Examine each expression that is very busy at the exit of this
 	 block.  These are the potentially hoistable expressions.  */
-      for (i = 0; i < hoist_vbeout[bb->index]->n_bits; i++)
+      for (i = 0; i < SBITMAP_SIZE (hoist_vbeout[bb->index]); i++)
 	{
 	  if (TEST_BIT (hoist_vbeout[bb->index], i))
 	    {
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 1dd0d814a45..0498cede694 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -1455,7 +1455,7 @@ compute_dom_prob_ps (int bb)
 static void
 split_edges (int bb_src, int bb_trg, edgelst *bl)
 {
-  sbitmap src = sbitmap_alloc (pot_split[bb_src]->n_bits);
+  sbitmap src = sbitmap_alloc (SBITMAP_SIZE (pot_split[bb_src]));
   sbitmap_copy (src, pot_split[bb_src]);
 
   sbitmap_difference (src, src, pot_split[bb_trg]);
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 52f0bdc71a9..3e0c817b23b 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -588,7 +588,8 @@ is_old_name (tree name)
   unsigned ver = SSA_NAME_VERSION (name);
   if (!new_ssa_names)
     return false;
-  return ver < new_ssa_names->n_bits && TEST_BIT (old_ssa_names, ver);
+  return (ver < SBITMAP_SIZE (new_ssa_names)
+	  && TEST_BIT (old_ssa_names, ver));
 }
 
 
@@ -600,7 +601,8 @@ is_new_name (tree name)
   unsigned ver = SSA_NAME_VERSION (name);
   if (!new_ssa_names)
     return false;
-  return ver < new_ssa_names->n_bits && TEST_BIT (new_ssa_names, ver);
+  return (ver < SBITMAP_SIZE (new_ssa_names)
+	  && TEST_BIT (new_ssa_names, ver));
 }
 
 
@@ -640,7 +642,7 @@ add_new_name_mapping (tree new_tree, tree old)
 
   /* We may need to grow NEW_SSA_NAMES and OLD_SSA_NAMES because our
      caller may have created new names since the set was created.  */
-  if (new_ssa_names->n_bits <= num_ssa_names - 1)
+  if (SBITMAP_SIZE (new_ssa_names) <= num_ssa_names - 1)
     {
       unsigned int new_sz = num_ssa_names + NAME_SETS_GROWTH_FACTOR;
       new_ssa_names = sbitmap_resize (new_ssa_names, new_sz, 0);
@@ -3247,7 +3249,7 @@ update_ssa (unsigned update_flags)
 	     will grow while we are traversing it (but it will not
 	     gain any new members).  Copy OLD_SSA_NAMES to a temporary
 	     for traversal.  */
-	  sbitmap tmp = sbitmap_alloc (old_ssa_names->n_bits);
+	  sbitmap tmp = sbitmap_alloc (SBITMAP_SIZE (old_ssa_names));
 	  sbitmap_copy (tmp, old_ssa_names);
 	  EXECUTE_IF_SET_IN_SBITMAP (tmp, 0, i, sbi)
 	    insert_updated_phi_nodes_for (ssa_name (i), dfs, blocks_to_update,