diff options
| author |  shahan <shahan@google.com> | 2018-04-05 11:11:16 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-05 11:12:33 -0700 |
| commit | ff4a4eb42f019d0e30def72aaeeeede14658da9e (patch) | |
| tree | df7e558767148c126002a9a87ff1636896966746 /src/main/java/com/google/devtools/build/lib/syntax | |
| parent | 77c5582fa0f5c829df576d9f8d66f4975fe415a6 (diff) | |
Introduces a SourceArtifact type.
SourceArtifact.getPath() is considered safe and eventually we may restrict
getPath() to only SourceArtifact.
PiperOrigin-RevId: 191768519
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java index b4f3e69aa8..6fee875c33 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java @@ -78,7 +78,9 @@ public final class EvalUtils { && ((SkylarkList) o1).isTuple() == ((SkylarkList) o2).isTuple()) { return compareLists((SkylarkList) o1, (SkylarkList) o2); } - if (!o1.getClass().equals(o2.getClass())) { + + if (!(o1.getClass().isAssignableFrom(o2.getClass()) + || o2.getClass().isAssignableFrom(o1.getClass()))) { throw new ComparisonException( "Cannot compare " + getDataTypeName(o1) + " with " + getDataTypeName(o2)); } |