archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2015-10-07 01:03:24 +02:00
commit e75e2e04f7
308 changed files with 5792 additions and 2256 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/interpreter/templateInterpreter.cpp
View file

@ -607,7 +607,7 @@ address* TemplateInterpreter::invoke_return_entry_table_for(Bytecodes::Code code
case Bytecodes::_invokedynamic:
return Interpreter::invokedynamic_return_entry_table();
default:
fatal(err_msg("invalid bytecode: %s", Bytecodes::name(code)));
fatal("invalid bytecode: %s", Bytecodes::name(code));
return NULL;
}
}
@ -629,7 +629,7 @@ address TemplateInterpreter::return_entry(TosState state, int length, Bytecodes:
case Bytecodes::_invokedynamic:
return _invokedynamic_return_entry[index];
default:
assert(!Bytecodes::is_invoke(code), err_msg("invoke instructions should be handled separately: %s", Bytecodes::name(code)));
assert(!Bytecodes::is_invoke(code), "invoke instructions should be handled separately: %s", Bytecodes::name(code));
return _return_entry[length].entry(state);
}
}