Fixed bug in vm/benchmark_test.h

runtime/vm/benchmark_test.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_BENCHMARK_TEST_H_
 #define VM_BENCHMARK_TEST_H_
 
 #include "include/dart_api.h"
 
 #include "vm/dart.h"
 #include "vm/globals.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/zone.h"
 
 namespace dart {
 
 DECLARE_FLAG(int, code_heap_size);
 DECLARE_FLAG(int, heap_growth_space_ratio);
 
 // The BENCHMARK macro is used for benchmarking a specific functionality
 // of the VM
 #define BENCHMARK(name)                                                        \
   void Dart_Benchmark##name(Benchmark* benchmark);                             \
-  static const Benchmark kRegister##name(Dart_Benchmark##name, #name);         \
+  static Benchmark kRegister##name(Dart_Benchmark##name, #name);               \
   static void Dart_BenchmarkHelper##name(Benchmark* benchmark);                \
   void Dart_Benchmark##name(Benchmark* benchmark) {                            \
     FLAG_heap_growth_space_ratio = 100;                                        \
     BenchmarkIsolateScope __isolate__(benchmark);                              \
     StackZone __zone__(benchmark->isolate());                                  \
     HandleScope __hs__(benchmark->isolate());                                  \
     Dart_BenchmarkHelper##name(benchmark);                                     \
   }                                                                            \
   static void Dart_BenchmarkHelper##name(Benchmark* benchmark)
 
@@ skipping 43 matching lines @@
   static const char* Executable() { return executable_; }
 
  private:
   static Benchmark* first_;
   static Benchmark* tail_;
   static const char* executable_;
 
   RunEntry* const run_;
   const char* name_;
   intptr_t score_;
   Dart_Isolate isolate_;

[Ivan Posva, 2013/05/06 14:44:31]

isolate_ is just the first victim, but there are more fields that are not const
in this structure, such as score_.

   Benchmark* next_;
 
   DISALLOW_COPY_AND_ASSIGN(Benchmark);
 };
 
 
 class BenchmarkIsolateScope {
  public:
   explicit BenchmarkIsolateScope(Benchmark* benchmark) : benchmark_(benchmark) {
     benchmark_->CreateIsolate(NULL);
     Dart_EnterScope();  // Create a Dart API scope for unit benchmarks.
   }
   ~BenchmarkIsolateScope() {
     Dart_ExitScope();  // Exit the Dart API scope created for unit tests.
     ASSERT(benchmark_->isolate() == Isolate::Current());
     Dart_ShutdownIsolate();
     benchmark_ = NULL;
   }
   Benchmark* benchmark() const { return benchmark_; }
 
  private:
   Benchmark* benchmark_;
 
   DISALLOW_COPY_AND_ASSIGN(BenchmarkIsolateScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_BENCHMARK_TEST_H_