diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java | 6 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java | 6 |
2 files changed, 7 insertions, 5 deletions
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 469df1e3e7..70d2bbff30 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 @@ -179,10 +179,8 @@ public class BuiltinFunction extends BaseFunction { } else if (e instanceof IllegalArgumentException) { throw new EvalException(loc, "illegal argument in call to " + getName(), e); } - // TODO(bazel-team): replace with Throwables.throwIfInstanceOf once Guava 20 is released. - Throwables.propagateIfInstanceOf(e, InterruptedException.class); - // TODO(bazel-team): replace with Throwables.throwIfUnchecked once Guava 20 is released. - Throwables.propagateIfPossible(e); + Throwables.throwIfInstanceOf(e, InterruptedException.class); + Throwables.throwIfUnchecked(e); throw badCallException(loc, e, args); } catch (IllegalArgumentException e) { // Either this was thrown by Java itself, or it's a bug diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java index 44e6a67ae9..03695abaa2 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.syntax; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; +import com.google.common.base.Throwables; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -781,20 +782,23 @@ public final class FuncallExpression extends Expression { call.findJavaMethod(objClass, method, positionalArgs, keyWordArgs, env); if (javaMethod.first.isStructField()) { // Not a method but a callable attribute + Object func; try { - return callFunction(javaMethod.first.invoke(obj), env); + func = javaMethod.first.invoke(obj); } catch (IllegalAccessException e) { throw new EvalException(getLocation(), "method invocation failed: " + e); } catch (InvocationTargetException e) { if (e.getCause() instanceof FuncallException) { throw new EvalException(getLocation(), e.getCause().getMessage()); } else if (e.getCause() != null) { + Throwables.throwIfInstanceOf(e.getCause(), InterruptedException.class); throw new EvalExceptionWithJavaCause(getLocation(), e.getCause()); } else { // This is unlikely to happen throw new EvalException(getLocation(), "method invocation failed: " + e); } } + return callFunction(func, env); } return javaMethod.first.call(obj, javaMethod.second.toArray(), location, env); } |