Mercurial > hg > truffle

changeset 7933:85bd81dba8fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove more code related to deferred writes.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 17:21:54 +0100
parents d4e6c82cd6a1
children 6b3c05de9521
files src/share/vm/code/debugInfoRec.cpp src/share/vm/code/debugInfoRec.hpp src/share/vm/code/scopeDesc.cpp src/share/vm/code/scopeDesc.hpp src/share/vm/graal/graalCodeInstaller.cpp
diffstat 5 files changed, 1 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/code/debugInfoRec.cpp	Tue Mar 05 17:16:41 2013 +0100
+++ b/src/share/vm/code/debugInfoRec.cpp	Tue Mar 05 17:21:54 2013 +0100
@@ -213,29 +213,6 @@
   return result;
 }
 
-#ifdef GRAAL
-
-int DebugInformationRecorder::serialize_deferred_writes(GrowableArray<DeferredWriteValue*>* deferred_writes) {
-  if (deferred_writes == NULL || deferred_writes->is_empty()) return DebugInformationRecorder::serialized_null;
-  assert(_recording_state == rs_safepoint, "must be recording a safepoint");
-  int result = stream()->position();
-  assert(result != serialized_null, "sanity");
-  stream()->write_int(deferred_writes->length());
-  for (int index = 0; index < deferred_writes->length(); index++) {
-    deferred_writes->at(index)->write_on(stream());
-  }
-
-  // (See comment below on DebugInformationRecorder::describe_scope.)
-  int shared_result = find_sharable_decode_offset(result);
-  if (shared_result != serialized_null) {
-    stream()->set_position(result);
-    result = shared_result;
-  }
-
-  return result;
-}
-
-#endif // GRAAL
 
 #ifndef PRODUCT
 // These variables are put into one block to reduce relocations
@@ -313,9 +290,6 @@
                                               DebugToken* locals,
                                               DebugToken* expressions,
                                               DebugToken* monitors
-#ifdef GRAAL
-                                              , DebugToken* deferred_writes
-#endif // GRAAL
                                               ) {
   assert(_recording_state != rs_null, "nesting of recording calls");
   PcDesc* last_pd = last_pc();
@@ -355,9 +329,6 @@
   stream()->write_int((intptr_t) locals);
   stream()->write_int((intptr_t) expressions);
   stream()->write_int((intptr_t) monitors);
-#ifdef GRAAL
-  stream()->write_int((intptr_t) deferred_writes);
-#endif // GRAAL
 
   // Here's a tricky bit.  We just wrote some bytes.
   // Wouldn't it be nice to find that we had already
@@ -439,14 +410,6 @@
   return (DebugToken*) (intptr_t) serialize_monitor_values(monitors);
 }
 
-#ifdef GRAAL
-
-DebugToken* DebugInformationRecorder::create_deferred_writes(GrowableArray<DeferredWriteValue*>* deferred_writes) {
-  assert(!recorders_frozen(), "not frozen yet");
-  return (DebugToken*) (intptr_t) serialize_deferred_writes(deferred_writes);
-}
-
-#endif // GRAAL
 
 int DebugInformationRecorder::data_size() {
   debug_only(mark_recorders_frozen());  // mark it "frozen" for asserts
--- a/src/share/vm/code/debugInfoRec.hpp	Tue Mar 05 17:16:41 2013 +0100
+++ b/src/share/vm/code/debugInfoRec.hpp	Tue Mar 05 17:21:54 2013 +0100
@@ -108,9 +108,6 @@
                       DebugToken* locals      = NULL,
                       DebugToken* expressions = NULL,
                       DebugToken* monitors    = NULL
-#ifdef GRAAL
-                      , DebugToken* deferred_writes = NULL
-#endif // GRAAL
                       );
 
 
@@ -124,9 +121,6 @@
   // helper fuctions for describe_scope to enable sharing
   DebugToken* create_scope_values(GrowableArray<ScopeValue*>* values);
   DebugToken* create_monitor_values(GrowableArray<MonitorValue*>* monitors);
