Fix --startup-timeline

runtime/vm/timeline.cc

 // Copyright (c) 2015, 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.
 
 #include <cstdlib>
 
 #include "vm/atomic.h"
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
 #include "vm/lockers.h"
@@ skipping 67 matching lines @@
 //     |Thread::timeline_block_lock_|
 //       |TimelineEventRecorder::lock_|
 //
 
 
 static TimelineEventRecorder* CreateTimelineRecorder() {
   // Some flags require that we use the endless recorder.
   const bool use_endless_recorder =
       (FLAG_timeline_dir != NULL) || FLAG_timing || FLAG_complete_timeline;
 
+  const bool use_startup_recorder = FLAG_startup_timeline;
+
   const char* flag = FLAG_timeline_recorder;
 
   if (use_endless_recorder || (flag != NULL)) {
-    if (use_endless_recorder || strcmp("endless", flag) == 0) {
+    if (use_endless_recorder || (strcmp("endless", flag) == 0)) {
       if (FLAG_trace_timeline) {
         THR_Print("Using the endless timeline recorder.\n");
       }
       return new TimelineEventEndlessRecorder();
     }
+  }
 
-    if (strcmp("startup", flag) == 0) {
+  if (use_startup_recorder || (flag != NULL)) {
+    if (use_startup_recorder || (strcmp("startup", flag) == 0)) {
       if (FLAG_trace_timeline) {
         THR_Print("Using the startup recorder.\n");
       }
       return new TimelineEventStartupRecorder();
     }
   }
 
   if (FLAG_trace_timeline) {
     THR_Print("Using the ring timeline recorder.\n");
   }
@@ skipping 1474 matching lines @@
 TimelineEventBlock* TimelineEventBlockIterator::Next() {
   ASSERT(current_ != NULL);
   TimelineEventBlock* r = current_;
   current_ = current_->next();
   return r;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart