diff options
| author | Kenneth Zadeck <zadeck@naturalbridge.com> | 2014-05-06 16:25:05 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 2014-05-06 16:25:05 +0000 |
| commit | 807e902eea17f3132488c256c963823976b2348c (patch) | |
| tree | e5e1af94eb1502ba893bd6ce4a11f68877ff62a9 /gcc/tree-object-size.c | |
| parent | 6122336c832dc4dfedc49279549caddce86306ff (diff) | |
Merge in wide-int.
From-SVN: r210113
Diffstat (limited to 'gcc/tree-object-size.c')
| -rw-r--r-- | gcc/tree-object-size.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c index 1596b7d1120..3c606b02d41 100644 --- a/gcc/tree-object-size.c +++ b/gcc/tree-object-size.c @@ -154,7 +154,7 @@ compute_object_offset (const_tree expr, const_tree var) case MEM_REF: gcc_assert (TREE_CODE (TREE_OPERAND (expr, 0)) == ADDR_EXPR); - return double_int_to_tree (sizetype, mem_ref_offset (expr)); + return wide_int_to_tree (sizetype, mem_ref_offset (expr)); default: return error_mark_node; @@ -204,10 +204,10 @@ addr_object_size (struct object_size_info *osi, const_tree ptr, } if (sz != unknown[object_size_type]) { - double_int dsz = double_int::from_uhwi (sz) - mem_ref_offset (pt_var); - if (dsz.is_negative ()) + offset_int dsz = wi::sub (sz, mem_ref_offset (pt_var)); + if (wi::neg_p (dsz)) sz = 0; - else if (dsz.fits_uhwi ()) + else if (wi::fits_uhwi_p (dsz)) sz = dsz.to_uhwi (); else sz = unknown[object_size_type]; |