More bot fixes

tests/compiler/dart2js/sourcemaps/diff_view.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library sourcemap.diff_view;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
@@ skipping 47 matching lines @@
       out = arg.substring('--out='.length);
     } else if (arg.startsWith('-')) {
       currentOptions.add(arg);
     } else {
       filename = arg;
     }
   }
   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);
     options.add(optionSegments[1]..addAll(commonArguments));
   } else {
     // Use specific options for both output columns.
     options.add(optionSegments[1]..addAll(commonArguments));
     options.add(optionSegments[2]..addAll(commonArguments));
   }
 
@@ skipping 907 matching lines @@
       return new AnnotationData(
           tag: 'span',
           properties: {
             'title': annotation.title,
             'class': '${ClassNames.marker} '
                      '${data.annotationType.className}'});
     }
   }
   return null;
 }