commit 47bf59e645ed95748f19f6367c58ed35ba150100
author adonovan <adonovan@google.com> Mon Jan 13 14:46:59 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Jan 13 14:47:45 2020 -0800
tree df8796e7e420235ee9685d9ee79d0259e6867ab2
parent 4c6f90ad85b50a5085d25d08fb6d14b873e857ac

bazel syntax: remove Location parameters

Remove Location parameter from SkylarkIndexable.getIndex
(and thread parameter from SkylarkQueryable).
Also, make SkylarkIndexable and SkylarkQueryable
consistently take a StarlarkSemantics.

Eval: don't pass Locations down into evaluation;
obtain them only after an error, on the way up.
(This is a prerequisite for compilation, and for
finer-grained syntax locations. This CL addresses only
the easy cases.)

Also:
- Dict.get2: avoid duplicate hash lookup in success case.
- EvalUtils.index: pass mutability and semantics, not thread
- remove unnecessary parameters to binary operators.
- improvements to error messages
PiperOrigin-RevId: 289523719

src/test/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunctionTest.java
index 933956a..ee39c29 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunctionTest.java
@@ -30,7 +30,6 @@
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.Info;
 import com.google.devtools.build.lib.packages.NativeProvider;
 import com.google.devtools.build.lib.packages.Provider;
@@ -38,6 +37,7 @@
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
 import com.google.devtools.build.lib.syntax.Printer;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
 import com.google.devtools.build.skyframe.EvaluationResult;
 import com.google.devtools.build.skyframe.SkyKey;
 import javax.annotation.Nullable;
@@ -263,12 +263,12 @@
     public void repr(Printer printer) {}
 
     @Override
-    public Object getIndex(Object key, Location loc) {
+    public Object getIndex(StarlarkSemantics semantics, Object key) {
       return null;
     }
 
     @Override
-    public boolean containsKey(Object key, Location loc) {
+    public boolean containsKey(StarlarkSemantics semantics, Object key) {
       return false;
     }
   }