changeset 13087:ec3e4f35e466

disabled argument/parameter/return value profiling in GRAALVM until issue with MethodData related crashes in interpreter are resolved
author Doug Simon <doug.simon@oracle.com>
date Wed, 20 Nov 2013 15:58:23 +0100
parents 096c224171c4
children 514e809bd97d
files src/cpu/x86/vm/globals_x86.hpp src/share/vm/code/nmethod.hpp src/share/vm/oops/methodData.cpp
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/globals_x86.hpp	Wed Nov 20 00:10:38 2013 +0100
+++ b/src/cpu/x86/vm/globals_x86.hpp	Wed Nov 20 15:58:23 2013 +0100
@@ -79,7 +79,7 @@
 // GC Ergo Flags
 define_pd_global(uintx, CMSYoungGenPerWorker, 64*M);  // default max size of CMS young gen, per GC worker thread
 
-define_pd_global(uintx, TypeProfileLevel, 111);
+define_pd_global(uintx, TypeProfileLevel, GRAALVM_ONLY(0) NOT_GRAALVM(111));
 
 #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \
                                                                             \
--- a/src/share/vm/code/nmethod.hpp	Wed Nov 20 00:10:38 2013 +0100
+++ b/src/share/vm/code/nmethod.hpp	Wed Nov 20 15:58:23 2013 +0100
@@ -696,7 +696,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,
--- a/src/share/vm/oops/methodData.cpp	Wed Nov 20 00:10:38 2013 +0100
+++ b/src/share/vm/oops/methodData.cpp	Wed Nov 20 15:58:23 2013 +0100
@@ -1074,6 +1074,8 @@
   } else {
     _parameters_type_data_di = -1;
   }
+#else
+  _parameters_type_data_di = -1;
 #endif
 
   // Set an initial hint. Don't use set_hint_di() because