Makes declared_arguments per toolchain

tools/gn/args.h

 // 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.
 
 #ifndef TOOLS_GN_ARGS_H_
 #define TOOLS_GN_ARGS_H_
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/synchronization/lock.h"
@@ skipping 43 matching lines @@
   //
   // On failure, the err will be set and it will return false.
   bool DeclareArgs(const Scope::KeyValueMap& args,
                    Scope* scope_to_set,
                    Err* err) const;
 
   // Checks to see if any of the overrides ever used were never declared as
   // arguments. If there are, this returns false and sets the error.
   bool VerifyAllOverridesUsed(Err* err) const;
 
+  // Adds all declared arguments to the given output list. If the values exist
+  // in the list already, their values will be overwriten, but other values
+  // already in the list will remain.
+  void MergeDeclaredArguments(Scope::KeyValueMap* dest) const;
+
+ private:
+  using DeclaredArgumentsPerToolchain =
+      base::hash_map<const Settings*, Scope::KeyValueMap>;
+
   // Like VerifyAllOverridesUsed but takes the lists of overrides specified and
   // parameters declared.
   static bool VerifyAllOverridesUsed(

[sky, 2015/03/13 20:43:13]

I moved this to the private block as no one but this class used it and I was
worried it may be misused externally.

       const Scope::KeyValueMap& overrides,
       const Scope::KeyValueMap& declared_arguments,
       Err* err);
 
-  // Adds all declared arguments to the given output list. If the values exist
-  // in the list already, their values will be overwriten, but other values
-  // already in the list will remain.
-  void MergeDeclaredArguments(Scope::KeyValueMap* dest) const;
-
- private:
   // Sets the default config based on the current system.
   void SetSystemVarsLocked(Scope* scope) const;
 
   // Sets the given vars on the given scope.
   void ApplyOverridesLocked(const Scope::KeyValueMap& values,
                             Scope* scope) const;
 
   void SaveOverrideRecordLocked(const Scope::KeyValueMap& values) const;
 
+  // Returns the KeyValueMap used for arguments declared for the specified
+  // toolchain.
+  // NOTE: this does not grab a lock.

[brettw, 2015/03/14 05:14:32]

I was calling such functions ...Locked. I think if you rename it you can delete
this comment.

[sky, 2015/03/16 16:20:45]

Done.

+  Scope::KeyValueMap& DeclaredArgumentsForToolchain(Scope* scope) const;
+
   // Since this is called during setup which we assume is single-threaded,
   // this is not protected by the lock. It should be set only during init.
   Scope::KeyValueMap overrides_;
 
   mutable base::Lock lock_;
 
   // Maintains a list of all overrides we've ever seen. This is the main
   // |overrides_| as well as toolchain overrides. Tracking this allows us to
   // check for overrides that were specified but never used.
   mutable Scope::KeyValueMap all_overrides_;
 
-  // Tracks all variables declared in any buildfile. This is so we can see if
-  // the user set variables on the command line that are not used anywhere.
-  mutable Scope::KeyValueMap declared_arguments_;
+  // Maps from Settings (which corresponds to a toolchain) to the map of
+  // declared variables. This is used to tracks all variables declared in any
+  // buildfile. This is so we can see if the user set variables on the command
+  // line that are not used anywhere. Each map is toolchain specific as each
+  // toolchain may define variables in different locations.
+  mutable DeclaredArgumentsPerToolchain declared_arguments_per_toolchain_;
 
   Args& operator=(const Args& other);  // Disallow assignment.
 };
 
 #endif  // TOOLS_GN_ARGS_H_