<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style>
</head>
<body lang="en-CZ" link="#0563C1" vlink="#954F72" style="word-wrap:break-word">
<div class="WordSection1">
<p class="MsoNormal"><span lang="EN-US" style="mso-fareast-language:EN-US">Thanks for the report.<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="mso-fareast-language:EN-US">It should be fixed now:<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="mso-fareast-language:EN-US"><a href="https://github.com/openjdk/jdk-sandbox/commit/de17a3b0eb7c80935d701ba98014f2bd35c221b5">https://github.com/openjdk/jdk-sandbox/commit/de17a3b0eb7c80935d701ba98014f2bd35c221b5</a><o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="mso-fareast-language:EN-US">Thanks,<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="mso-fareast-language:EN-US">Adam<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal" style="mso-margin-top-alt:0cm;margin-right:0cm;margin-bottom:12.0pt;margin-left:36.0pt">
<b><span style="font-size:12.0pt;color:black">From: </span></b><span style="font-size:12.0pt;color:black">classfile-api-dev <classfile-api-dev-retn@openjdk.org> on behalf of Michael van Acken <michael.van.acken@gmail.com><br>
<b>Date: </b>Thursday, 18 August 2022 10:54<br>
<b>To: </b>classfile-api-dev@openjdk.org <classfile-api-dev@openjdk.org><br>
<b>Subject: </b>methodHandleEntry() for Map$Entry::getKey<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">Putting a method handle for getKey into the constant pool got me<o:p></o:p></p>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><span style="font-family:"Courier New""> #9 = NameAndType #7:#8 // getKey:(Ljava/util/Map$Entry;)Ljava/lang/Object;<br>
#10 = Methodref #6.#9 // java/util/Map$Entry.getKey:(Ljava/util/Map$Entry;)Ljava/lang/Object;<br>
#11 = MethodHandle 9:#10 // REF_invokeInterface java/util/Map$Entry.getKey:(Ljava/util/Map$Entry;)Ljava/lang/Object;</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">instead of the expected<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><span style="font-family:"Courier New""> #33 = NameAndType #7:#32 // getKey:()Ljava/lang/Object;<br>
#34 = InterfaceMethodref #6.#33 // java/util/Map$Entry.getKey:()Ljava/lang/Object;</span><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">That is, both tag and lookup type are off target.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">The attached patch allows me to continue for now. The <o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">MTD -> String -> MTD conversion is a bit heavy handed.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">-- mva<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt">diff --git a/src/java.base/share/classes/jdk/classfile/constantpool/ConstantPoolBuilder.java b/src/java.base/share/classes/jdk/classfile/constantpool/ConstantPoolBuilder.java<br>
index 1363f1e8c83..7c3395d0c55 100755<br>
--- a/src/java.base/share/classes/jdk/classfile/constantpool/ConstantPoolBuilder.java<br>
+++ b/src/java.base/share/classes/jdk/classfile/constantpool/ConstantPoolBuilder.java<br>
@@ -346,7 +346,11 @@ public sealed interface ConstantPoolBuilder<br>
* @param descriptor the symbolic descriptor of the method handle<br>
*/<br>
default MethodHandleEntry methodHandleEntry(DirectMethodHandleDesc descriptor) {<br>
- return methodHandleEntry(descriptor.refKind(), methodRefEntry(descriptor.owner(), descriptor.methodName(), descriptor.invocationType()));<br>
+ var lookupType = MethodTypeDesc.ofDescriptor(descriptor.lookupDescriptor());<br>
+ return methodHandleEntry(descriptor.refKind(),<br>
+ descriptor.isOwnerInterface() ?<br>
+ interfaceMethodRefEntry(descriptor.owner(), descriptor.methodName(), lookupType) :<br>
+ methodRefEntry(descriptor.owner(), descriptor.methodName(), lookupType));<br>
}<br>
<br>
/**<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="margin-left:36.0pt"><o:p> </o:p></p>
</div>
</div>
</div>
</body>
</html>