Index: gcc/tree-ssa-loop-ivopts.c
===================================================================
--- gcc/tree-ssa-loop-ivopts.c	(revision 200774)
+++ gcc/tree-ssa-loop-ivopts.c	(working copy)
@@ -2133,19 +2133,28 @@ strip_offset_1 (tree expr, bool inside_addr, bool
       break;
 
     case COMPONENT_REF:
-      if (!inside_addr)
-	return orig_expr;
+      {
+	tree field;
+	HOST_WIDE_INT boffset = 0;
+	if (!inside_addr)
+	  return orig_expr;
 
-      tmp = component_ref_field_offset (expr);
-      if (top_compref
-	  && cst_and_fits_in_hwi (tmp))
-	{
-	  /* Strip the component reference completely.  */
-	  op0 = TREE_OPERAND (expr, 0);
-	  op0 = strip_offset_1 (op0, inside_addr, top_compref, &off0);
-	  *offset = off0 + int_cst_value (tmp);
-	  return op0;
-	}
+	field = TREE_OPERAND (expr, 1);
+	if (DECL_FIELD_BIT_OFFSET (field)
+	    && cst_and_fits_in_hwi (DECL_FIELD_BIT_OFFSET (field)))
+	  boffset = int_cst_value (DECL_FIELD_BIT_OFFSET (field));
+
+	tmp = component_ref_field_offset (expr);
+	if (top_compref
+	    && cst_and_fits_in_hwi (tmp))
+	  {
+	    /* Strip the component reference completely.  */
+	    op0 = TREE_OPERAND (expr, 0);
+	    op0 = strip_offset_1 (op0, inside_addr, top_compref, &off0);
+	    *offset = off0 + int_cst_value (tmp) + boffset / BITS_PER_UNIT;
+	    return op0;
+	  }
+      }
       break;
 
     case ADDR_EXPR:
@@ -4133,6 +4142,9 @@ get_computation_cost_at (struct ivopts_data *data,
         bitmap_clear (*depends_on);
     }
 
+  /* Sign-extend offset if utype has lower precision than HOST_WIDE_INT.  */
+  offset = sext_hwi (offset, TYPE_PRECISION (utype));
+
   /* If we are after the increment, the value of the candidate is higher by
      one iteration.  */
   if (stmt_is_after_inc)