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

8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8

Browse source 
8182656: Make the required changes in GC code to build on OSX 10 + Xcode 8
8182657: Make the required changes in Runtime code to build on OSX 10 + Xcode 8
8182658: Make the required changes in Compiler code to build on OSX 10 + Xcode 8

Co-authored-by: Paul Hohensee <hohensee@amazon.com>
Reviewed-by: jwilhelm, ehelin, phh
This commit is contained in:
Jesper Wilhelmsson 2017-07-06 01:50:26 +02:00
parent eb20e62194
commit efd1054686
142 changed files with 787 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

81
hotspot/src/share/vm/oops/generateOopMap.cpp
View file

@ -237,6 +237,8 @@ void RetTable::compute_ret_table(const methodHandle& method) {
case Bytecodes::_jsr_w:
add_jsr(i.next_bci(), i.dest_w());
break;
default:
break;
}
}
}
@ -430,6 +432,8 @@ void GenerateOopMap::mark_bbheaders_and_count_gc_points() {
assert(!fellThrough, "should not happen");
bb_mark_fct(this, bci + Bytecodes::length_for(bytecode), NULL);
break;
default:
break;
}
if (possible_gc_point(&bcs))
@ -489,6 +493,8 @@ void GenerateOopMap::mark_reachable_code() {
assert(!fell_through, "should not happen");
reachable_basicblock(this, bci + Bytecodes::length_for(bytecode), &change);
break;
default:
break;
}
if (fell_through) {
// Mark successor as alive
@ -1187,6 +1193,9 @@ void GenerateOopMap::do_exception_edge(BytecodeStream* itr) {
return;
}
break;
default:
break;
}
if (_has_exceptions) {
@ -1272,24 +1281,38 @@ void GenerateOopMap::print_states(outputStream *os,
void GenerateOopMap::print_current_state(outputStream *os,
BytecodeStream *currentBC,
bool detailed) {
if (detailed) {
os->print(" %4d vars = ", currentBC->bci());
print_states(os, vars(), _max_locals);
os->print(" %s", Bytecodes::name(currentBC->code()));
switch(currentBC->code()) {
case Bytecodes::_invokevirtual:
case Bytecodes::_invokespecial:
case Bytecodes::_invokestatic:
case Bytecodes::_invokedynamic:
case Bytecodes::_invokeinterface:
int idx = currentBC->has_index_u4() ? currentBC->get_index_u4() : currentBC->get_index_u2_cpcache();
ConstantPool* cp = method()->constants();
int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx);
int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx);
Symbol* signature = cp->symbol_at(signatureIdx);
os->print("%s", signature->as_C_string());
} else {
os->print(" %4d vars = '%s' ", currentBC->bci(), state_vec_to_string(vars(), _max_locals));
os->print(" stack = '%s' ", state_vec_to_string(stack(), _stack_top));
if (_monitor_top != bad_monitors) {
os->print(" monitors = '%s' \t%s", state_vec_to_string(monitors(), _monitor_top), Bytecodes::name(currentBC->code()));
} else {
os->print(" [bad monitor stack]");
}
}
switch(currentBC->code()) {
case Bytecodes::_invokevirtual:
case Bytecodes::_invokespecial:
case Bytecodes::_invokestatic:
case Bytecodes::_invokedynamic:
case Bytecodes::_invokeinterface: {
int idx = currentBC->has_index_u4() ? currentBC->get_index_u4() : currentBC->get_index_u2_cpcache();
ConstantPool* cp = method()->constants();
int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx);
int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx);
Symbol* signature = cp->symbol_at(signatureIdx);
os->print("%s", signature->as_C_string());
}
default:
break;
}
if (detailed) {
os->cr();
os->print(" stack = ");
print_states(os, stack(), _stack_top);
@ -1300,30 +1323,9 @@ void GenerateOopMap::print_current_state(outputStream *os,
} else {
os->print(" [bad monitor stack]");
}
os->cr();
} else {
os->print(" %4d vars = '%s' ", currentBC->bci(), state_vec_to_string(vars(), _max_locals));
os->print(" stack = '%s' ", state_vec_to_string(stack(), _stack_top));
if (_monitor_top != bad_monitors) {
os->print(" monitors = '%s' \t%s", state_vec_to_string(monitors(), _monitor_top), Bytecodes::name(currentBC->code()));
} else {
os->print(" [bad monitor stack]");
}
switch(currentBC->code()) {
case Bytecodes::_invokevirtual:
case Bytecodes::_invokespecial:
case Bytecodes::_invokestatic:
case Bytecodes::_invokedynamic:
case Bytecodes::_invokeinterface:
int idx = currentBC->has_index_u4() ? currentBC->get_index_u4() : currentBC->get_index_u2_cpcache();
ConstantPool* cp = method()->constants();
int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx);
int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx);
Symbol* signature = cp->symbol_at(signatureIdx);
os->print("%s", signature->as_C_string());
}
os->cr();
}
os->cr();
}
// Sets the current state to be the state after executing the
@ -2476,8 +2478,9 @@ bool GenerateOopMap::is_astore(BytecodeStream *itr, int *index) {
case Bytecodes::_astore:
*index = itr->get_index();
return true;
default:
return false;
}
return false;
}
bool GenerateOopMap::is_aload(BytecodeStream *itr, int *index) {
@ -2493,8 +2496,10 @@ bool GenerateOopMap::is_aload(BytecodeStream *itr, int *index) {
case Bytecodes::_aload:
*index = itr->get_index();
return true;
default:
return false;
}
return false;
}