archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8324341: Remove redundant preprocessor #if's checks

Browse source 
Reviewed-by: kvn, ayang
This commit is contained in:
Cesar Soares Lucas 2024-05-29 09:36:13 +00:00 • committed by Albert Mingkun Yang
parent 9b64ece514
commit 6d718ae51a
6 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
View file

@ -5631,7 +5631,6 @@ void C2_MacroAssembler::vector_mask_compress(KRegister dst, KRegister src, Regis
kmov(dst, rtmp2); kmov(dst, rtmp2);
} }
#ifdef _LP64
void C2_MacroAssembler::vector_compress_expand_avx2(int opcode, XMMRegister dst, XMMRegister src, void C2_MacroAssembler::vector_compress_expand_avx2(int opcode, XMMRegister dst, XMMRegister src,
XMMRegister mask, Register rtmp, Register rscratch, XMMRegister mask, Register rtmp, Register rscratch,
XMMRegister permv, XMMRegister xtmp, BasicType bt, XMMRegister permv, XMMRegister xtmp, BasicType bt,
@ -5665,7 +5664,6 @@ void C2_MacroAssembler::vector_compress_expand_avx2(int opcode, XMMRegister dst,
// compressing/expanding the source vector lanes. // compressing/expanding the source vector lanes.
vblendvps(dst, dst, xtmp, permv, vec_enc, false, permv); vblendvps(dst, dst, xtmp, permv, vec_enc, false, permv);
} }
#endif
void C2_MacroAssembler::vector_compress_expand(int opcode, XMMRegister dst, XMMRegister src, KRegister mask, void C2_MacroAssembler::vector_compress_expand(int opcode, XMMRegister dst, XMMRegister src, KRegister mask,
bool merge, BasicType bt, int vec_enc) { bool merge, BasicType bt, int vec_enc) {

2
src/hotspot/share/c1/c1_LIR.cpp
View file

@ -196,14 +196,12 @@ void LIR_Op2::verify() const {
if (two_operand_lir_form) { if (two_operand_lir_form) {
#ifdef ASSERT
bool threeOperandForm = false; bool threeOperandForm = false;
#ifdef S390 #ifdef S390
// There are 3 operand shifts on S390 (see LIR_Assembler::shift_op()). // There are 3 operand shifts on S390 (see LIR_Assembler::shift_op()).
threeOperandForm = threeOperandForm =
code() == lir_shl || code() == lir_shl ||
((code() == lir_shr || code() == lir_ushr) && (result_opr()->is_double_cpu() || in_opr1()->type() == T_OBJECT)); ((code() == lir_shr || code() == lir_ushr) && (result_opr()->is_double_cpu() || in_opr1()->type() == T_OBJECT));
#endif
#endif #endif
switch (code()) { switch (code()) {

2
src/hotspot/share/classfile/modules.cpp
View file

@ -560,9 +560,7 @@ void Modules::verify_archived_modules() {
ModuleEntry::verify_archived_module_entries(); ModuleEntry::verify_archived_module_entries();
} }
#if INCLUDE_CDS_JAVA_HEAP
char* Modules::_archived_main_module_name = nullptr; char* Modules::_archived_main_module_name = nullptr;
#endif
void Modules::dump_main_module_name() { void Modules::dump_main_module_name() {
const char* module_name = Arguments::get_property("jdk.module.main"); const char* module_name = Arguments::get_property("jdk.module.main");

2
src/hotspot/share/code/nmethod.cpp
View file

@ -3997,9 +3997,7 @@ void nmethod::print_statistics() {
#endif #endif
unknown_java_nmethod_stats.print_nmethod_stats("Unknown"); unknown_java_nmethod_stats.print_nmethod_stats("Unknown");
DebugInformationRecorder::print_statistics(); DebugInformationRecorder::print_statistics();
#ifndef PRODUCT
pc_nmethod_stats.print_pc_stats(); pc_nmethod_stats.print_pc_stats();
#endif
Dependencies::print_statistics(); Dependencies::print_statistics();
if (xtty != nullptr) xtty->tail("statistics"); if (xtty != nullptr) xtty->tail("statistics");
} }

2
src/hotspot/share/opto/idealGraphPrinter.cpp
View file

@ -371,7 +371,6 @@ void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) {
head(PROPERTIES_ELEMENT); head(PROPERTIES_ELEMENT);
Node *node = n; Node *node = n;
#ifndef PRODUCT
Compile::current()->_in_dump_cnt++; Compile::current()->_in_dump_cnt++;
print_prop(NODE_NAME_PROPERTY, (const char *)node->Name()); print_prop(NODE_NAME_PROPERTY, (const char *)node->Name());
print_prop("idx", node->_idx); print_prop("idx", node->_idx);
@ -631,7 +630,6 @@ void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) {
} }
Compile::current()->_in_dump_cnt--; Compile::current()->_in_dump_cnt--;
#endif
tail(PROPERTIES_ELEMENT); tail(PROPERTIES_ELEMENT);
tail(NODE_ELEMENT); tail(NODE_ELEMENT);

6
src/hotspot/share/runtime/deoptimization.cpp
View file

@ -1239,15 +1239,11 @@ bool Deoptimization::realloc_objects(JavaThread* thread, frame* fr, RegisterMap*
InstanceKlass* ik = InstanceKlass::cast(k); InstanceKlass* ik = InstanceKlass::cast(k);
if (obj == nullptr && !cache_init_error) { if (obj == nullptr && !cache_init_error) {
InternalOOMEMark iom(THREAD); InternalOOMEMark iom(THREAD);
#if COMPILER2_OR_JVMCI
if (EnableVectorSupport && VectorSupport::is_vector(ik)) { if (EnableVectorSupport && VectorSupport::is_vector(ik)) {
obj = VectorSupport::allocate_vector(ik, fr, reg_map, sv, THREAD); obj = VectorSupport::allocate_vector(ik, fr, reg_map, sv, THREAD);
} else { } else {
obj = ik->allocate_instance(THREAD); obj = ik->allocate_instance(THREAD);
} }
#else
obj = ik->allocate_instance(THREAD);
#endif // COMPILER2_OR_JVMCI
} }
} else if (k->is_typeArray_klass()) { } else if (k->is_typeArray_klass()) {
TypeArrayKlass* ak = TypeArrayKlass::cast(k); TypeArrayKlass* ak = TypeArrayKlass::cast(k);
@ -1577,7 +1573,6 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr
continue; continue;
} }
#endif // INCLUDE_JVMCI #endif // INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
if (EnableVectorSupport && VectorSupport::is_vector(k)) { if (EnableVectorSupport && VectorSupport::is_vector(k)) {
assert(sv->field_size() == 1, "%s not a vector", k->name()->as_C_string()); assert(sv->field_size() == 1, "%s not a vector", k->name()->as_C_string());
ScopeValue* payload = sv->field_at(0); ScopeValue* payload = sv->field_at(0);
@ -1597,7 +1592,6 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr
// Else fall-through to do assignment for scalar-replaced boxed vector representation // Else fall-through to do assignment for scalar-replaced boxed vector representation
// which could be restored after vector object allocation. // which could be restored after vector object allocation.
} }
#endif /* !COMPILER2_OR_JVMCI */
if (k->is_instance_klass()) { if (k->is_instance_klass()) {
InstanceKlass* ik = InstanceKlass::cast(k); InstanceKlass* ik = InstanceKlass::cast(k);
reassign_fields_by_klass(ik, fr, reg_map, sv, 0, obj(), skip_internal); reassign_fields_by_klass(ik, fr, reg_map, sv, 0, obj(), skip_internal);