Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: tools/gn/builder.cc

Issue 1375023003: tools/gn: Remove code for forward_dependent_configs_from variable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: forward_dependent_configs Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "tools/gn/builder.h" 5 #include "tools/gn/builder.h"
6 6
7 #include "tools/gn/config.h" 7 #include "tools/gn/config.h"
8 #include "tools/gn/deps_iterator.h" 8 #include "tools/gn/deps_iterator.h"
9 #include "tools/gn/err.h" 9 #include "tools/gn/err.h"
10 #include "tools/gn/loader.h" 10 #include "tools/gn/loader.h"
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 DCHECK(record->can_resolve() && !record->resolved()); 409 DCHECK(record->can_resolve() && !record->resolved());
410 410
411 if (record->type() == BuilderRecord::ITEM_TARGET) { 411 if (record->type() == BuilderRecord::ITEM_TARGET) {
412 Target* target = record->item()->AsTarget(); 412 Target* target = record->item()->AsTarget();
413 if (!ResolveDeps(&target->public_deps(), err) || 413 if (!ResolveDeps(&target->public_deps(), err) ||
414 !ResolveDeps(&target->private_deps(), err) || 414 !ResolveDeps(&target->private_deps(), err) ||
415 !ResolveDeps(&target->data_deps(), err) || 415 !ResolveDeps(&target->data_deps(), err) ||
416 !ResolveConfigs(&target->configs(), err) || 416 !ResolveConfigs(&target->configs(), err) ||
417 !ResolveConfigs(&target->all_dependent_configs(), err) || 417 !ResolveConfigs(&target->all_dependent_configs(), err) ||
418 !ResolveConfigs(&target->public_configs(), err) || 418 !ResolveConfigs(&target->public_configs(), err) ||
419 !ResolveForwardDependentConfigs(target, err) ||
420 !ResolveToolchain(target, err)) 419 !ResolveToolchain(target, err))
421 return false; 420 return false;
422 } else if (record->type() == BuilderRecord::ITEM_CONFIG) { 421 } else if (record->type() == BuilderRecord::ITEM_CONFIG) {
423 Config* config = record->item()->AsConfig(); 422 Config* config = record->item()->AsConfig();
424 if (!ResolveConfigs(&config->configs(), err)) 423 if (!ResolveConfigs(&config->configs(), err))
425 return false; 424 return false;
426 } else if (record->type() == BuilderRecord::ITEM_TOOLCHAIN) { 425 } else if (record->type() == BuilderRecord::ITEM_TOOLCHAIN) {
427 Toolchain* toolchain = record->item()->AsToolchain(); 426 Toolchain* toolchain = record->item()->AsToolchain();
428 if (!ResolveDeps(&toolchain->deps(), err)) 427 if (!ResolveDeps(&toolchain->deps(), err))
429 return false; 428 return false;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 469
471 BuilderRecord* record = GetResolvedRecordOfType( 470 BuilderRecord* record = GetResolvedRecordOfType(
472 cur.label, cur.origin, BuilderRecord::ITEM_CONFIG, err); 471 cur.label, cur.origin, BuilderRecord::ITEM_CONFIG, err);
473 if (!record) 472 if (!record)
474 return false; 473 return false;
475 const_cast<LabelConfigPair&>(cur).ptr = record->item()->AsConfig(); 474 const_cast<LabelConfigPair&>(cur).ptr = record->item()->AsConfig();
476 } 475 }
477 return true; 476 return true;
478 } 477 }
479 478
480 // "Forward dependent configs" should refer to targets in the deps that should
481 // have their configs forwarded.
482 bool Builder::ResolveForwardDependentConfigs(Target* target, Err* err) {
483 const UniqueVector<LabelTargetPair>& configs =
484 target->forward_dependent_configs();
485
486 // Assume that the lists are small so that brute-force n^2 is appropriate.
487 for (const auto& config : configs) {
488 for (const auto& dep_pair : target->GetDeps(Target::DEPS_LINKED)) {
489 if (config.label == dep_pair.label) {
490 DCHECK(dep_pair.ptr); // Should already be resolved.
491 // UniqueVector's contents are constant so uniqueness is preserved, but
492 // we want to update this pointer which doesn't change uniqueness
493 // (uniqueness in this vector is determined by the label only).
494 const_cast<LabelTargetPair&>(config).ptr = dep_pair.ptr;
495 break;
496 }
497 }
498 if (!config.ptr) {
499 *err = Err(target->defined_from(),
500 "Target in forward_dependent_configs_from was not listed in the deps",
501 "This target has a forward_dependent_configs_from entry that was "
502 "not present in\nthe deps. A target can only forward things it "
503 "depends on. It was forwarding:\n " +
504 config.label.GetUserVisibleName(false));
505 return false;
506 }
507 }
508 return true;
509 }
510
511 bool Builder::ResolveToolchain(Target* target, Err* err) { 479 bool Builder::ResolveToolchain(Target* target, Err* err) {
512 BuilderRecord* record = GetResolvedRecordOfType( 480 BuilderRecord* record = GetResolvedRecordOfType(
513 target->settings()->toolchain_label(), target->defined_from(), 481 target->settings()->toolchain_label(), target->defined_from(),
514 BuilderRecord::ITEM_TOOLCHAIN, err); 482 BuilderRecord::ITEM_TOOLCHAIN, err);
515 if (!record) { 483 if (!record) {
516 *err = Err(target->defined_from(), 484 *err = Err(target->defined_from(),
517 "Toolchain for target not defined.", 485 "Toolchain for target not defined.",
518 "I was hoping to find a toolchain " + 486 "I was hoping to find a toolchain " +
519 target->settings()->toolchain_label().GetUserVisibleName(false)); 487 target->settings()->toolchain_label().GetUserVisibleName(false));
520 return false; 488 return false;
(...skipping 14 matching lines...) Expand all
535 std::string ret; 503 std::string ret;
536 for (size_t i = 0; i < cycle.size(); i++) { 504 for (size_t i = 0; i < cycle.size(); i++) {
537 ret += " " + cycle[i]->label().GetUserVisibleName(false); 505 ret += " " + cycle[i]->label().GetUserVisibleName(false);
538 if (i != cycle.size() - 1) 506 if (i != cycle.size() - 1)
539 ret += " ->"; 507 ret += " ->";
540 ret += "\n"; 508 ret += "\n";
541 } 509 }
542 510
543 return ret; 511 return ret;
544 } 512 }
OLDNEW
« no previous file with comments | « tools/gn/builder.h ('k') | tools/gn/command_desc.cc » ('j') | tools/gn/target_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698