diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 240f638cc6c..23f56a684b6 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -841,7 +841,7 @@ yyparse ()
     }
 
   java_expand_classes ();
-  if (!java_report_errors () && !flag_emit_class_files)
+  if (!java_report_errors () && !flag_syntax_only)
     emit_register_classes ();
   return 0;
 }
diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index 8cd3c663852..a6771dbde91 100644
--- a/gcc/java/verify.c
+++ b/gcc/java/verify.c
@@ -979,6 +979,7 @@ verify_jvm_instructions (jcf, byte_ops, length)
 
 	    while (low++ <= high)
 	      PUSH_PENDING (lookup_label (oldpc + IMMEDIATE_s4));
+	    INVALIDATE_PC;
 	    break;
 	  }
 
@@ -1010,6 +1011,7 @@ verify_jvm_instructions (jcf, byte_ops, length)
 		last = match;
 		PUSH_PENDING (lookup_label (oldpc + IMMEDIATE_s4));
 	      }
+	    INVALIDATE_PC;
 	    break;
 	  }