diff src/share/vm/code/debugInfoRec.hpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 51111665eda6 da91efe96a93
children b6a8f2d23057
line wrap: on
line diff
--- a/src/share/vm/code/debugInfoRec.hpp	Mon Nov 12 18:11:17 2012 +0100
+++ b/src/share/vm/code/debugInfoRec.hpp	Mon Nov 12 23:14:12 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,8 @@
 //         NB: nodes from create_scope_values and create_locations
 //             can be reused for simple sharing.
 //         - mark the end of the scopes (end_safepoint or end_non_safepoint)
-//   2) Use oop_size, data_size, pcs_size to create the nmethod and
-//      finally migrate the debugging information into the nmethod
+//   2) Use oop_size, metadata_size, data_size, pcs_size to create the nmethod
+//      and finally migrate the debugging information into the nmethod
 //      by calling copy_to.
 
 class DebugToken; // Opaque datatype for stored:
@@ -125,6 +125,7 @@
   int data_size();
   int pcs_size();
   int oop_size() { return oop_recorder()->oop_size(); }
+  int metadata_size() { return oop_recorder()->metadata_size(); }
 
   // copy the generated debugging information to nmethod
   void copy_to(nmethod* nm);
@@ -195,6 +196,11 @@
   int  serialize_scope_values(GrowableArray<ScopeValue*>* values);
   int  find_sharable_decode_offset(int stream_offset);
 
+#ifndef PRODUCT
+  bool recorders_frozen();
+  void mark_recorders_frozen();
+#endif // PRODUCT
+
  public:
   enum { serialized_null = 0 };
 };