diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-04-02 21:34:21 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-04-02 21:34:21 +0000 |
| commit | c002f63577ad8e2e7623def89eb000861760e72c (patch) | |
| tree | 9e006139b408e634843b278a81b182a89650b862 /gcc/tree-dfa.c | |
| parent | aa7e537c6a038e81382606468e484576c2cee3d5 (diff) | |
| download | gcc-c002f63577ad8e2e7623def89eb000861760e72c.tar.gz | |
Fixup merge conflicts.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@209039 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-dfa.c')
| -rw-r--r-- | gcc/tree-dfa.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c index 068984f2f28..82b9b51227b 100644 --- a/gcc/tree-dfa.c +++ b/gcc/tree-dfa.c @@ -48,6 +48,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-inline.h" #include "tree-pass.h" #include "params.h" +#include "wide-int.h" /* Build and maintain data flow information for trees. */ @@ -406,7 +407,7 @@ get_ref_base_and_extent (tree exp, HOST_WIDE_INT *poffset, if (mode == BLKmode) size_tree = TYPE_SIZE (TREE_TYPE (exp)); else - bitsize = wi::to_offset (GET_MODE_BITSIZE (mode)); + bitsize = int(GET_MODE_BITSIZE (mode)); } if (size_tree != NULL_TREE && TREE_CODE (size_tree) == INTEGER_CST) @@ -461,11 +462,11 @@ get_ref_base_and_extent (tree exp, HOST_WIDE_INT *poffset, else { offset_int tem = (wi::to_offset (ssize) - - wi::to_offset (fsize); + - wi::to_offset (fsize)); if (BITS_PER_UNIT == 8) tem = wi::lshift (tem, 3); else - tem *= wi::to_offset (BITS_PER_UNIT); + tem *= BITS_PER_UNIT; tem -= woffset; maxsize += tem; } @@ -656,7 +657,7 @@ get_ref_base_and_extent (tree exp, HOST_WIDE_INT *poffset, negative bit_offset here. We might want to store a zero offset in this case. */ *poffset = bit_offset.to_shwi (); - if (!wi::fits_shwi (maxsize) || wi::neg_p (maxsize)) + if (!wi::fits_shwi_p (maxsize) || wi::neg_p (maxsize)) *pmax_size = -1; else *pmax_size = maxsize.to_shwi (); |