commit 0707abbaf0b5e271f46f448ac5e7782b09cc824d
author Matthew Dempsky <mdempsky@google.com> Fri May 03 18:43:22 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Fri May 03 18:43:22 2019 +0000
tree f8ca2a7ff363d07d262a29a0389b57461bd79c30
parent bdc91968a2123ea616262011aa157f93a77f2495

[vm] Remove unnecessary indirection in AlternativeGenerationList

Change-Id: I2f3da7d68cf1b9b568e3841cd8b7c8a79d467e3f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101063
Reviewed-by: Teagan Strickland <sstrickl@google.com>
Commit-Queue: Matthew Dempsky <mdempsky@google.com>

runtime/vm/regexp.cc

diff --git a/runtime/vm/regexp.cc b/runtime/vm/regexp.cc
index 23eff8f..12796de 100644
--- a/runtime/vm/regexp.cc
+++ b/runtime/vm/regexp.cc
@@ -4,6 +4,8 @@
 
 #include "vm/regexp.h"
 
+#include <memory>
+
 #include "platform/splay-tree-inl.h"
 #include "platform/unicode.h"
 
@@ -2713,29 +2715,31 @@
 // size then it is on the stack, otherwise the excess is on the heap.
 class AlternativeGenerationList {
  public:
-  explicit AlternativeGenerationList(intptr_t count) : alt_gens_(count) {
-    for (intptr_t i = 0; i < count && i < kAFew; i++) {
-      alt_gens_.Add(a_few_alt_gens_ + i);
-    }
-    for (intptr_t i = kAFew; i < count; i++) {
-      alt_gens_.Add(new AlternativeGeneration());
-    }
-  }
-  ~AlternativeGenerationList() {
-    for (intptr_t i = kAFew; i < alt_gens_.length(); i++) {
-      delete alt_gens_[i];
-      alt_gens_[i] = NULL;
+  explicit AlternativeGenerationList(intptr_t count) : count_(count) {
+    ASSERT(count >= 0);
+    if (count > kAFew) {
+      excess_alt_gens_.reset(new AlternativeGeneration[count - kAFew]);
     }
   }
 
-  AlternativeGeneration* at(intptr_t i) { return alt_gens_[i]; }
+  AlternativeGeneration* at(intptr_t i) {
+    ASSERT(0 <= i);
+    ASSERT(i < count_);
+    if (i < kAFew) {
+      return &a_few_alt_gens_[i];
+    }
+    return &excess_alt_gens_[i - kAFew];
+  }
 
  private:
   static const intptr_t kAFew = 10;
-  GrowableArray<AlternativeGeneration*> alt_gens_;
+
+  intptr_t count_;
   AlternativeGeneration a_few_alt_gens_[kAFew];
+  std::unique_ptr<AlternativeGeneration[]> excess_alt_gens_;
 
   DISALLOW_ALLOCATION();
+  DISALLOW_COPY_AND_ASSIGN(AlternativeGenerationList);
 };
 
 static const int32_t kRangeEndMarker = Utf::kMaxCodePoint + 1;