Merge with trunk.

[thirdparty/gcc.git] / gcc / java / jcf-parse.c

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index b6f099a921d5bcc275c5d3c317385ba995bbda4c..5c84ddb711d484cc675afb9bd6c92bfe675931bf 100644 (file)
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -41,6 +41,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "cgraph.h"
 #include "bitmap.h"
 #include "target.h"
+#include "wide-int.h"
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
@@ -1041,14 +1042,13 @@ get_constant (JCF *jcf, int index)
     case CONSTANT_Long:
       {
        unsigned HOST_WIDE_INT num;
-       double_int val;
 
        num = JPOOL_UINT (jcf, index);
-       val = double_int::from_uhwi (num).llshift (32, 64);
+       wide_int val = wi::lshift (wide_int::from (num, 64, SIGNED), 32);
        num = JPOOL_UINT (jcf, index + 1);
-       val |= double_int::from_uhwi (num);
+       val |= num;
 
-       value = double_int_to_tree (long_type_node, val);
+       value = wide_int_to_tree (long_type_node, val);
        break;
       }