[Courgette] AssemblyProgram: Serialize data to single raw buffer, instead of storing pointer of obj…

courgette/adjustment_method_2.cc

Index: courgette/adjustment_method_2.cc
diff --git a/courgette/adjustment_method_2.cc b/courgette/adjustment_method_2.cc
index b5fbb7c610fabe2b8c08f3edabce4b6c957983f8..4593c7f7d5b32c6f523b8c582404d8b18540e366 100644
--- a/courgette/adjustment_method_2.cc
+++ b/courgette/adjustment_method_2.cc
@@ -1259,10 +1259,10 @@ class Adjuster : public AdjustmentMethod {
     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}});
+    program->HandleInstructionLabels({{AssemblyOp::ABS32, abs32_handler},
+                                      {AssemblyOp::ABS64, abs32_handler},
+                                      {AssemblyOp::REL32, rel32_handler},
+                                      {AssemblyOp::REL32ARM, rel32_handler}});
 
     // TODO(sra): we could simply append all the labels in index order to
     // incorporate some costing for entropy (bigger deltas) that will be