commit b6038e0aed3abd4c9575798af3f0b4b4a454b376
author Francois-Rene Rideau <tunes@google.com> Thu Jun 11 19:51:16 2015 +0000
committer Philipp Wollermann <philwo@google.com> Fri Jun 12 11:52:04 2015 +0000
tree 3a85d6209f25930a7e8fbc4894e0aefde05cdc89
parent 49671f4881094755a8a9a751827c4ae88a921f38

Skylark: make ConversionException an EvalException

This avoids using a RuntimeException (IllegalArgumentException)
to circumvent declaration issues, which when we were catching it too well
was hiding actual issues of RuntimeException.

--
MOS_MIGRATED_REVID=95767534

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
index af33276..3c041b7 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
@@ -15,7 +15,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.events.Location;
-import com.google.devtools.build.lib.packages.Type.ConversionException;
 import com.google.devtools.build.lib.syntax.SkylarkSignatureProcessor.HackHackEitherList;
 import com.google.devtools.build.lib.syntax.SkylarkType.SkylarkFunctionType;
 
@@ -152,16 +151,14 @@
     } catch (InvocationTargetException x) {
       Throwable e = x.getCause();
       if (e instanceof EvalException) {
-        throw (EvalException) e;
+        throw ((EvalException) e).ensureLocation(loc);
       } else if (e instanceof InterruptedException) {
         throw (InterruptedException) e;
-      } else if (e instanceof ConversionException
-          || e instanceof ClassCastException
+      } else if (e instanceof ClassCastException
           || e instanceof ExecutionException
           || e instanceof IllegalStateException) {
-        throw new EvalException(loc, e);
+        throw new EvalException(loc, "in call to " + getName(), e);
       } else if (e instanceof IllegalArgumentException) {
-        // Assume it was thrown by SkylarkType.cast and has a good message.
         throw new EvalException(loc, "Illegal argument in call to " + getName(), e);
       } else {
         throw badCallException(loc, e, args);