Automatic merge of jdk:master into master

duke · duke · commit b88b44bda618 · 2023-04-04T22:17:26.000Z
diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp
@@ -698,7 +698,7 @@ class CompilerDirectivesRemoveDCmd : public DCmd {
   }
   static const JavaPermission permission() {
     JavaPermission p = {"java.lang.management.ManagementPermission",
-                        "monitor", nullptr};
+                        "control", nullptr};
     return p;
   }
   virtual void execute(DCmdSource source, TRAPS);
@@ -721,7 +721,7 @@ class CompilerDirectivesAddDCmd : public DCmdWithParser {
   }
   static const JavaPermission permission() {
     JavaPermission p = {"java.lang.management.ManagementPermission",
-                        "monitor", nullptr};
+                        "control", nullptr};
     return p;
   }
   virtual void execute(DCmdSource source, TRAPS);
@@ -741,7 +741,7 @@ class CompilerDirectivesClearDCmd : public DCmd {
   }
   static const JavaPermission permission() {
     JavaPermission p = {"java.lang.management.ManagementPermission",
-                        "monitor", nullptr};
+                        "control", nullptr};
     return p;
   }
   virtual void execute(DCmdSource source, TRAPS);

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ class CompilerDirectivesRemoveDCmd : public DCmd {`
`698`	`698`	`}`
`699`	`699`	`static const JavaPermission permission() {`
`700`	`700`	`JavaPermission p = {"java.lang.management.ManagementPermission",`
`701`		`- "monitor", nullptr};`
	`701`	`+ "control", nullptr};`
`702`	`702`	`return p;`
`703`	`703`	`}`
`704`	`704`	`virtual void execute(DCmdSource source, TRAPS);`
`@@ -721,7 +721,7 @@ class CompilerDirectivesAddDCmd : public DCmdWithParser {`
`721`	`721`	`}`
`722`	`722`	`static const JavaPermission permission() {`
`723`	`723`	`JavaPermission p = {"java.lang.management.ManagementPermission",`
`724`		`- "monitor", nullptr};`
	`724`	`+ "control", nullptr};`
`725`	`725`	`return p;`
`726`	`726`	`}`
`727`	`727`	`virtual void execute(DCmdSource source, TRAPS);`
`@@ -741,7 +741,7 @@ class CompilerDirectivesClearDCmd : public DCmd {`
`741`	`741`	`}`
`742`	`742`	`static const JavaPermission permission() {`
`743`	`743`	`JavaPermission p = {"java.lang.management.ManagementPermission",`
`744`		`- "monitor", nullptr};`
	`744`	`+ "control", nullptr};`
`745`	`745`	`return p;`
`746`	`746`	`}`
`747`	`747`	`virtual void execute(DCmdSource source, TRAPS);`