stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux

Browse Source 
Reviewed-by: stuefe, coleenp, roland
This commit is contained in:
Goetz Lindenmaier 2015-10-22 13:07:10 -04:00
parent f21d1afd70
commit 83b3b21342
40 changed files with 129 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/agent/src/os/linux/symtab.c
View File

@ -545,6 +545,7 @@ uintptr_t search_symbol(struct symtab* symtab, uintptr_t base,
return (uintptr_t)NULL;
item.key = (char*) strdup(sym_name);
item.data = NULL;
hsearch_r(item, FIND, &ret, symtab->hash_table);
if (ret) {
struct elf_symbol * sym = (struct elf_symbol *)(ret->data);

2
hotspot/make/linux/makefiles/gcc.make
View File

@ -223,6 +223,8 @@ ifeq ($(USE_CLANG),)
WARNING_FLAGS += -Wtype-limits
# GCC < 4.8 don't accept this flag for C++.
WARNING_FLAGS += -Wno-format-zero-length
# GCC 4.8 reports less false positives than the older compilers.
WARNING_FLAGS += -Wuninitialized
endif
endif

17
hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
View File

@ -1667,8 +1667,8 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
Register Rtmp1 = noreg;
// check if it needs to be profiled
ciMethodData* md;
ciProfileData* data;
ciMethodData* md = NULL;
ciProfileData* data = NULL;
if (op->should_profile()) {
ciMethod* method = op->profiled_method();
@ -1827,8 +1827,8 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
CodeStub* stub = op->stub();
// check if it needs to be profiled
ciMethodData* md;
ciProfileData* data;
ciMethodData* md = NULL;
ciProfileData* data = NULL;
if (op->should_profile()) {
ciMethod* method = op->profiled_method();
@ -2005,7 +2005,8 @@ void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, L
case lir_cond_greater: acond = Assembler::greater; ncond = Assembler::lessEqual; break;
case lir_cond_belowEqual: acond = Assembler::belowEqual; ncond = Assembler::above; break;
case lir_cond_aboveEqual: acond = Assembler::aboveEqual; ncond = Assembler::below; break;
default: ShouldNotReachHere();
default: acond = Assembler::equal; ncond = Assembler::notEqual;
ShouldNotReachHere();
}
if (opr1->is_cpu_register()) {
@ -3182,27 +3183,23 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
assert(default_type != NULL && default_type->is_array_klass() && default_type->is_loaded(), "must be true at this point");
int elem_size = type2aelembytes(basic_type);
int shift_amount;
Address::ScaleFactor scale;
switch (elem_size) {
case 1 :
shift_amount = 0;
scale = Address::times_1;
break;
case 2 :
shift_amount = 1;
scale = Address::times_2;
break;
case 4 :
shift_amount = 2;
scale = Address::times_4;
break;
case 8 :
shift_amount = 3;
scale = Address::times_8;
break;
default:
scale = Address::no_scale;
ShouldNotReachHere();
}

6
hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
View File

@ -195,7 +195,7 @@ LIR_Address* LIRGenerator::emit_array_address(LIR_Opr array_opr, LIR_Opr index_o
LIR_Opr LIRGenerator::load_immediate(int x, BasicType type) {
LIR_Opr r;
LIR_Opr r = NULL;
if (type == T_LONG) {
r = LIR_OprFact::longConst(x);
} else if (type == T_INT) {
@ -484,7 +484,7 @@ void LIRGenerator::do_ArithmeticOp_Long(ArithmeticOp* x) {
__ cmp(lir_cond_equal, right.result(), LIR_OprFact::longConst(0));
__ branch(lir_cond_equal, T_LONG, new DivByZeroStub(info));
address entry;
address entry = NULL;
switch (x->op()) {
case Bytecodes::_lrem:
entry = CAST_FROM_FN_PTR(address, SharedRuntime::lrem);
@ -1054,7 +1054,7 @@ LIR_Opr fixed_register_for(BasicType type) {
void LIRGenerator::do_Convert(Convert* x) {
// flags that vary for the different operations and different SSE-settings
bool fixed_input, fixed_result, round_result, needs_stub;
bool fixed_input = false, fixed_result = false, round_result = false, needs_stub = false;
switch (x->op()) {
case Bytecodes::_i2l: // fall through

8
hotspot/src/cpu/x86/vm/jniFastGetField_x86_32.cpp
View File

@ -48,7 +48,7 @@ GetDoubleField_t JNI_FastGetField::jni_fast_GetDoubleField_fp;
// between loads, which is much more efficient than lfence.
address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
const char *name;
const char *name = NULL;
switch (type) {
case T_BOOLEAN: name = "jni_fast_GetBooleanField"; break;
case T_BYTE: name = "jni_fast_GetByteField"; break;
@ -122,7 +122,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
slowcase_entry_pclist[count++] = __ pc();
__ bind (slow);
address slow_case_addr;
address slow_case_addr = NULL;
switch (type) {
case T_BOOLEAN: slow_case_addr = jni_GetBooleanField_addr(); break;
case T_BYTE: slow_case_addr = jni_GetByteField_addr(); break;
@ -256,7 +256,7 @@ address JNI_FastGetField::generate_fast_get_long_field() {
}
address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
const char *name;
const char *name = NULL;
switch (type) {
case T_FLOAT: name = "jni_fast_GetFloatField"; break;
case T_DOUBLE: name = "jni_fast_GetDoubleField"; break;
@ -337,7 +337,7 @@ address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
slowcase_entry_pclist[count++] = __ pc();
__ bind (slow);
address slow_case_addr;
address slow_case_addr = NULL;
switch (type) {
case T_FLOAT: slow_case_addr = jni_GetFloatField_addr(); break;
case T_DOUBLE: slow_case_addr = jni_GetDoubleField_addr(); break;

8
hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp
View File

@ -51,7 +51,7 @@ static const Register rcounter_addr = r11;
// since that may scratch r10!
address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
const char *name;
const char *name = NULL;
switch (type) {
case T_BOOLEAN: name = "jni_fast_GetBooleanField"; break;
case T_BYTE: name = "jni_fast_GetByteField"; break;
@ -111,7 +111,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
slowcase_entry_pclist[count++] = __ pc();
__ bind (slow);
address slow_case_addr;
address slow_case_addr = NULL;
switch (type) {
case T_BOOLEAN: slow_case_addr = jni_GetBooleanField_addr(); break;
case T_BYTE: slow_case_addr = jni_GetByteField_addr(); break;
@ -153,7 +153,7 @@ address JNI_FastGetField::generate_fast_get_long_field() {
}
address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
const char *name;
const char *name = NULL;
switch (type) {
case T_FLOAT: name = "jni_fast_GetFloatField"; break;
case T_DOUBLE: name = "jni_fast_GetDoubleField"; break;
@ -206,7 +206,7 @@ address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
slowcase_entry_pclist[count++] = __ pc();
__ bind (slow);
address slow_case_addr;
address slow_case_addr = NULL;
switch (type) {
case T_FLOAT: slow_case_addr = jni_GetFloatField_addr(); break;
case T_DOUBLE: slow_case_addr = jni_GetDoubleField_addr();

8
hotspot/src/os/linux/vm/os_linux.cpp
View File

@ -2794,7 +2794,7 @@ char *os::scan_pages(char *start, char* end, page_info* page_expected,
int os::Linux::sched_getcpu_syscall(void) {
unsigned int cpu;
unsigned int cpu = 0;
int retval = -1;
#if defined(IA32)
@ -4187,8 +4187,8 @@ static bool call_chained_handler(struct sigaction *actp, int sig,
sigaddset(&(actp->sa_mask), sig);
}
sa_handler_t hand;
sa_sigaction_t sa;
sa_handler_t hand = NULL;
sa_sigaction_t sa = NULL;
bool siginfo_flag_set = (actp->sa_flags & SA_SIGINFO) != 0;
// retrieve the chained handler
if (siginfo_flag_set) {
@ -4393,7 +4393,7 @@ jlong os::Linux::fast_thread_cpu_time(clockid_t clockid) {
static const char* get_signal_handler_name(address handler,
char* buf, int buflen) {
int offset;
int offset = 0;
bool found = os::dll_address_to_library_name(handler, buf, buflen, &offset);
if (found) {
// skip directory names

6
hotspot/src/os_cpu/linux_x86/vm/copy_linux_x86.inline.hpp
View File

@ -30,7 +30,7 @@ static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) {
(void)memmove(to, from, count * HeapWordSize);
#else
// Includes a zero-count check.
intx temp;
intx temp = 0;
__asm__ volatile(" testl %6,%6 ;"
" jz 7f ;"
" cmpl %4,%5 ;"
@ -88,7 +88,7 @@ static void pd_disjoint_words(HeapWord* from, HeapWord* to, size_t count) {
}
#else
// Includes a zero-count check.
intx temp;
intx temp = 0;
__asm__ volatile(" testl %6,%6 ;"
" jz 3f ;"
" cmpl $32,%6 ;"
@ -145,7 +145,7 @@ static void pd_conjoint_bytes(void* from, void* to, size_t count) {
(void)memmove(to, from, count);
#else
// Includes a zero-count check.
intx temp;
intx temp = 0;
__asm__ volatile(" testl %6,%6 ;"
" jz 13f ;"
" cmpl %4,%5 ;"

5
hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
View File

@ -639,7 +639,7 @@ void Canonicalizer::do_If(If* x) {
if (l == r && !lt->is_float_kind()) {
// pattern: If (a cond a) => simplify to Goto
BlockBegin* sux;
BlockBegin* sux = NULL;
switch (x->cond()) {
case If::eql: sux = x->sux_for(true); break;
case If::neq: sux = x->sux_for(false); break;
@ -647,6 +647,7 @@ void Canonicalizer::do_If(If* x) {
case If::leq: sux = x->sux_for(true); break;
case If::gtr: sux = x->sux_for(false); break;
case If::geq: sux = x->sux_for(true); break;
default: ShouldNotReachHere();
}
// If is a safepoint then the debug information should come from the state_before of the If.
set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));
@ -684,7 +685,7 @@ void Canonicalizer::do_If(If* x) {
} else {
// two successors differ and two successors are the same => simplify to: If (x cmp y)
// determine new condition & successors
If::Condition cond;
If::Condition cond = If::eql;
BlockBegin* tsux = NULL;
BlockBegin* fsux = NULL;
if (lss_sux == eql_sux) { cond = If::leq; tsux = lss_sux; fsux = gtr_sux; }

4
hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
View File

@ -3823,8 +3823,8 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, Bytecode
caller_state->truncate_stack(args_base);
assert(callee_state->stack_size() == 0, "callee stack must be empty");
Value lock;
BlockBegin* sync_handler;
Value lock = NULL;
BlockBegin* sync_handler = NULL;
// Inline the locking of the receiver if the callee is synchronized
if (callee->is_synchronized()) {

4
hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
View File

@ -3348,7 +3348,7 @@ void LIRGenerator::do_ProfileInvoke(ProfileInvoke* x) {
}
void LIRGenerator::increment_event_counter(CodeEmitInfo* info, int bci, bool backedge) {
int freq_log;
int freq_log = 0;
int level = compilation()->env()->comp_level();
if (level == CompLevel_limited_profile) {
freq_log = (backedge ? Tier2BackedgeNotifyFreqLog : Tier2InvokeNotifyFreqLog);
@ -3394,7 +3394,7 @@ void LIRGenerator::increment_event_counter_impl(CodeEmitInfo* info,
assert(level > CompLevel_simple, "Shouldn't be here");
int offset = -1;
LIR_Opr counter_holder;
LIR_Opr counter_holder = NULL;
if (level == CompLevel_limited_profile) {
MethodCounters* counters_adr = method->ensure_method_counters();
if (counters_adr == NULL) {

3
hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
View File

@ -409,7 +409,7 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure {
}
static LIR_Condition lir_cond(If::Condition cond) {
LIR_Condition l;
LIR_Condition l = lir_cond_unknown;
switch (cond) {
case If::eql: l = lir_cond_equal; break;
case If::neq: l = lir_cond_notEqual; break;
@ -419,6 +419,7 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure {
case If::gtr: l = lir_cond_greater; break;
case If::aeq: l = lir_cond_aboveEqual; break;
case If::beq: l = lir_cond_belowEqual; break;
default: fatal("You must pass valid If::Condition");
};
return l;
}

1
hotspot/src/share/vm/ci/ciObjectFactory.cpp
View File

@ -414,6 +414,7 @@ void ciObjectFactory::ensure_metadata_alive(ciMetadata* m) {
metadata_owner_klass = m->as_method()->get_Method()->constants()->pool_holder();
} else {
fatal("Not implemented for other types of metadata");
return;
}
oop metadata_holder = metadata_owner_klass->klass_holder();

46
hotspot/src/share/vm/classfile/classFileParser.cpp
View File

@ -3211,19 +3211,19 @@ void ClassFileParser::layout_fields(Handle class_loader,
// Field size and offset computation
int nonstatic_field_size = _super_klass() == NULL ? 0 : _super_klass()->nonstatic_field_size();
int next_static_oop_offset;
int next_static_double_offset;
int next_static_word_offset;
int next_static_short_offset;
int next_static_byte_offset;
int next_nonstatic_oop_offset;
int next_nonstatic_double_offset;
int next_nonstatic_word_offset;
int next_nonstatic_short_offset;
int next_nonstatic_byte_offset;
int first_nonstatic_oop_offset;
int next_nonstatic_field_offset;
int next_nonstatic_padded_offset;
int next_static_oop_offset = 0;
int next_static_double_offset = 0;
int next_static_word_offset = 0;
int next_static_short_offset = 0;
int next_static_byte_offset = 0;
int next_nonstatic_oop_offset = 0;
int next_nonstatic_double_offset = 0;
int next_nonstatic_word_offset = 0;
int next_nonstatic_short_offset = 0;
int next_nonstatic_byte_offset = 0;
int first_nonstatic_oop_offset = 0;
int next_nonstatic_field_offset = 0;
int next_nonstatic_padded_offset = 0;
// Count the contended fields by type.
//
@ -3376,14 +3376,14 @@ void ClassFileParser::layout_fields(Handle class_loader,
ShouldNotReachHere();
}
int nonstatic_oop_space_count = 0;
int nonstatic_word_space_count = 0;
int nonstatic_short_space_count = 0;
int nonstatic_byte_space_count = 0;
int nonstatic_oop_space_offset;
int nonstatic_word_space_offset;
int nonstatic_short_space_offset;
int nonstatic_byte_space_offset;
int nonstatic_oop_space_count = 0;
int nonstatic_word_space_count = 0;
int nonstatic_short_space_count = 0;
int nonstatic_byte_space_count = 0;
int nonstatic_oop_space_offset = 0;
int nonstatic_word_space_offset = 0;
int nonstatic_short_space_offset = 0;
int nonstatic_byte_space_offset = 0;
// Try to squeeze some of the fields into the gaps due to
// long/double alignment.
@ -3455,7 +3455,7 @@ void ClassFileParser::layout_fields(Handle class_loader,
// contended instance fields are handled below
if (fs.is_contended() && !fs.access_flags().is_static()) continue;
int real_offset;
int real_offset = 0;
FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
// pack the rest of the fields
@ -3589,7 +3589,7 @@ void ClassFileParser::layout_fields(Handle class_loader,
// handle statics below
if (fs.access_flags().is_static()) continue;
int real_offset;
int real_offset = 0;
FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
switch (atype) {

10
hotspot/src/share/vm/classfile/compactHashtable.cpp
View File

@ -422,7 +422,7 @@ int HashtableTextDump::scan_prefix(int* utf8_length) {
int HashtableTextDump::scan_string_prefix() {
// Expect /[0-9]+: /
int utf8_length;
int utf8_length = 0;
get_num(':', &utf8_length);
if (*_p != ' ') {
corrupted(_p, "Wrong prefix format for string");
@ -433,13 +433,13 @@ int HashtableTextDump::scan_string_prefix() {
int HashtableTextDump::scan_symbol_prefix() {
// Expect /[0-9]+ (-|)[0-9]+: /
int utf8_length;
int utf8_length = 0;
get_num(' ', &utf8_length);
if (*_p == '-') {
_p++;
if (*_p == '-') {
_p++;
}
int ref_num;
(void)get_num(':', &ref_num);
get_num(':', &ref_num);
if (*_p != ' ') {
corrupted(_p, "Wrong prefix format for symbol");
}

2
hotspot/src/share/vm/classfile/placeholders.hpp
View File

@ -220,7 +220,7 @@ class PlaceholderEntry : public HashtableEntry<Symbol*, mtClass> {
}
SeenThread* actionToQueue(PlaceholderTable::classloadAction action) {
SeenThread* queuehead;
SeenThread* queuehead = NULL;
switch (action) {
case PlaceholderTable::LOAD_INSTANCE:
queuehead = _loadInstanceThreadQ;

6
hotspot/src/share/vm/compiler/oopMap.hpp
View File

@ -73,8 +73,8 @@ public:
// Constructors
OopMapValue () { set_value(0); set_content_reg(VMRegImpl::Bad()); }
OopMapValue (VMReg reg, oop_types t) { set_reg_type(reg,t); }
OopMapValue (VMReg reg, oop_types t, VMReg reg2) { set_reg_type(reg,t); set_content_reg(reg2); }
OopMapValue (VMReg reg, oop_types t) { set_reg_type(reg, t); set_content_reg(VMRegImpl::Bad()); }
OopMapValue (VMReg reg, oop_types t, VMReg reg2) { set_reg_type(reg, t); set_content_reg(reg2); }
OopMapValue (CompressedReadStream* stream) { read_from(stream); }
// Archiving
@ -87,7 +87,7 @@ public:
void read_from(CompressedReadStream* stream) {
set_value(stream->read_int());
if(is_callee_saved() || is_derived_oop()) {
if (is_callee_saved() || is_derived_oop()) {
set_content_reg(VMRegImpl::as_VMReg(stream->read_int(), true));
}
}

4
hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
View File

@ -1795,7 +1795,7 @@ void CMSCollector::collect_in_background(GCCause::Cause cause) {
}
// Used for PrintGC
size_t prev_used;
size_t prev_used = 0;
if (PrintGC && Verbose) {
prev_used = _cmsGen->used();
}
@ -7739,7 +7739,7 @@ void SweepClosure::do_post_free_or_garbage_chunk(FreeChunk* fc,
HeapWord* const fc_addr = (HeapWord*) fc;
bool coalesce;
bool coalesce = false;
const size_t left = pointer_delta(fc_addr, freeFinger());
const size_t right = chunkSize;
switch (FLSCoalescePolicy) {

5
hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp
View File

@ -563,7 +563,7 @@ PerRegionTable* OtherRegionsTable::delete_region_table() {
assert(_n_fine_entries == _max_fine_entries, "Precondition");
PerRegionTable* max = NULL;
jint max_occ = 0;
PerRegionTable** max_prev;
PerRegionTable** max_prev = NULL;
size_t max_ind;
size_t i = _fine_eviction_start;
@ -599,6 +599,7 @@ PerRegionTable* OtherRegionsTable::delete_region_table() {
}
guarantee(max != NULL, "Since _n_fine_entries > 0");
guarantee(max_prev != NULL, "Since max != NULL.");
// Set the corresponding coarse bit.
size_t max_hrm_index = (size_t) max->hr()->hrm_index();
@ -1138,7 +1139,7 @@ void HeapRegionRemSet::print_event(outputStream* str, Event evnt) {
void HeapRegionRemSet::print_recorded() {
int cur_evnt = 0;
Event cur_evnt_kind;
Event cur_evnt_kind = Event_illegal;
int cur_evnt_ind = 0;
if (_n_recorded_events > 0) {
cur_evnt_kind = _recorded_events[cur_evnt];

2
hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp
View File

@ -222,7 +222,7 @@ class HeapRegionRemSet : public CHeapObj<mtGC> {
public:
enum Event {
Event_EvacStart, Event_EvacEnd, Event_RSUpdateEnd
Event_EvacStart, Event_EvacEnd, Event_RSUpdateEnd, Event_illegal
};
private:

2
hotspot/src/share/vm/interpreter/templateInterpreter.cpp
View File

@ -562,7 +562,7 @@ void TemplateInterpreterGenerator::generate_and_dispatch(Template* t, TosState t
if (StopInterpreterAt > 0) stop_interpreter_at();
__ verify_FPU(1, t->tos_in());
#endif // !PRODUCT
int step;
int step = 0;
if (!t->does_dispatch()) {
step = t->is_wide() ? Bytecodes::wide_length_for(t->bytecode()) : Bytecodes::length_for(t->bytecode());
if (tos_out == ilgl) tos_out = t->tos_out();

6
hotspot/src/share/vm/memory/allocation.cpp
View File

@ -66,7 +66,7 @@ void MetaspaceObj::print_address_on(outputStream* st) const {
}
void* ResourceObj::operator new(size_t size, allocation_type type, MEMFLAGS flags) throw() {
address res;
address res = NULL;
switch (type) {
case C_HEAP:
res = (address)AllocateHeap(size, flags, CALLER_PC);
@ -88,8 +88,8 @@ void* ResourceObj::operator new [](size_t size, allocation_type type, MEMFLAGS f
void* ResourceObj::operator new(size_t size, const std::nothrow_t& nothrow_constant,
allocation_type type, MEMFLAGS flags) throw() {
//should only call this with std::nothrow, use other operator new() otherwise
address res;
// should only call this with std::nothrow, use other operator new() otherwise
address res = NULL;
switch (type) {
case C_HEAP:
res = (address)AllocateHeap(size, flags, CALLER_PC, AllocFailStrategy::RETURN_NULL);

2
hotspot/src/share/vm/opto/callGenerator.cpp
View File

@ -671,7 +671,7 @@ JVMState* PredictedCallGenerator::generate(JVMState* jvms) {
&exact_receiver);
SafePointNode* slow_map = NULL;
JVMState* slow_jvms;
JVMState* slow_jvms = NULL;
{ PreserveJVMState pjvms(&kit);
kit.set_control(slow_ctl);
if (!kit.stopped()) {

2
hotspot/src/share/vm/opto/compile.cpp
View File

@ -3757,7 +3757,7 @@ void Compile::ConstantTable::emit(CodeBuffer& cb) {
MacroAssembler _masm(&cb);
for (int i = 0; i < _constants.length(); i++) {
Constant con = _constants.at(i);
address constant_addr;
address constant_addr = NULL;
switch (con.type()) {
case T_LONG: constant_addr = _masm.long_constant( con.get_jlong() ); break;
case T_FLOAT: constant_addr = _masm.float_constant( con.get_jfloat() ); break;

10
hotspot/src/share/vm/opto/compile.hpp
View File

@ -89,7 +89,7 @@ struct Final_Reshape_Counts;
typedef unsigned int node_idx_t;
class NodeCloneInfo {
private:
uint64_t _idx_clone_orig;
uint64_t _idx_clone_orig;
public:
void set_idx(node_idx_t idx) {
@ -98,17 +98,17 @@ class NodeCloneInfo {
node_idx_t idx() const { return (node_idx_t)(_idx_clone_orig & 0xFFFFFFFF); }
void set_gen(int generation) {
uint64_t g = (uint64_t)generation << 32;
uint64_t g = (uint64_t)generation << 32;
_idx_clone_orig = _idx_clone_orig & 0xFFFFFFFF | g;
}
int gen() const { return (int)(_idx_clone_orig >> 32); }
void set(uint64_t x) { _idx_clone_orig = x; }
void set(node_idx_t x, int g) { set_idx(x); set_gen(g); }
void set(uint64_t x) { _idx_clone_orig = x; }
void set(node_idx_t x, int g) { set_idx(x); set_gen(g); }
uint64_t get() const { return _idx_clone_orig; }
NodeCloneInfo(uint64_t idx_clone_orig) : _idx_clone_orig(idx_clone_orig) {}
NodeCloneInfo(node_idx_t x, int g) {set(x, g);}
NodeCloneInfo(node_idx_t x, int g) : _idx_clone_orig(0) { set(x, g); }
void dump() const;
};

2
hotspot/src/share/vm/opto/generateOptoStub.cpp
View File

@ -261,7 +261,7 @@ void GraphKit::gen_stub(address C_function,
//-----------------------------
// If this is a normal subroutine return, issue the return and be done.
Node *ret;
Node *ret = NULL;
switch( is_fancy_jump ) {
case 0: // Make a return instruction
// Return to caller, free any space for return address

2
hotspot/src/share/vm/opto/lcm.cpp
View File

@ -806,7 +806,7 @@ uint PhaseCFG::sched_call(Block* block, uint node_cnt, Node_List& worklist, Grow
block->insert_node(proj, node_cnt++);
// Select the right register save policy.
const char * save_policy;
const char *save_policy = NULL;
switch (op) {
case Op_CallRuntime:
case Op_CallLeaf:

16
hotspot/src/share/vm/opto/library_call.cpp
View File

@ -1364,7 +1364,7 @@ Node* LibraryCallKit::round_double_node(Node* n) {
// public static double Math.log10(double)
bool LibraryCallKit::inline_math(vmIntrinsics::ID id) {
Node* arg = round_double_node(argument(0));
Node* n;
Node* n = NULL;
switch (id) {
case vmIntrinsics::_dabs: n = new AbsDNode( arg); break;
case vmIntrinsics::_dsqrt: n = new SqrtDNode(C, control(), arg); break;
@ -2108,7 +2108,7 @@ inline Node* LibraryCallKit::make_unsafe_address(Node* base, Node* offset) {
// inline long Long.reverseBytes(long)
bool LibraryCallKit::inline_number_methods(vmIntrinsics::ID id) {
Node* arg = argument(0);
Node* n;
Node* n = NULL;
switch (id) {
case vmIntrinsics::_numberOfLeadingZeros_i: n = new CountLeadingZerosINode( arg); break;
case vmIntrinsics::_numberOfLeadingZeros_l: n = new CountLeadingZerosLNode( arg); break;
@ -2648,7 +2648,7 @@ bool LibraryCallKit::inline_unsafe_load_store(BasicType type, LoadStoreKind kind
// For now, we handle only those cases that actually exist: ints,
// longs, and Object. Adding others should be straightforward.
Node* load_store;
Node* load_store = NULL;
switch(type) {
case T_INT:
if (kind == LS_xadd) {
@ -3654,7 +3654,7 @@ bool LibraryCallKit::inline_array_copyOf(bool is_copyOfRange) {
Node* end = is_copyOfRange? argument(2): argument(1);
Node* array_type_mirror = is_copyOfRange? argument(3): argument(2);
Node* newcopy;
Node* newcopy = NULL;
// Set the original stack and the reexecute bit for the interpreter to reexecute
// the bytecode that invokes Arrays.copyOf if deoptimization happens.
@ -4089,7 +4089,7 @@ bool LibraryCallKit::inline_native_Reflection_getCallerClass() {
bool LibraryCallKit::inline_fp_conversions(vmIntrinsics::ID id) {
Node* arg = argument(0);
Node* result;
Node* result = NULL;
switch (id) {
case vmIntrinsics::_floatToRawIntBits: result = new MoveF2INode(arg); break;
@ -5718,7 +5718,7 @@ Node * LibraryCallKit::load_field_from_object(Node * fromObj, const char * field
//------------------------------inline_aescrypt_Block-----------------------
bool LibraryCallKit::inline_aescrypt_Block(vmIntrinsics::ID id) {
address stubAddr;
address stubAddr = NULL;
const char *stubName;
assert(UseAES, "need AES instruction support");
@ -5784,8 +5784,8 @@ bool LibraryCallKit::inline_aescrypt_Block(vmIntrinsics::ID id) {
//------------------------------inline_cipherBlockChaining_AESCrypt-----------------------
bool LibraryCallKit::inline_cipherBlockChaining_AESCrypt(vmIntrinsics::ID id) {
address stubAddr;
const char *stubName;
address stubAddr = NULL;
const char *stubName = NULL;
assert(UseAES, "need AES instruction support");

16
hotspot/src/share/vm/opto/macro.cpp
View File

@ -779,10 +779,10 @@ bool PhaseMacroExpand::scalar_replacement(AllocateNode *alloc, GrowableArray <Sa
ciKlass* klass = NULL;
ciInstanceKlass* iklass = NULL;
int nfields = 0;
int array_base;
int element_size;
BasicType basic_elem_type;
ciType* elem_type;
int array_base = 0;
int element_size = 0;
BasicType basic_elem_type = T_ILLEGAL;
ciType* elem_type = NULL;
Node* res = alloc->result_cast();
assert(res == NULL || res->is_CheckCastPP(), "unexpected AllocateNode result");
@ -1305,10 +1305,10 @@ void PhaseMacroExpand::expand_allocate_common(
// We need a Region and corresponding Phi's to merge the slow-path and fast-path results.
// they will not be used if "always_slow" is set
enum { slow_result_path = 1, fast_result_path = 2 };
Node *result_region;
Node *result_phi_rawmem;
Node *result_phi_rawoop;
Node *result_phi_i_o;
Node *result_region = NULL;
Node *result_phi_rawmem = NULL;
Node *result_phi_rawoop = NULL;
Node *result_phi_i_o = NULL;
// The initial slow comparison is a size check, the comparison
// we want to do is a BoolTest::gt

4
hotspot/src/share/vm/opto/parse1.cpp
View File

@ -108,7 +108,7 @@ Node *Parse::fetch_interpreter_state(int index,
// Very similar to LoadNode::make, except we handle un-aligned longs and
// doubles on Sparc. Intel can handle them just fine directly.
Node *l;
Node *l = NULL;
switch (bt) { // Signature is flattened
case T_INT: l = new LoadINode(ctl, mem, adr, TypeRawPtr::BOTTOM, TypeInt::INT, MemNode::unordered); break;
case T_FLOAT: l = new LoadFNode(ctl, mem, adr, TypeRawPtr::BOTTOM, Type::FLOAT, MemNode::unordered); break;
@ -1903,7 +1903,7 @@ PhiNode *Parse::ensure_phi(int idx, bool nocreate) {
// Now use a Phi here for merging
assert(!nocreate, "Cannot build a phi for a block already parsed.");
const JVMState* jvms = map->jvms();
const Type* t;
const Type* t = NULL;
if (jvms->is_loc(idx)) {
t = block()->local_type_at(idx - jvms->locoff());
} else if (jvms->is_stk(idx)) {

4
hotspot/src/share/vm/opto/split_if.cpp
View File

@ -451,8 +451,8 @@ void PhaseIdealLoop::do_split_if( Node *iff ) {
// Replace both uses of 'new_iff' with Regions merging True/False
// paths. This makes 'new_iff' go dead.
Node *old_false, *old_true;
Node *new_false, *new_true;
Node *old_false = NULL, *old_true = NULL;
Node *new_false = NULL, *new_true = NULL;
for (DUIterator_Last j2min, j2 = iff->last_outs(j2min); j2 >= j2min; --j2) {
Node *ifp = iff->last_out(j2);
assert( ifp->Opcode() == Op_IfFalse || ifp->Opcode() == Op_IfTrue, "" );

2
hotspot/src/share/vm/opto/superword.cpp
View File

@ -3665,7 +3665,7 @@ Node* SuperWord::last_node(Node* nd) {
}
int SuperWord::mark_generations() {
Node *ii_err = 0, *tail_err;
Node *ii_err = NULL, *tail_err = NULL;
for (int i = 0; i < _mem_slice_head.length(); i++) {
Node* phi = _mem_slice_head.at(i);
assert(phi->is_Phi(), "must be phi");

4
hotspot/src/share/vm/prims/jvmtiEnter.xsl
View File

@ -629,8 +629,8 @@ static jvmtiError JNICALL
jint trace_flags = JvmtiTrace::trace_flags(</xsl:text>
<xsl:value-of select="@num"/>
<xsl:text>);
const char *func_name;
const char *curr_thread_name;
const char *func_name = NULL;
const char *curr_thread_name = NULL;
if (trace_flags) {
func_name = JvmtiTrace::function_name(</xsl:text>
<xsl:value-of select="@num"/>

10
hotspot/src/share/vm/prims/jvmtiEnv.cpp
View File

@ -3064,7 +3064,7 @@ JvmtiEnv::RawMonitorEnter(JvmtiRawMonitor * rmonitor) {
// in thread.cpp.
JvmtiPendingMonitors::enter(rmonitor);
} else {
int r;
int r = 0;
Thread* thread = Thread::current();
if (thread->is_Java_thread()) {
@ -3127,7 +3127,7 @@ JvmtiEnv::RawMonitorExit(JvmtiRawMonitor * rmonitor) {
err = JVMTI_ERROR_NOT_MONITOR_OWNER;
}
} else {
int r;
int r = 0;
Thread* thread = Thread::current();
if (thread->is_Java_thread()) {
@ -3161,7 +3161,7 @@ JvmtiEnv::RawMonitorExit(JvmtiRawMonitor * rmonitor) {
// rmonitor - pre-checked for validity
jvmtiError
JvmtiEnv::RawMonitorWait(JvmtiRawMonitor * rmonitor, jlong millis) {
int r;
int r = 0;
Thread* thread = Thread::current();
if (thread->is_Java_thread()) {
@ -3220,7 +3220,7 @@ JvmtiEnv::RawMonitorWait(JvmtiRawMonitor * rmonitor, jlong millis) {
// rmonitor - pre-checked for validity
jvmtiError
JvmtiEnv::RawMonitorNotify(JvmtiRawMonitor * rmonitor) {
int r;
int r = 0;
Thread* thread = Thread::current();
if (thread->is_Java_thread()) {
@ -3251,7 +3251,7 @@ JvmtiEnv::RawMonitorNotify(JvmtiRawMonitor * rmonitor) {
// rmonitor - pre-checked for validity
jvmtiError
JvmtiEnv::RawMonitorNotifyAll(JvmtiRawMonitor * rmonitor) {
int r;
int r = 0;
Thread* thread = Thread::current();
if (thread->is_Java_thread()) {

4
hotspot/src/share/vm/prims/jvmtiEnvBase.cpp
View File

@ -512,7 +512,7 @@ JvmtiEnvBase::is_thread_fully_suspended(JavaThread* thr, bool wait_for_suspend,
// mean much better out of memory handling
unsigned char *
JvmtiEnvBase::jvmtiMalloc(jlong size) {
unsigned char* mem;
unsigned char* mem = NULL;
jvmtiError result = allocate(size, &mem);
assert(result == JVMTI_ERROR_NONE, "Allocate failed");
return mem;
@ -1032,7 +1032,7 @@ JvmtiEnvBase::get_object_monitor_usage(JavaThread* calling_thread, jobject objec
// implied else: entry_count == 0
}
jint nWant, nWait;
jint nWant = 0, nWait = 0;
if (mon != NULL) {
// this object has a heavyweight monitor
nWant = mon->contentions(); // # of threads contending for monitor

2
hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
View File

@ -336,7 +336,7 @@ void VM_RedefineClasses::append_entry(constantPoolHandle scratch_cp,
int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i,
merge_cp_p, merge_cp_length_p, THREAD);
const char *entry_name;
const char *entry_name = NULL;
switch (scratch_cp->tag_at(scratch_i).value()) {
case JVM_CONSTANT_Fieldref:
entry_name = "Fieldref";

4
hotspot/src/share/vm/prims/unsafe.cpp
View File

@ -783,7 +783,7 @@ static void getBaseAndScale(int& base, int& scale, jclass acls, TRAPS) {
UNSAFE_ENTRY(jint, Unsafe_ArrayBaseOffset(JNIEnv *env, jobject unsafe, jclass acls))
UnsafeWrapper("Unsafe_ArrayBaseOffset");
int base, scale;
int base = 0, scale = 0;
getBaseAndScale(base, scale, acls, CHECK_0);
return field_offset_from_byte_offset(base);
UNSAFE_END
@ -791,7 +791,7 @@ UNSAFE_END
UNSAFE_ENTRY(jint, Unsafe_ArrayIndexScale(JNIEnv *env, jobject unsafe, jclass acls))
UnsafeWrapper("Unsafe_ArrayIndexScale");
int base, scale;
int base = 0, scale = 0;
getBaseAndScale(base, scale, acls, CHECK_0);
// This VM packs both fields and array elements down to the byte.
// But watch out: If this changes, so that array references for

1
hotspot/src/share/vm/runtime/arguments.cpp
View File

@ -3858,6 +3858,7 @@ jint Arguments::parse_options_buffer(const char* name, char* buffer, const size_
JavaVMOption option;
option.optionString = opt_hd;
option.extraInfo = NULL;
options->append(option); // Fill in option

4
hotspot/src/share/vm/runtime/safepoint.cpp
View File

@ -122,7 +122,7 @@ void SafepointSynchronize::begin() {
// Save the starting time, so that it can be compared to see if this has taken
// too long to complete.
jlong safepoint_limit_time;
jlong safepoint_limit_time = 0;
timeout_error_printed = false;
// PrintSafepointStatisticsTimeout can be specified separately. When
@ -901,7 +901,7 @@ void ThreadSafepointState::restart() {
void ThreadSafepointState::print_on(outputStream *st) const {
const char *s;
const char *s = NULL;
switch(_type) {
case _running : s = "_running"; break;

8
hotspot/src/share/vm/services/threadService.hpp
View File

@ -425,12 +425,12 @@ class JavaThreadStatusChanger : public StackObj {
}
JavaThreadStatusChanger(JavaThread* java_thread,
java_lang_Thread::ThreadStatus state) {
java_lang_Thread::ThreadStatus state) : _old_state(java_lang_Thread::NEW) {
save_old_state(java_thread);
set_thread_status(state);
}
JavaThreadStatusChanger(JavaThread* java_thread) {
JavaThreadStatusChanger(JavaThread* java_thread) : _old_state(java_lang_Thread::NEW) {
save_old_state(java_thread);
}
@ -527,7 +527,7 @@ class JavaThreadBlockedOnMonitorEnterState : public JavaThreadStatusChanger {
// Current thread is the notifying thread which holds the monitor.
static bool wait_reenter_begin(JavaThread *java_thread, ObjectMonitor *obj_m) {
assert((java_thread != NULL), "Java thread should not be null here");
bool active = false;
bool active = false;
if (is_alive(java_thread) && ServiceUtil::visible_oop((oop)obj_m->object())) {
active = contended_enter_begin(java_thread);
}
@ -542,7 +542,7 @@ class JavaThreadBlockedOnMonitorEnterState : public JavaThreadStatusChanger {
}
JavaThreadBlockedOnMonitorEnterState(JavaThread *java_thread, ObjectMonitor *obj_m) :
JavaThreadStatusChanger(java_thread) {
_stat(NULL), _active(false), JavaThreadStatusChanger(java_thread) {
assert((java_thread != NULL), "Java thread should not be null here");
// Change thread status and collect contended enter stats for monitor contended
// enter done for external java world objects and it is contended. All other cases