Revert GN declare_args() change.

tools/gn/parse_tree.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/parse_tree.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <tuple>
@@ skipping 469 matching lines @@
 }
 
 IdentifierNode::~IdentifierNode() {
 }
 
 const IdentifierNode* IdentifierNode::AsIdentifier() const {
   return this;
 }
 
 Value IdentifierNode::Execute(Scope* scope, Err* err) const {
-  const Scope* found_in_scope = nullptr;
-  const Value* value = scope->GetValueWithScope(value_.value(), true,
-                                                &found_in_scope);
+  const Value* value = scope->GetValue(value_.value(), true);
   Value result;
   if (!value) {
     *err = MakeErrorDescribing("Undefined identifier");
     return result;
   }
 
-  if (!EnsureNotReadingFromSameDeclareArgs(this, scope, found_in_scope, err))
-    return result;
-
   result = *value;
   result.set_origin(this);
   return result;
 }
 
 LocationRange IdentifierNode::GetRange() const {
   return value_.range();
 }
 
 Err IdentifierNode::MakeErrorDescribing(const std::string& msg,
@@ skipping 360 matching lines @@
 
 Err EndNode::MakeErrorDescribing(const std::string& msg,
                                         const std::string& help) const {
   return Err(value_, msg, help);
 }
 
 void EndNode::Print(std::ostream& out, int indent) const {
   out << IndentFor(indent) << "END(" << value_.value() << ")\n";
   PrintComments(out, indent);
 }