[Courgette] Refactor: Store Label Annotation in AssemblyProgram for patch generation.

courgette/adjustment_method_2.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/adjustment_method.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "courgette/assembly_program.h"
 #include "courgette/courgette.h"
 #include "courgette/encoded_program.h"
 
 /*
@@ skipping 1218 matching lines @@
     Solve(rel32_trace_, rel32_model_end);
     prog_->AssignRemainingIndexes();
     return true;
   }
 
  private:
   void CollectTraces(const AssemblyProgram* program, Trace* abs32, Trace* rel32,
                      bool is_model) {
     label_info_maker_.ResetDebugLabel();
 
-    AssemblyProgram::LabelHandler abs32_handler = base::Bind(
-        &Adjuster::ReferenceLabel, base::Unretained(this), abs32, is_model);
-    AssemblyProgram::LabelHandler rel32_handler = base::Bind(
-        &Adjuster::ReferenceLabel, base::Unretained(this), rel32, is_model);
-
-    program->HandleInstructionLabels({{ABS32, abs32_handler},
-                                      {ABS64, abs32_handler},
-                                      {REL32, rel32_handler},
-                                      {REL32ARM, rel32_handler}});
+    for (Label* label : program->abs32_label_annotations())
+      ReferenceLabel(abs32, is_model, label);
+    for (Label* label : program->rel32_label_annotations())
+      ReferenceLabel(rel32, is_model, label);
 
     // TODO(sra): we could simply append all the labels in index order to
     // incorporate some costing for entropy (bigger deltas) that will be
     // introduced into the label address table by non-monotonic ordering.  This
     // would have some knock-on effects to parts of the algorithm that work on
     // single-occurrence labels.
   }
 
   void Solve(const Trace& model, size_t model_end) {
     base::Time start_time = base::Time::Now();
@@ skipping 19 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
 }  // namespace adjustment_method_2
 
 AdjustmentMethod* AdjustmentMethod::MakeShingleAdjustmentMethod() {
   return new adjustment_method_2::Adjuster();
 }
 
 }  // namespace courgette