Makefile.in (INTERNAL_FN_DEF, [...]): Define.

[gcc.git] / gcc / tree-ssa-structalias.c

diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 97719ff8473805f36b994d9a029902a6377e3984..70405a16137f629874348ec9541f3c619e052c44 100644 (file)
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -2941,12 +2941,11 @@ process_constraint (constraint_t t)
 static HOST_WIDE_INT
 bitpos_of_field (const tree fdecl)
 {
-
   if (!host_integerp (DECL_FIELD_OFFSET (fdecl), 0)
       || !host_integerp (DECL_FIELD_BIT_OFFSET (fdecl), 0))
     return -1;
 
-  return (TREE_INT_CST_LOW (DECL_FIELD_OFFSET (fdecl)) * 8
+  return (TREE_INT_CST_LOW (DECL_FIELD_OFFSET (fdecl)) * BITS_PER_UNIT
          + TREE_INT_CST_LOW (DECL_FIELD_BIT_OFFSET (fdecl)));
 }
 
@@ -4027,6 +4026,8 @@ get_fi_for_callee (gimple call)
 {
   tree decl;
 
+  gcc_assert (!gimple_call_internal_p (call));
+
   /* If we can directly resolve the function being called, do so.
      Otherwise, it must be some sort of indirect expression that
      we should still be able to handle.  */
@@ -4320,6 +4321,7 @@ find_func_aliases (gimple origt)
            /* Fallthru to general call handling.  */;
          }
       if (!in_ipa_mode
+         || gimple_call_internal_p (t)
          || (fndecl
              && (!(fi = lookup_vi_for_tree (fndecl))
                  || !fi->is_fn_info)))