Mercurial > hg > truffle

changeset 13280:fbcdae53b17e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
force TypeProfileLevel to 0 in GRAAL until HotSpotMethodData is updated to be aware of the new profiling tags
author Doug Simon <doug.simon@oracle.com>
date Tue, 10 Dec 2013 22:09:27 +0100
parents 05de8cf71a41
children 4a6787110408
files src/cpu/x86/vm/globals_x86.hpp src/share/vm/runtime/arguments.cpp
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/globals_x86.hpp	Tue Dec 10 21:40:12 2013 +0100
+++ b/src/cpu/x86/vm/globals_x86.hpp	Tue Dec 10 22:09:27 2013 +0100
@@ -79,7 +79,8 @@
 // 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);
+// Disabled in GRAAL until HotSpotMethodData is updated to be aware of the new profiling tags
+define_pd_global(uintx, TypeProfileLevel, GRAAL_ONLY(0) NOT_GRAAL(111));
 
 #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \
                                                                             \
--- a/src/share/vm/runtime/arguments.cpp	Tue Dec 10 21:40:12 2013 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Tue Dec 10 22:09:27 2013 +0100
@@ -2336,6 +2336,10 @@
       warning("forcing ScavengeRootsInCode non-zero because Graal is enabled");
       ScavengeRootsInCode = 1;
   }
+  if (TypeProfileLevel != 0) {
+      warning("forcing TypeProfileLevel to 0 as HotSpotMethodData can not yet handle the new type profile info");
+      TypeProfileLevel = 0;
+  }
 #endif
 
   // Need to limit the extent of the padding to reasonable size.