src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java

*** 103,112 ****
--- 103,113 ----
  import static java.util.stream.Collectors.toList;
  import static jdk.jshell.Snippet.SubKind.VAR_VALUE_SUBKIND;
  import static java.util.stream.Collectors.toMap;
  import static jdk.internal.jshell.debug.InternalDebugControl.DBG_COMPA;
  import static jdk.internal.jshell.debug.InternalDebugControl.DBG_DEP;
+ import static jdk.internal.jshell.debug.InternalDebugControl.DBG_EC;
  import static jdk.internal.jshell.debug.InternalDebugControl.DBG_EVNT;
  import static jdk.internal.jshell.debug.InternalDebugControl.DBG_FMGR;
  import static jdk.internal.jshell.debug.InternalDebugControl.DBG_GEN;
  
  /**
*** 1373,1383 ****
      }
  
      boolean cmdDebug(String arg) {
          if (arg.isEmpty()) {
              debug = !debug;
!             InternalDebugControl.setDebugFlags(state, debug ? DBG_GEN : 0);
              fluff("Debugging %s", debug ? "on" : "off");
          } else {
              int flags = 0;
              for (char ch : arg.toCharArray()) {
                  switch (ch) {
--- 1374,1384 ----
      }
  
      boolean cmdDebug(String arg) {
          if (arg.isEmpty()) {
              debug = !debug;
!             InternalDebugControl.setDebugFlags(state, debug ? DBG_GEN | DBG_EC : 0);
              fluff("Debugging %s", debug ? "on" : "off");
          } else {
              int flags = 0;
              for (char ch : arg.toCharArray()) {
                  switch (ch) {
*** 1392,1401 ****
--- 1393,1406 ----
                          break;
                      case 'g':
                          flags |= DBG_GEN;
                          fluff("General debugging on");
                          break;
+                     case 'x':
+                         flags |= DBG_EC;
+                         fluff("Execution control debugging on");
+                         break;
                      case 'f':
                          flags |= DBG_FMGR;
                          fluff("File manager debugging on");
                          break;
                      case 'c':
*** 1410,1420 ****
                          flags |= DBG_EVNT;
                          fluff("Event debugging on");
                          break;
                      default:
                          hard("Unknown debugging option: %c", ch);
!                         fluff("Use: 0 r g f c d");
                          return false;
                  }
              }
              InternalDebugControl.setDebugFlags(state, flags);
          }
--- 1415,1425 ----
                          flags |= DBG_EVNT;
                          fluff("Event debugging on");
                          break;
                      default:
                          hard("Unknown debugging option: %c", ch);
!                         fluff("Use: 0 r g x f c d");
                          return false;
                  }
              }
              InternalDebugControl.setDebugFlags(state, flags);
          }