GN: Use the correct defaults for templates invoked via target().

tools/gn/functions.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/functions.h"
 
 #include <stddef.h>
 #include <iostream>
 #include <utility>
 
@@ skipping 1018 matching lines @@
                   const ListNode* args_list,
                   BlockNode* block,
                   Err* err) {
   const Token& name = function->function();
 
   const FunctionInfoMap& function_map = GetFunctions();
   FunctionInfoMap::const_iterator found_function =
       function_map.find(name.value());
   if (found_function == function_map.end()) {
     // No built-in function matching this, check for a template.
-    const Template* templ =
-        scope->GetTemplate(function->function().value().as_string());
+    std::string template_name = function->function().value().as_string();

[brucedawson, 2016/07/14 17:39:26]

Should be const std::string - or maybe const auto?

[brettw, 2016/07/14 19:26:38]

I don't actually like "const" for local variables unless they're pointers or
references to something. I feel like this adds noise without much benefit. I'm
aware that other people like this, but I don't think it's a requirement and I've
been pretty consistent not doing this in the GN code.

+    const Template* templ = scope->GetTemplate(template_name);
     if (templ) {
       Value args = args_list->Execute(scope, err);
       if (err->has_error())
         return Value();
-      return templ->Invoke(scope, function, args.list_value(), block, err);
+      return templ->Invoke(scope, function, template_name, args.list_value(),
+                           block, err);
     }
 
     *err = Err(name, "Unknown function.");
     return Value();
   }
 
   if (found_function->second.self_evaluating_args_runner) {
     // Self evaluating args functions are special weird built-ins like foreach.
     // Rather than force them all to check that they have a block or no block
     // and risk bugs for new additions, check a whitelist here.
@@ skipping 41 matching lines @@
   }
 
   // Otherwise it's a no-block function.
   if (!VerifyNoBlockForFunctionCall(function, block, err))
     return Value();
   return found_function->second.no_block_runner(scope, function,
                                                 args.list_value(), err);
 }
 
 }  // namespace functions