Skip to content

Commit e78fd46

Browse files
committed
8310735: Build failure after JDK-8310577 with GCC8
Reviewed-by: lucy
1 parent 4bf7816 commit e78fd46

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/hotspot/share/c1/c1_ValueMap.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ class ShortLoopOptimizer : public ValueNumberingVisitor {
281281
}
282282
void kill_array(ValueType* type) {
283283
current_map()->kill_array(type);
284-
BasicType basic_type = as_BasicType(type); assert(basic_type >= 0 && basic_type < T_VOID, "Invalid type");
284+
BasicType basic_type = as_BasicType(type); assert(basic_type < T_VOID, "Invalid type");
285285
_has_indexed_store[basic_type] = true;
286286
}
287287

@@ -298,12 +298,12 @@ class ShortLoopOptimizer : public ValueNumberingVisitor {
298298
}
299299

300300
bool has_field_store(BasicType type) {
301-
assert(type >= 0 && type < T_VOID, "Invalid type");
301+
assert(type < T_VOID, "Invalid type");
302302
return _has_field_store[type];
303303
}
304304

305305
bool has_indexed_store(BasicType type) {
306-
assert(type >= 0 && type < T_VOID, "Invalid type");
306+
assert(type < T_VOID, "Invalid type");
307307
return _has_indexed_store[type];
308308
}
309309

src/hotspot/share/oops/arrayOop.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class arrayOopDesc : public oopDesc {
138138
// overflow. We also need to make sure that this will not overflow a size_t on
139139
// 32 bit platforms when we convert it to a byte size.
140140
static int32_t max_array_length(BasicType type) {
141-
assert(type >= 0 && type < T_CONFLICT, "wrong type");
141+
assert(type < T_CONFLICT, "wrong type");
142142
assert(type2aelembytes(type) != 0, "wrong type");
143143

144144
const size_t max_element_words_per_size_t =

0 commit comments

Comments
 (0)