diff src/share/vm/ci/ciInstanceKlass.cpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 2cb439954abf fcc9e7681d63
children 836a62f43af9
line wrap: on
line diff
--- a/src/share/vm/ci/ciInstanceKlass.cpp	Tue Mar 05 21:58:51 2013 +0100
+++ b/src/share/vm/ci/ciInstanceKlass.cpp	Tue Mar 05 23:44:54 2013 +0100
@@ -580,6 +580,7 @@
   }
   void do_field(fieldDescriptor* fd) {
     if (fd->is_final() && !fd->has_initial_value()) {
+      ResourceMark rm;
       oop mirror = fd->field_holder()->java_mirror();
       _out->print("staticfield %s %s %s ", _holder, fd->name()->as_quoted_ascii(), fd->signature()->as_quoted_ascii());
       switch (fd->field_type()) {
@@ -643,6 +644,8 @@
 
 void ciInstanceKlass::dump_replay_data(outputStream* out) {
   ASSERT_IN_VM;
+  ResourceMark rm;
+
   InstanceKlass* ik = get_instanceKlass();
   ConstantPool*  cp = ik->constants();