diff options
author | 2017-12-02 14:15:32 -0800 | |
---|---|---|
committer | 2017-12-02 14:17:32 -0800 | |
commit | 076977e019ebcb8b822e7727d292636fadcafcca (patch) | |
tree | 4251c2f6bfebec7efd940419ce727eaa4fe1df8b /src/main/java/com/google/devtools/build/lib/packages/Attribute.java | |
parent | ff1b77e6e28b03592f2b5efb3f06bcf58a7d75b5 (diff) |
Fix missing print statements in output functions
PiperOrigin-RevId: 177708823
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages/Attribute.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/Attribute.java | 11 |
1 files changed, 6 insertions, 5 deletions
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 03f56dc23a..6d96a9220b 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 @@ -1410,7 +1410,7 @@ public final class Attribute implements Comparable<Attribute> { @Override public Object compute(AttributeMap map) throws InterruptedException { try { - return owner.computeValue(map); + return owner.computeValue(eventHandler, map); } catch (EvalException ex) { caughtEvalExceptionIfAny.compareAndSet(null, ex); return null; @@ -1445,7 +1445,8 @@ public final class Attribute implements Comparable<Attribute> { return new SkylarkComputedDefault(dependencies, dependencyTypesBuilder.build(), lookupTable); } - private Object computeValue(AttributeMap rule) throws EvalException, InterruptedException { + private Object computeValue(EventHandler eventHandler, AttributeMap rule) + throws EvalException, InterruptedException { Map<String, Object> attrValues = new HashMap<>(); for (String attrName : rule.getAttributeNames()) { Attribute attr = rule.getAttributeDefinition(attrName); @@ -1456,15 +1457,15 @@ public final class Attribute implements Comparable<Attribute> { } } } - return invokeCallback(attrValues); + return invokeCallback(eventHandler, attrValues); } - private Object invokeCallback(Map<String, Object> attrValues) + private Object invokeCallback(EventHandler eventHandler, Map<String, Object> attrValues) throws EvalException, InterruptedException { ClassObject attrs = NativeProvider.STRUCT.create( attrValues, "No such regular (non computed) attribute '%s'."); - Object result = callback.call(attrs); + Object result = callback.call(eventHandler, attrs); try { return type.cast((result == Runtime.NONE) ? type.getDefaultValue() : result); } catch (ClassCastException ex) { |