From 875c7a7b13b77ed65ceab1fe71d6c50e9647e36b Mon Sep 17 00:00:00 2001
From: Greg Estren <gregce@google.com>
Date: Thu, 24 Sep 2015 19:57:54 +0000
Subject: Change Attribute.skipConstraintsCheck() (and similar methods) to
 Attribute.skipPrereqValidatorCheck.

This is to disambiguate the concept of "constraints" and keep
the word consciously focused on Bazel's *new* constraint system.
The changed methods refer to checks done by PrerequisiteValidator,
which is basically an adhoc version of the "old" system (e.g.
checking visibility)

--
MOS_MIGRATED_REVID=103872412
---
 .../devtools/build/lib/analysis/BaseRuleClasses.java   |  2 +-
 .../devtools/build/lib/analysis/RuleContext.java       |  2 +-
 .../build/lib/bazel/rules/cpp/BazelCppRuleClasses.java |  2 +-
 .../google/devtools/build/lib/packages/Attribute.java  | 18 +++++++++++-------
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index 0a7f0bec08..9c4c2d1d49 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -176,7 +176,7 @@ public class BaseRuleClasses {
           // The target itself and run_under both run on the same machine. We use the DATA config
           // here because the run_under acts like a data dependency (e.g. no LIPO optimization).
           .add(attr(":run_under", LABEL).cfg(DATA).value(RUN_UNDER)
-              .skipConstraintsCheck())
+              .skipPrereqValidatorCheck())
           .build();
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 4cdc269460..10395cbd6b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -1578,7 +1578,7 @@ public final class RuleContext extends TargetContext
       validateDirectPrerequisiteType(prerequisite, attribute);
       validateDirectPrerequisiteFileTypes(prerequisite, attribute);
       validateMandatoryProviders(prerequisite, attribute);
-      if (attribute.performConstraintsCheck()) {
+      if (attribute.performPrereqValidatorCheck()) {
         prerequisiteValidator.validate(this, prerequisite, attribute);
       }
     }
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
index cb82d9b9a2..94dbcf944c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
@@ -375,7 +375,7 @@ public class BazelCppRuleClasses {
           .add(attr(":lipo_context_collector", LABEL)
               .cfg(CppTransition.LIPO_COLLECTOR)
               .value(LIPO_CONTEXT_COLLECTOR)
-              .skipConstraintsCheck())
+              .skipPrereqValidatorCheck())
           .build();
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index b94b172fe1..a63da70eec 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -204,9 +204,11 @@ public final class Attribute implements Comparable<Attribute> {
     NONCONFIGURABLE,
 
     /**
-     * Whether we should skip constraints checks for licenses, visibility, etc.
+     * Whether we should skip dependency validation checks done by
+     * {@link com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.PrerequisiteValidator}
+     * (for visibility, etc.).
      */
-    SKIP_CONSTRAINTS_CHECKS,
+    SKIP_PREREQ_VALIDATOR_CHECKS,
   }
 
   // TODO(bazel-team): modify this interface to extend Predicate and have an extra error
@@ -527,10 +529,12 @@ public final class Attribute implements Comparable<Attribute> {
     }
 
     /**
-     * Disables constraints and visibility checks.
+     * Disables dependency checks done by
+     * {@link com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.PrerequisiteValidator}.
      */
-    public Builder<TYPE> skipConstraintsCheck() {
-      return setPropertyFlag(PropertyFlag.SKIP_CONSTRAINTS_CHECKS, "skip_constraints_checks");
+    public Builder<TYPE> skipPrereqValidatorCheck() {
+      return setPropertyFlag(PropertyFlag.SKIP_PREREQ_VALIDATOR_CHECKS,
+          "skip_prereq_validator_checks");
     }
 
     /**
@@ -1251,8 +1255,8 @@ public final class Attribute implements Comparable<Attribute> {
     return getPropertyFlag(PropertyFlag.CHECK_ALLOWED_VALUES);
   }
 
-  public boolean performConstraintsCheck() {
-    return !getPropertyFlag(PropertyFlag.SKIP_CONSTRAINTS_CHECKS);
+  public boolean performPrereqValidatorCheck() {
+    return !getPropertyFlag(PropertyFlag.SKIP_PREREQ_VALIDATOR_CHECKS);
   }
 
   /**
-- 
cgit v1.2.3