10a02c49dd
- Patch hotspot to not use undefined code rather than passing -fno-tree-vrp via CFLAGS. This is an updated fix for RHBZ#1208369. - Add upstream patch for DNS nameserver issue with IPv6 addresses. Resolves: RHBZ#1210739
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
diff --git a/src/share/vm/opto/type.cpp b/src/share/vm/opto/type.cpp
|
|
--- jdk8/hotspot/src/share/vm/opto/type.cpp
|
|
+++ jdk8/hotspot/src/share/vm/opto/type.cpp
|
|
@@ -1158,11 +1158,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;
|
|
}
|
|
@@ -1416,11 +1416,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;
|
|
}
|