--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Tue Aug 28 09:01:54 2018 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Wed Aug 29 09:36:17 2018 +0200
@@ -176,10 +176,15 @@
     }
 
     public void visitCase(JCCase tree) {
-        scan(tree.pat);
+        scan(tree.pats);
         scan(tree.stats);
     }
 
+    public void visitSwitchExpression(JCSwitchExpression tree) {
+        scan(tree.selector);
+        scan(tree.cases);
+    }
+
     public void visitSynchronized(JCSynchronized tree) {
         scan(tree.lock);
         scan(tree.body);
@@ -214,6 +219,7 @@
     }
 
     public void visitBreak(JCBreak tree) {
+        scan(tree.value);
     }
 
     public void visitContinue(JCContinue tree) {