Mercurial > hg > truffle

changeset 8159:c5ff08c22458

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix regression in client compiler debug recording.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 08 Mar 2013 00:39:48 +0100
parents 53bc01380011
children a357b7a3de5e
files src/share/vm/c1/c1_IR.hpp src/share/vm/code/debugInfo.hpp src/share/vm/code/dependencies.cpp src/share/vm/code/nmethod.cpp src/share/vm/code/nmethod.hpp
diffstat 5 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/c1/c1_IR.hpp	Thu Mar 07 23:24:05 2013 +0100
+++ b/src/share/vm/c1/c1_IR.hpp	Fri Mar 08 00:39:48 2013 +0100
@@ -240,7 +240,8 @@
     // reexecute allowed only for the topmost frame
     bool reexecute = topmost ? should_reexecute() : false;
     bool return_oop = false; // This flag will be ignored since it used only for C2 with escape analysis.
-    recorder->describe_scope(pc_offset, methodHandle(), scope()->method(), bci(), reexecute, is_method_handle_invoke, return_oop, locvals, expvals, monvals);
+    bool rethrow_exception = false;
+    recorder->describe_scope(pc_offset, methodHandle(), scope()->method(), bci(), reexecute, rethrow_exception, is_method_handle_invoke, return_oop, locvals, expvals, monvals);
   }
 };
 
--- a/src/share/vm/code/debugInfo.hpp	Thu Mar 07 23:24:05 2013 +0100
+++ b/src/share/vm/code/debugInfo.hpp	Fri Mar 08 00:39:48 2013 +0100
@@ -61,11 +61,6 @@
   // Serialization of debugging information
   virtual void write_on(DebugInfoWriteStream* stream) = 0;
   static ScopeValue* read_from(DebugInfoReadStream* stream);
-
-#ifdef GRAAL
-  // Printing
-  virtual void print_on(outputStream* st) const = 0;
-#endif // GRAAL
 };
 
 
--- a/src/share/vm/code/dependencies.cpp	Thu Mar 07 23:24:05 2013 +0100
+++ b/src/share/vm/code/dependencies.cpp	Fri Mar 08 00:39:48 2013 +0100
@@ -563,6 +563,7 @@
   _size_in_bytes = bytes.position();
 }
 
+
 const char* Dependencies::_dep_name[TYPE_LIMIT] = {
   "end_marker",
   "evol_method",
--- a/src/share/vm/code/nmethod.cpp	Thu Mar 07 23:24:05 2013 +0100
+++ b/src/share/vm/code/nmethod.cpp	Fri Mar 08 00:39:48 2013 +0100
@@ -46,9 +46,6 @@
 #ifdef SHARK
 #include "shark/sharkCompiler.hpp"
 #endif
-#ifdef GRAAL
-#include "graal/graalJavaAccess.hpp"
-#endif
 
 #ifdef DTRACE_ENABLED
 
--- a/src/share/vm/code/nmethod.hpp	Thu Mar 07 23:24:05 2013 +0100
+++ b/src/share/vm/code/nmethod.hpp	Fri Mar 08 00:39:48 2013 +0100
@@ -686,7 +686,7 @@
 
   // Prints a comment for one native instruction (reloc info, pc desc)
   void print_code_comment_on(outputStream* st, int column, address begin, address end);
-  static void print_statistics();
+  static void print_statistics()                  PRODUCT_RETURN;
 
   // Compiler task identification.  Note that all OSR methods
   // are numbered in an independent sequence if CICountOSR is true,