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

courgette/patch_generator_x86_32.h

 // 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.
 
 // This is the transformation and adjustment for all executables.
 // The executable type is determined by ParseDetectedExecutable function.
 
-#ifndef COURGETTE_WIN32_X86_GENERATOR_H_
-#define COURGETTE_WIN32_X86_GENERATOR_H_
+#ifndef COURGETTE_PATCH_GENERATOR_X86_32_H_
+#define COURGETTE_PATCH_GENERATOR_X86_32_H_
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "courgette/assembly_program.h"
 #include "courgette/ensemble.h"
 #include "courgette/patcher_x86_32.h"
 #include "courgette/program_detector.h"
 
@@ skipping 38 matching lines @@
   Status Transform(SourceStreamSet* corrected_parameters,
                    SinkStreamSet* old_transformed_element,
                    SinkStreamSet* new_transformed_element) {
     // Don't expect any corrected parameters.
     if (!corrected_parameters->Empty())
       return C_GENERAL_ERROR;
 
     // Generate old version of program using |corrected_parameters|.
     // TODO(sra): refactor to use same code from patcher_.
     std::unique_ptr<AssemblyProgram> old_program;
-    Status old_parse_status =
-        ParseDetectedExecutable(old_element_->region().start(),
-                                old_element_->region().length(),
-                                &old_program);
+    Status old_parse_status = ParseDetectedExecutableWithAnnotation(
+        old_element_->region().start(), old_element_->region().length(),
+        &old_program);
     if (old_parse_status != C_OK) {
       LOG(ERROR) << "Cannot parse an executable " << old_element_->Name();
       return old_parse_status;
     }
 
     // TODO(huangs): Move the block below to right before |new_program| gets
     // used, so we can reduce Courgette-gen peak memory.
     std::unique_ptr<AssemblyProgram> new_program;
-    Status new_parse_status =
-        ParseDetectedExecutable(new_element_->region().start(),
-                                new_element_->region().length(),
-                                &new_program);
+    Status new_parse_status = ParseDetectedExecutableWithAnnotation(
+        new_element_->region().start(), new_element_->region().length(),
+        &new_program);
     if (new_parse_status != C_OK) {
       LOG(ERROR) << "Cannot parse an executable " << new_element_->Name();
       return new_parse_status;
     }
 
     std::unique_ptr<EncodedProgram> old_encoded;
     Status old_encode_status = Encode(*old_program, &old_encoded);
     if (old_encode_status != C_OK)
       return old_encode_status;
 
@@ skipping 31 matching lines @@
  private:
   virtual ~PatchGeneratorX86_32() { }
 
   ExecutableType kind_;
 
   DISALLOW_COPY_AND_ASSIGN(PatchGeneratorX86_32);
 };
 
 }  // namespace courgette
 
-#endif  // COURGETTE_WIN32_X86_GENERATOR_H_
+#endif  // COURGETTE_PATCH_GENERATOR_X86_32_H_