From a0b353c4c270a46c2acc92dc0ff911cd0243d33f Mon Sep 17 00:00:00 2001
From: coleenp <unknown>
Date: Wed, 27 Mar 2013 08:19:50 -0400
Subject: [PATCH] 8009531: Crash when redefining class with annotated method
 Summary: Neglected to copy the annotations in clone_with_new_data when they
 were moved to ConstMethod. Reviewed-by: acorn, sspitsyn, dcubed

---
 src/share/vm/oops/constMethod.cpp | 20 ++++++++++++++++++++
 src/share/vm/oops/constMethod.hpp |  3 +++
 src/share/vm/oops/method.cpp      |  2 ++
 3 files changed, 25 insertions(+)

diff --git a/src/share/vm/oops/constMethod.cpp b/src/share/vm/oops/constMethod.cpp
index 98a29a2e1..1d0376a0b 100644
--- a/src/share/vm/oops/constMethod.cpp
+++ b/src/share/vm/oops/constMethod.cpp
@@ -363,6 +363,26 @@ AnnotationArray** ConstMethod::default_annotations_addr() const {
   return (AnnotationArray**)constMethod_end() - offset;
 }
 
+// copy annotations from 'cm' to 'this'
+void ConstMethod::copy_annotations_from(ConstMethod* cm) {
+  if (cm->has_method_annotations()) {
+    assert(has_method_annotations(), "should be allocated already");
+    set_method_annotations(cm->method_annotations());
+  }
+  if (cm->has_parameter_annotations()) {
+    assert(has_parameter_annotations(), "should be allocated already");
+    set_parameter_annotations(cm->parameter_annotations());
+  }
+  if (cm->has_type_annotations()) {
+    assert(has_type_annotations(), "should be allocated already");
+    set_type_annotations(cm->type_annotations());
+  }
+  if (cm->has_default_annotations()) {
+    assert(has_default_annotations(), "should be allocated already");
+    set_default_annotations(cm->default_annotations());
+  }
+}
+
 // Printing
 
 void ConstMethod::print_on(outputStream* st) const {
diff --git a/src/share/vm/oops/constMethod.hpp b/src/share/vm/oops/constMethod.hpp
index 0c4212564..21df75bde 100644
--- a/src/share/vm/oops/constMethod.hpp
+++ b/src/share/vm/oops/constMethod.hpp
@@ -441,6 +441,9 @@ public:
     return has_default_annotations() ? default_annotations()->length() : 0;
   }
 
+  // Copy annotations from other ConstMethod
+  void copy_annotations_from(ConstMethod* cm);
+
   // byte codes
   void    set_code(address code) {
     if (code_size() > 0) {
diff --git a/src/share/vm/oops/method.cpp b/src/share/vm/oops/method.cpp
index 11ddd21f1..2e866bed1 100644
--- a/src/share/vm/oops/method.cpp
+++ b/src/share/vm/oops/method.cpp
@@ -1170,6 +1170,8 @@ methodHandle Method::clone_with_new_data(methodHandle m, u_char* new_code, int n
     newm->set_stackmap_data(stackmap_data);
   }
 
+  // copy annotations over to new method
+  newcm->copy_annotations_from(cm);
   return newm;
 }
 
-- 
GitLab