<html><head><meta http-equiv="Content-Type" content="text/html charset=windows-1252"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On May 9, 2016, at 11:25 PM, Roland Schatz <<a href="mailto:roland.schatz@oracle.com" class="">roland.schatz@oracle.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class="">
<meta content="text/html; charset=windows-1252" http-equiv="Content-Type" class="">
<div text="#000000" bgcolor="#FFFFFF" class="">
<div class="moz-cite-prefix">On 05/09/2016 07:16 PM, Christian
Thalinger wrote:<br class="">
</div>
<blockquote cite="mid:A68986DA-2185-46F8-A4CE-09BEE2D93FB9@oracle.com" type="cite" class="">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252" class="">
<br class="">
<div class="">
<blockquote type="cite" class="">
<div class="">On May 8, 2016, at 11:39 PM, Roland Schatz <<a moz-do-not-send="true" href="mailto:roland.schatz@oracle.com" class=""></a><a class="moz-txt-link-abbreviated" href="mailto:roland.schatz@oracle.com">roland.schatz@oracle.com</a>>
wrote:</div>
<br class="Apple-interchange-newline">
<div class="">
<meta content="text/html; charset=windows-1252" http-equiv="Content-Type" class="">
<div text="#000000" bgcolor="#FFFFFF" class="">
<div class="moz-cite-prefix">Whoops... Good catch.<br class="">
<br class="">
Fixed:<br class="">
<a moz-do-not-send="true" class="moz-txt-link-freetext" href="http://cr.openjdk.java.net/%7Erschatz/JDK-8156211/webrev.01/">http://cr.openjdk.java.net/~rschatz/JDK-8156211/webrev.01/</a><br class="">
</div>
</div>
</div>
</blockquote>
<div class=""><br class="">
</div>
Looks good. One nit:</div>
<div class="">
<pre style="background-color: rgb(238, 238, 238);" class=""><span class="new" style="color: blue;">+ public Annotation[] getDeclaredAnnotations() {</span>
<span class="new" style="color: blue;">+ Field javaField = toJava();</span>
<span class="new" style="color: blue;">+ if (javaField != null) {</span>
<span class="new" style="color: blue;">+ return javaField.getDeclaredAnnotations();</span>
<span class="new" style="color: blue;">+ }</span>
<span class="new" style="color: blue;">+ return new Annotation[0];</span>
<span class="new" style="color: blue;">+ }</span>
</pre>
<div class=""><span class="new" style="color: blue;">
<pre style="background-color: rgb(238, 238, 238);" class=""><span class="new" style="color: blue;">+ public Annotation[] getDeclaredAnnotations() {</span>
<span class="new" style="color: blue;">+ Executable javaMethod = toJava();</span>
<span class="new" style="color: blue;">+ return javaMethod == null ? new Annotation[0] : javaMethod.getDeclaredAnnotations();</span>
<span class="new" style="color: blue;">+ }</span></pre>
</span></div>
Make them look the same.</div>
</blockquote>
<br class="">
Done (and also made the existing getAnnotations() methods look the
same, while we're at it).<br class="">
<br class="">
<a class="moz-txt-link-freetext" href="http://cr.openjdk.java.net/~rschatz/JDK-8156211/webrev.02/">http://cr.openjdk.java.net/~rschatz/JDK-8156211/webrev.02/</a><br class=""></div></div></blockquote><div><br class=""></div>Thanks.</div><div><br class=""><blockquote type="cite" class=""><div class=""><div text="#000000" bgcolor="#FFFFFF" class="">
<br class="">
- Roland<br class="">
<br class="">
<br class="">
<blockquote cite="mid:A68986DA-2185-46F8-A4CE-09BEE2D93FB9@oracle.com" type="cite" class="">
<div class=""><br class="">
<blockquote type="cite" class="">
<div class="">
<div text="#000000" bgcolor="#FFFFFF" class="">
<div class="moz-cite-prefix"> <br class="">
- Roland<br class="">
<br class="">
On 05/06/2016 11:24 PM, Christian Thalinger wrote:<br class="">
</div>
<blockquote cite="mid:94E88818-DE33-4778-9D98-153EF68978A9@oracle.com" type="cite" class="">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252" class="">
<br class="">
<div class="">
<blockquote type="cite" class="">
<div class="">On May 6, 2016, at 2:18 AM, Roland
Schatz <<a moz-do-not-send="true" class="moz-txt-link-abbreviated" href="mailto:roland.schatz@oracle.com">roland.schatz@oracle.com</a>>
wrote:</div>
<br class="Apple-interchange-newline">
<div class="">
<div class="">Please review this small jvmci
change:<br class="">
<br class="">
<a moz-do-not-send="true" href="http://cr.openjdk.java.net/%7Erschatz/JDK-8156211/webrev.00/" class="">http://cr.openjdk.java.net/~rschatz/JDK-8156211/webrev.00/</a><br class="">
<a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://bugs.openjdk.java.net/browse/JDK-8156211">https://bugs.openjdk.java.net/browse/JDK-8156211</a></div>
</div>
</blockquote>
<h2 style="font-family: -webkit-standard;
background-color: rgb(238, 238, 238);" class="">src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java</h2>
<div class="">
<pre style="background-color: rgb(238, 238, 238);" class=""><span class="new" style="color: blue;">+ public Annotation[] getDeclaredAnnotations() {</span>
<span class="new" style="color: blue;">+ Executable javaMethod = toJava();</span>
<span class="new" style="color: blue;">+ return javaMethod == null ? null : javaMethod.getDeclaredAnnotations();</span>
<span class="new" style="color: blue;">+ }</span></pre>
</div>
This seems wrong. The specification says:</div>
<div class=""><br class="">
</div>
<div class="">
<div style="margin: 0px; font-size: 11px; line-height:
normal; font-family: Monaco; color: rgb(79, 118,
203);" class=""> * If there are no annotations <span style="color: #9293af" class=""><em></span>directly
present<span style="color: #9293af" class=""></em></span>
on this element,</div>
<div style="margin: 0px; font-size: 11px; line-height:
normal; font-family: Monaco; color: rgb(79, 118,
203);" class=""> * the return value is an array
of length 0.</div>
<div class=""><br class="">
</div>
<div class="">and the others return an empty array.</div>
<div class=""><br class="">
</div>
<blockquote type="cite" class="">
<div class="">
<div class=""><br class="">
This change was contributed by Vojin Jovanovic
(cc'ed).<br class="">
<br class="">
Thanks,<br class="">
Roland<br class="">
</div>
</div>
</blockquote>
</div>
<br class="">
</blockquote>
<br class="">
</div>
</div>
</blockquote>
</div>
<br class="">
</blockquote>
<br class="">
</div>
</div></blockquote></div><br class=""></body></html>