commit fdc1e2f9fdd3de395ce8655acb26a91b8ab6824e
author michajlo <michajlo@google.com> Thu Sep 14 17:26:42 2017 +0200
committer Philipp Wollermann <philwo@google.com> Thu Sep 14 18:48:49 2017 +0200
tree 37e0a053e7e59e28734e50667f484421d7ba6ccd
parent 84cdaa377d8d52d447ee4510c6636327751beb03

Avoid wasting cpu/garbage formatting preconditions string

RELNOTES: None
PiperOrigin-RevId: 168691489

src/main/java/com/google/devtools/build/lib/syntax/Mutability.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Mutability.java b/src/main/java/com/google/devtools/build/lib/syntax/Mutability.java
index 2ac152c..7e69eb1 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Mutability.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Mutability.java
@@ -190,10 +190,13 @@
     }
     Preconditions.checkArgument(lockedItems.containsKey(object),
         "trying to unlock an object that is not locked");
+
     List<Location> locList = lockedItems.get(object);
-    boolean changed = locList.remove(loc);
-    Preconditions.checkArgument(changed, Printer.format(
-        "trying to unlock an object for a location at which it was not locked (%r)", loc));
+    if (!locList.remove(loc)) {
+      throw new IllegalArgumentException(
+          Printer.format(
+              "trying to unlock an object for a location at which it was not locked (%r)", loc));
+    }
     if (locList.isEmpty()) {
       lockedItems.remove(object);
     }