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

courgette/adjustment_method.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 <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "courgette/assembly_program.h"
 #include "courgette/courgette.h"
 #include "courgette/encoded_program.h"
 
 namespace courgette {
 
@@ skipping 560 matching lines @@
     CollectTraces(prog_,  &prog_abs32_,  &prog_rel32_,  false);
     Solve(model_abs32_, prog_abs32_);
     Solve(model_rel32_, prog_rel32_);
     prog_->AssignRemainingIndexes();
     return true;
   }
 
  private:
   void CollectTraces(const AssemblyProgram* program, Trace* abs32, Trace* rel32,
                      bool is_model) {
-    AssemblyProgram::LabelHandler abs32_handler =
-        base::Bind(&GraphAdjuster::ReferenceLabel, base::Unretained(this),
-                   abs32, is_model);
-    AssemblyProgram::LabelHandler rel32_handler =
-        base::Bind(&GraphAdjuster::ReferenceLabel, base::Unretained(this),
-                   rel32, is_model);
-
-    program->HandleInstructionLabels({{ABS32, 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, const Trace& problem) {
     LinkLabelInfos(model);
@@ skipping 71 matching lines @@
   AdjustmentMethod* method = AdjustmentMethod::MakeProductionAdjustmentMethod();
   bool ok = method->Adjust(model, program);
   method->Destroy();
   if (ok)
     return C_OK;
   else
     return C_ADJUSTMENT_FAILED;
 }
 
 }  // namespace courgette