More bot fixes

tests/compiler/dart2js/sourcemaps/diff_view.dart

Index: tests/compiler/dart2js/sourcemaps/diff_view.dart
diff --git a/tests/compiler/dart2js/sourcemaps/diff_view.dart b/tests/compiler/dart2js/sourcemaps/diff_view.dart
index 1c1090a52eaeba36cf4df0c9e4776a107bdf8d75..adeb6417a89477c8acb5e9dd35e466e179034815 100644
--- a/tests/compiler/dart2js/sourcemaps/diff_view.dart
+++ b/tests/compiler/dart2js/sourcemaps/diff_view.dart
@@ -65,11 +65,13 @@ main(List<String> args) async {
   List<String> commonArguments = optionSegments[0];
   List<List<String>> options = <List<String>>[];
   if (optionSegments.length == 1) {
+    // TODO(sigmund, johnniwinther): change default options now that CPS is
+    // deleted.
     // Use default options; comparing SSA and CPS output using the new
     // source information strategy.
     options.add([Flags.useNewSourceInfo]..addAll(commonArguments));
-    options.add(
-        [Flags.useNewSourceInfo, Flags.useCpsIr]..addAll(commonArguments));
+    options.add([Flags.useNewSourceInfo]..addAll(commonArguments));
+    throw "missing options: please specify options for the second column";
   } else if (optionSegments.length == 2) {
     // Use alternative options for the second output column.
     options.add(commonArguments);