do not wrap error

Author: jdconrad

modules/lang-painless/src/main/java/org/elasticsearch/painless/DefBootstrap.java

@@ -204,7 +204,7 @@ protected MethodHandle computeValue(Class<?> receiverType) {
                         // ClassValue.getFromHashMap wraps checked exceptions as Error, so we
                         // use a sentinel class [PainlessWrapperError] here to work around
                         // this issue and later unwrap the original exception
-                        Def.rethrow(new PainlessWrappedError(t));
+                        Def.rethrow(t instanceof Exception ? new PainlessWrappedException((Exception) t) : t);
                         throw new AssertionError();
                     }
                 }

modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScript.java

@@ -46,7 +46,7 @@ public interface PainlessScript {
      * @return The generated ScriptException.
      */
     default ScriptException convertToScriptException(Throwable t, Map<String, List<String>> extraMetadata) {
-        if (t instanceof PainlessWrappedError) {
+        if (t instanceof PainlessWrappedException) {
             t = t.getCause();
         }
         // create a script stack: this is just the script portion

modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessWrappedError.java renamed to modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessWrappedException.java

@@ -14,13 +14,13 @@
  * which leads to unexpected behavior in Painless. This class is used as a
  * workaround for that exception wrapping.
  */
-public class PainlessWrappedError extends Error {
+public class PainlessWrappedException extends Error {
 
     /**
      * Constructor.
-     * @param cause The {@link Throwable} cause.
+     * @param cause The {@link Exception} cause.
      */
-    public PainlessWrappedError(final Throwable cause) {
+    public PainlessWrappedException(final Exception cause) {
         super(cause);
     }
 }

modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessUserTreeToIRTreePhase.java

@@ -12,7 +12,7 @@
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.PainlessError;
 import org.elasticsearch.painless.PainlessExplainError;
-import org.elasticsearch.painless.PainlessWrappedError;
+import org.elasticsearch.painless.PainlessWrappedException;
 import org.elasticsearch.painless.ScriptClassInfo;
 import org.elasticsearch.painless.ScriptClassInfo.MethodArgument;
 import org.elasticsearch.painless.ir.BinaryImplNode;
@@ -416,7 +416,7 @@ protected static void injectSandboxExceptions(FunctionNode irFunctionNode) {
 
             for (Class<? extends Throwable> throwable : List.of(
                 PainlessError.class,
-                PainlessWrappedError.class,
+                PainlessWrappedException.class,
                 LinkageError.class,
                 OutOfMemoryError.class,
                 StackOverflowError.class,

modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java

@@ -139,7 +139,7 @@ public void testMegamorphic() throws Throwable {
         map.put("a", "b");
         assertEquals(2, (int) handle.invokeExact((Object) map));
 
-        final PainlessWrappedError pwe = expectThrows(PainlessWrappedError.class, () -> {
+        final PainlessWrappedException pwe = expectThrows(PainlessWrappedException.class, () -> {
             Integer.toString((int) handle.invokeExact(new Object()));
         });
         assertTrue(pwe.getCause() instanceof IllegalArgumentException);