/hg/icedtea7-forest/hotspot: 8078666, PR2326: JVM fastdebug buil...

[andrew at icedtea.classpath.org]

changeset c0ca0821c737 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=c0ca0821c737
author: sgehwolf
date: Wed Apr 29 12:23:48 2015 -0700

	8078666, PR2326: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
	Summary: do the math on the unsigned type where overflows are well defined
	Reviewed-by: kvn, aph


diffstat:

 src/share/vm/opto/type.cpp |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (35 lines):

diff -r 1bdef44123cd -r c0ca0821c737 src/share/vm/opto/type.cpp
--- a/src/share/vm/opto/type.cpp	Thu May 07 18:35:46 2015 +0100
+++ b/src/share/vm/opto/type.cpp	Wed Apr 29 12:23:48 2015 -0700
@@ -1103,11 +1103,11 @@
   // Certain normalizations keep us sane when comparing types.
   // The 'SMALLINT' covers constants and also CC and its relatives.
   if (lo <= hi) {
-    if ((juint)(hi - lo) <= SMALLINT)  w = Type::WidenMin;
-    if ((juint)(hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
+    if (((juint)hi - lo) <= SMALLINT)  w = Type::WidenMin;
+    if (((juint)hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
   } else {
-    if ((juint)(lo - hi) <= SMALLINT)  w = Type::WidenMin;
-    if ((juint)(lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
+    if (((juint)lo - hi) <= SMALLINT)  w = Type::WidenMin;
+    if (((juint)lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
   }
   return w;
 }
@@ -1358,11 +1358,11 @@
   // Certain normalizations keep us sane when comparing types.
   // The 'SMALLINT' covers constants.
   if (lo <= hi) {
-    if ((julong)(hi - lo) <= SMALLINT)   w = Type::WidenMin;
-    if ((julong)(hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
+    if (((julong)hi - lo) <= SMALLINT)   w = Type::WidenMin;
+    if (((julong)hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
   } else {
-    if ((julong)(lo - hi) <= SMALLINT)   w = Type::WidenMin;
-    if ((julong)(lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
+    if (((julong)lo - hi) <= SMALLINT)   w = Type::WidenMin;
+    if (((julong)lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
   }
   return w;
 }