diff options
author | gregce <gregce@google.com> | 2018-06-19 14:28:44 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-19 14:30:05 -0700 |
commit | af545684f4f9c2697951d291d00ae2106ff65041 (patch) | |
tree | 19e8185a96d64ba2ddd210c59da8c2976f2c3e3d /src/main/java/com/google/devtools/build | |
parent | 5f292bb18e98172a3540c92bfa7d38eba1cac624 (diff) |
On type errors for select()s, show which branch is responsible.
Reviewed at: https://github.com/bazelbuild/bazel/pull/5425
PiperOrigin-RevId: 201241451
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/BuildType.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java index 7f8d0d8e70..96042edbd0 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java @@ -577,7 +577,11 @@ public final class BuildType { result.put(key, originalType.getDefaultValue()); defaultValuesBuilder.add(key); } else { - result.put(key, originalType.convert(entry.getValue(), what, context)); + String selectBranch = what == null + ? null + : String.format("each branch in select expression of %s (including '%s')", + what.toString(), key.toString()); + result.put(key, originalType.convert(entry.getValue(), selectBranch, context)); } } this.map = Collections.unmodifiableMap(result); |