From 1594b206b98e4ee4eb4182adf2d7bbfda53d0e9f Mon Sep 17 00:00:00 2001
From: afedorch <devnull@localhost>
Date: Thu, 19 Oct 2017 14:44:57 -0700
Subject: [PATCH] jasm fails to assemble to following instruction:
 invokedynamic REF_invokeStatic:bootstrap:()V:target:()V int 1, contributed
 by: leonid.kuskov@oracle.com

---
 build/build.properties                      |  4 ++--
 build/build.xml                             | 14 +++++++++-----
 src/org/openjdk/asmtools/jasm/ParserCP.java |  2 --
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build/build.properties b/build/build.properties
index 910d7df..f6ee37c 100644
--- a/build/build.properties
+++ b/build/build.properties
@@ -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
diff --git a/build/build.xml b/build/build.xml
index 1146c8b..7c04ee5 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -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}"/>
diff --git a/src/org/openjdk/asmtools/jasm/ParserCP.java b/src/org/openjdk/asmtools/jasm/ParserCP.java
index 4b3d2aa..8f7de8c 100644
--- a/src/org/openjdk/asmtools/jasm/ParserCP.java
+++ b/src/org/openjdk/asmtools/jasm/ParserCP.java
@@ -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);