Merge
authorstefank
Thu, 28 Apr 2016 22:32:06 +0200
changeset 38114 5231f6945aba
parent 38112 7babe39983c0 (current diff)
parent 38113 0df3b8f87cca (diff)
child 38117 3fadbdec25d5
child 38119 73a5fe26aa22
child 38144 0976c0c5c5d3
Merge
--- a/hotspot/src/share/vm/compiler/directivesParser.cpp	Thu Apr 28 13:44:36 2016 -0400
+++ b/hotspot/src/share/vm/compiler/directivesParser.cpp	Thu Apr 28 22:32:06 2016 +0200
@@ -57,7 +57,7 @@
 }
 
 int DirectivesParser::parse_string(const char* text, outputStream* st) {
-  DirectivesParser cd(text, st);
+  DirectivesParser cd(text, st, false);
   if (cd.valid()) {
     return cd.install_directives();
   } else {
@@ -132,8 +132,8 @@
   }
 }
 
-DirectivesParser::DirectivesParser(const char* text, outputStream* st)
-: JSON(text, false, st), depth(0), current_directive(NULL), current_directiveset(NULL), _tmp_top(NULL), _tmp_depth(0) {
+DirectivesParser::DirectivesParser(const char* text, outputStream* st, bool silent)
+: JSON(text, silent, st), depth(0), current_directive(NULL), current_directiveset(NULL), _tmp_top(NULL), _tmp_depth(0) {
 #ifndef PRODUCT
   memset(stack, 0, MAX_DEPTH * sizeof(stack[0]));
 #endif
@@ -594,7 +594,7 @@
 
 #ifndef PRODUCT
 void DirectivesParser::test(const char* text, bool should_pass) {
-  DirectivesParser cd(text, tty);
+  DirectivesParser cd(text, tty, !VerboseInternalVMTests);
   if (should_pass) {
     assert(cd.valid() == true, "failed on a valid DirectivesParser string");
     if (VerboseInternalVMTests) {
--- a/hotspot/src/share/vm/compiler/directivesParser.hpp	Thu Apr 28 13:44:36 2016 -0400
+++ b/hotspot/src/share/vm/compiler/directivesParser.hpp	Thu Apr 28 22:32:06 2016 +0200
@@ -55,7 +55,7 @@
   int install_directives();
 
 private:
-  DirectivesParser(const char* text, outputStream* st);
+  DirectivesParser(const char* text, outputStream* st, bool silent);
   ~DirectivesParser();
 
   bool callback(JSON_TYPE t, JSON_VAL* v, uint level);