From f0b26d3f68e12e54d39d5e3cd4a20647f43b25f8 Mon Sep 17 00:00:00 2001
From: rbackman <unknown>
Date: Fri, 31 May 2013 13:02:24 +0200
Subject: [PATCH] 8014709: Constructor.getAnnotatedReturnType() returns empty
 AnnotatedType Reviewed-by: stefank, rbackman Contributed-by: Joel
 Borggren-Franck <joel.franck@oracle.com>

---
 src/share/vm/runtime/reflection.cpp       |  4 ++++
 test/runtime/8007320/ConstMethodTest.java | 23 ++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/share/vm/runtime/reflection.cpp b/src/share/vm/runtime/reflection.cpp
index 8d0cab2a4..5a9b4dd5b 100644
--- a/src/share/vm/runtime/reflection.cpp
+++ b/src/share/vm/runtime/reflection.cpp
@@ -817,6 +817,10 @@ oop Reflection::new_constructor(methodHandle method, TRAPS) {
     typeArrayOop an_oop = Annotations::make_java_array(method->parameter_annotations(), CHECK_NULL);
     java_lang_reflect_Constructor::set_parameter_annotations(ch(), an_oop);
   }
+  if (java_lang_reflect_Constructor::has_type_annotations_field()) {
+    typeArrayOop an_oop = Annotations::make_java_array(method->type_annotations(), CHECK_NULL);
+    java_lang_reflect_Constructor::set_type_annotations(ch(), an_oop);
+  }
   return ch();
 }
 
diff --git a/test/runtime/8007320/ConstMethodTest.java b/test/runtime/8007320/ConstMethodTest.java
index 68ca8dcb2..d24ff6df9 100644
--- a/test/runtime/8007320/ConstMethodTest.java
+++ b/test/runtime/8007320/ConstMethodTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8007320
+ * @bug 8007320 8014709
  * @summary Test all optional fields in ConstMethod
  * @compile -g -parameters ConstMethodTest.java
  * @run main ConstMethodTest
@@ -74,6 +74,11 @@ class OkException extends RuntimeException {};
 
 @MyAnnotation(name="someName", value = "Hello World")
 public class ConstMethodTest {
+    public @TypeAnno("constructor") ConstMethodTest() { }
+
+    public ConstMethodTest(int i) {
+        // needs a second unannotated constructor
+    }
 
     private static void check(boolean b) {
         if (!b)
@@ -139,10 +144,26 @@ public class ConstMethodTest {
         }
     }
 
+    private static void testConstructor() throws Exception {
+        for (Constructor c : ConstMethodTest.class.getDeclaredConstructors()) {
+            Annotation[] aa = c.getAnnotatedReturnType().getAnnotations();
+            if (c.getParameterTypes().length == 1) { // should be un-annotated
+                check(aa.length == 0);
+            } else if (c.getParameterTypes().length == 0) { //should be annotated
+                check(aa.length == 1);
+                check(((TypeAnno)aa[0]).value().equals("constructor"));
+            } else {
+                //should not happen
+                check(false);
+            }
+        }
+    }
+
     public static void main(java.lang.String[] unused) throws Throwable {
         // pass 5 so kitchenSinkFunc is instantiated with an int
         kitchenSinkFunc("parameter", "param2", 5);
         test1();
+        testConstructor();
     }
 };
 
-- 
GitLab