GN: Separately track labels and origins for lists of stuff

tools/gn/value_extractors.cc

 // Copyright (c) 2013 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 "tools/gn/value_extractors.h"
 
 #include "tools/gn/build_settings.h"
 #include "tools/gn/err.h"
 #include "tools/gn/label.h"
 #include "tools/gn/source_dir.h"
@@ skipping 37 matching lines @@
     if (!v.VerifyTypeIs(Value::STRING, err))
       return false;
     *out = current_dir.ResolveRelativeDir(v.string_value(),
                                           build_settings->root_path_utf8());
     return true;
   }
   const BuildSettings* build_settings;
   const SourceDir& current_dir;
 };
 
-struct LabelResolver {
+// Fills the label part of a LabelPtrPair, leaving the pointer null.
+template<typename T> struct LabelResolver {
   LabelResolver(const SourceDir& current_dir_in,
                 const Label& current_toolchain_in)
       : current_dir(current_dir_in),
         current_toolchain(current_toolchain_in) {}
-  bool operator()(const Value& v, Label* out, Err* err) const {
+  bool operator()(const Value& v, LabelPtrPair<T>* out, Err* err) const {
     if (!v.VerifyTypeIs(Value::STRING, err))
       return false;
-    *out = Label::Resolve(current_dir, current_toolchain, v, err);
+    out->label = Label::Resolve(current_dir, current_toolchain, v, err);
+    out->origin = v.origin();
     return !err->has_error();
   }
   const SourceDir& current_dir;
   const Label& current_toolchain;
 };
 
 }  // namespace
 
 bool ExtractListOfStringValues(const Value& value,
                                std::vector<std::string>* dest,
@@ skipping 24 matching lines @@
                                const SourceDir& current_dir,
                                std::vector<SourceDir>* dest,
                                Err* err) {
   return ListValueExtractor(value, dest, err,
                             RelativeDirConverter(build_settings, current_dir));
 }
 
 bool ExtractListOfLabels(const Value& value,
                          const SourceDir& current_dir,
                          const Label& current_toolchain,
-                         std::vector<Label>* dest,
+                         LabelConfigVector* dest,
                          Err* err) {
   return ListValueExtractor(value, dest, err,
-                            LabelResolver(current_dir, current_toolchain));
+                            LabelResolver<Config>(current_dir,
+                                                  current_toolchain));
 }
+
+bool ExtractListOfLabels(const Value& value,
+                         const SourceDir& current_dir,
+                         const Label& current_toolchain,
+                         LabelTargetVector* dest,
+                         Err* err) {
+  return ListValueExtractor(value, dest, err,
+                            LabelResolver<Target>(current_dir,
+                                                  current_toolchain));
+}