bfu
/
asmtools
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jasm fails to assemble to following instruction: invokedynamic REF_invokeStatic:bootstrap:()V:target:()V int 1, contributed by: leonid.kuskov@oracle.com

This commit is contained in:
afedorch 2017-10-19 14:44:57 -07:00
parent 2084fcb710
commit 1594b206b9
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.properties
View File

@ -1,4 +1,4 @@
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -29,4 +29,4 @@ javac.debug=true
javac.deprecation=false
# path to output directory
BUILD_DIR = ../../asmtools-6.0-build
BUILD_DIR = ../../asmtools-${PRODUCT_VERSION}-build

14
build/build.xml
View File

@ -27,12 +27,16 @@ questions.
<project name="asmtools" default="build" basedir=".">
<!--****************************************************************-->
<!--Property & FileSet Definitions -->
<!--****************************************************************-->
<concat destfile="asmtools.properties" >
<fileset file="build.properties" />
<fileset file="productinfo.properties" />
</concat>
<property file="asmtools.properties"/>
<delete file="asmtools.properties"/>
<!--****************************************************************-->
<!--Property & FileSet Definitions -->
<!--****************************************************************-->
<property file="build.properties"/>
<property file="productinfo.properties"/>
<property name="proj.build.product.version" value="${PRODUCT_VERSION}"/>
<property name="proj.build.product.name.prefix" value="${PRODUCT_NAME}"/>
<property name="proj.build.product.name" value="${proj.build.product.name.prefix}"/>

2
src/org/openjdk/asmtools/jasm/ParserCP.java
View File

@ -455,10 +455,8 @@ d2l: {
if (sep) scanner.expect(Token.COMMA);
bsm_args.add(parseConstRef(null));
scanner.idValue = null; // Clear tag
bsm_args.add(parseConstRef(null));
}
BootstrapMethodData bsmData = new BootstrapMethodData(MHCell, bsm_args);
parser.cd.addBootstrapMethod(bsmData);
obj = new ConstantPool.ConstValue_IndyPair(bsmData, NapeCell);