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

8140659: C1: invokedynamic call patching violates JVMS-6.5.invokedynamic

Browse source 
Reviewed-by: roland
This commit is contained in:
Vladimir Ivanov 2015-12-18 20:23:27 +03:00
parent a82be01120
commit 7adcd9a503
8 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
View file

@ -1748,10 +1748,6 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
const Bytecodes::Code bc_raw = stream()->cur_bc_raw();
assert(declared_signature != NULL, "cannot be null");
if (!C1PatchInvokeDynamic && Bytecodes::has_optional_appendix(bc_raw) && !will_link) {
BAILOUT("unlinked call site (C1PatchInvokeDynamic is off)");
}
// we have to make sure the argument size (incl. the receiver)
// is correct for compilation (the call would fail later during
// linkage anyway) - was bug (gri 7/28/99)
@ -1803,8 +1799,7 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
// Push appendix argument (MethodType, CallSite, etc.), if one.
bool patch_for_appendix = false;
int patching_appendix_arg = 0;
if (C1PatchInvokeDynamic &&
(Bytecodes::has_optional_appendix(bc_raw) && (!will_link || PatchALot))) {
if (Bytecodes::has_optional_appendix(bc_raw) && (!will_link || PatchALot)) {
Value arg = append(new Constant(new ObjectConstant(compilation()->env()->unloaded_ciinstance()), copy_state_before()));
apush(arg);
patch_for_appendix = true;