-#ifdef GRAAL
-  DebugToken* create_deferred_writes(GrowableArray<DeferredWriteValue*>* deferred_writes);
-#endif // GRAAL
 
   // returns the size of the generated scopeDescs.
   int data_size();
@@ -201,9 +195,6 @@
 
   int  serialize_monitor_values(GrowableArray<MonitorValue*>* monitors);
   int  serialize_scope_values(GrowableArray<ScopeValue*>* values);
-#ifdef GRAAL
-  int serialize_deferred_writes(GrowableArray<DeferredWriteValue*>* deferred_writes);
-#endif // GRAAL
   int  find_sharable_decode_offset(int stream_offset);
 
 #ifndef PRODUCT
--- a/src/share/vm/code/scopeDesc.cpp	Tue Mar 05 17:16:41 2013 +0100
+++ b/src/share/vm/code/scopeDesc.cpp	Tue Mar 05 17:21:54 2013 +0100
@@ -73,9 +73,6 @@
     _locals_decode_offset = DebugInformationRecorder::serialized_null;
     _expressions_decode_offset = DebugInformationRecorder::serialized_null;
     _monitors_decode_offset = DebugInformationRecorder::serialized_null;
-#ifdef GRAAL
-    _deferred_writes_decode_offset = DebugInformationRecorder::serialized_null;
-#endif // GRAAL
   } else {
     // decode header
     DebugInfoReadStream* stream  = stream_at(decode_offset());
@@ -88,9 +85,6 @@
     _locals_decode_offset      = stream->read_int();
     _expressions_decode_offset = stream->read_int();
     _monitors_decode_offset    = stream->read_int();
-#ifdef GRAAL
-    _deferred_writes_decode_offset = stream->read_int();
-#endif // GRAAL
   }
 }
 
--- a/src/share/vm/code/scopeDesc.hpp	Tue Mar 05 17:16:41 2013 +0100
+++ b/src/share/vm/code/scopeDesc.hpp	Tue Mar 05 17:21:54 2013 +0100
@@ -107,9 +107,6 @@
   int _locals_decode_offset;
   int _expressions_decode_offset;
   int _monitors_decode_offset;
-#ifdef GRAAL
-  int _deferred_writes_decode_offset;
-#endif // GRAAL
 
   // Object pool
   GrowableArray<ScopeValue*>* _objects;
@@ -122,9 +119,6 @@
   GrowableArray<ScopeValue*>* decode_scope_values(int decode_offset);
   GrowableArray<MonitorValue*>* decode_monitor_values(int decode_offset);
   GrowableArray<ScopeValue*>* decode_object_values(int decode_offset);
-#ifdef GRAAL
-  GrowableArray<DeferredWriteValue*>* decode_deferred_writes(int decode_offset);
-#endif // GRAAL
 
   DebugInfoReadStream* stream_at(int decode_offset) const;
 
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Tue Mar 05 17:16:41 2013 +0100
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Tue Mar 05 17:21:54 2013 +0100
@@ -575,13 +575,9 @@
   DebugToken* expressions_token = _debug_recorder->create_scope_values(expressions);
   DebugToken* monitors_token = _debug_recorder->create_monitor_values(monitors);
 
-  GrowableArray<DeferredWriteValue*>* deferred_writes = new GrowableArray<DeferredWriteValue*> ();
-//  deferred_writes->append(new DeferredWriteValue(new LocationValue(Location::new_reg_loc(Location::lng, rax->as_VMReg())), new ConstantIntValue(0), 0, 100, new ConstantIntValue(123)));
-  DebugToken* deferred_writes_token = _debug_recorder->create_deferred_writes(deferred_writes);
-
   bool throw_exception = BytecodeFrame::rethrowException(frame) == JNI_TRUE;
 
-  _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, false, locals_token, expressions_token, monitors_token, deferred_writes_token);
+  _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, false, locals_token, expressions_token, monitors_token);
 }
 
 void CodeInstaller::site_Safepoint(CodeBuffer& buffer, jint pc_offset, oop site) {