Skip to content

Commit 589134f

Browse files
committed
[GR-38633] Throw an AbstractTruffleException in EspressoLanguage.parse.
PullRequest: graal/11757
2 parents 23625d8 + ce532fb commit 589134f

File tree

2 files changed

+58
-4
lines changed

2 files changed

+58
-4
lines changed

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@
2626
import java.util.concurrent.TimeUnit;
2727
import java.util.logging.Level;
2828

29-
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
30-
import com.oracle.truffle.espresso.meta.EspressoError;
31-
import com.oracle.truffle.espresso.runtime.JavaVersion;
3229
import org.graalvm.home.Version;
3330
import org.graalvm.options.OptionDescriptors;
3431

3532
import com.oracle.truffle.api.CallTarget;
3633
import com.oracle.truffle.api.CompilerDirectives;
34+
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
3735
import com.oracle.truffle.api.ContextThreadLocal;
3836
import com.oracle.truffle.api.TruffleLanguage;
3937
import com.oracle.truffle.api.TruffleLanguage.Registration;
@@ -54,13 +52,15 @@
5452
import com.oracle.truffle.espresso.descriptors.Symbols;
5553
import com.oracle.truffle.espresso.descriptors.Types;
5654
import com.oracle.truffle.espresso.descriptors.Utf8ConstantTable;
55+
import com.oracle.truffle.espresso.meta.EspressoError;
5756
import com.oracle.truffle.espresso.meta.JavaKind;
5857
import com.oracle.truffle.espresso.nodes.commands.DestroyVMNode;
5958
import com.oracle.truffle.espresso.nodes.commands.ExitCodeNode;
6059
import com.oracle.truffle.espresso.nodes.commands.GetBindingsNode;
6160
import com.oracle.truffle.espresso.nodes.commands.ReferenceProcessNode;
6261
import com.oracle.truffle.espresso.runtime.EspressoContext;
6362
import com.oracle.truffle.espresso.runtime.EspressoThreadLocalState;
63+
import com.oracle.truffle.espresso.runtime.JavaVersion;
6464
import com.oracle.truffle.espresso.runtime.StaticObject;
6565
import com.oracle.truffle.espresso.runtime.StaticObject.StaticObjectFactory;
6666
import com.oracle.truffle.espresso.substitutions.Substitutions;
@@ -224,7 +224,9 @@ protected CallTarget parse(final ParsingRequest request) throws Exception {
224224
RootNode node = new ReferenceProcessNode(this);
225225
return node.getCallTarget();
226226
}
227-
throw new UnsupportedOperationException("Unsupported operation. Use the language bindings to load classes e.g. context.getBindings(\"" + ID + "\").getMember(\"java.lang.Integer\")");
227+
throw new EspressoParseError(
228+
"Espresso cannot evaluate Java sources directly, only a few special commands are supported: " + GetBindingsNode.EVAL_NAME + " and " + ReferenceProcessNode.EVAL_NAME + "\n" +
229+
"Use the \"" + ID + "\" language bindings to load guest Java classes e.g. context.getBindings(\"" + ID + "\").getMember(\"java.lang.Integer\")");
228230
}
229231

230232
public Utf8ConstantTable getUtf8ConstantTable() {
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
package com.oracle.truffle.espresso;
24+
25+
import com.oracle.truffle.api.TruffleLanguage;
26+
import com.oracle.truffle.api.exception.AbstractTruffleException;
27+
import com.oracle.truffle.api.interop.ExceptionType;
28+
import com.oracle.truffle.api.interop.InteropLibrary;
29+
import com.oracle.truffle.api.library.ExportLibrary;
30+
import com.oracle.truffle.api.library.ExportMessage;
31+
32+
/**
33+
* Espresso cannot parse Java sources directly, this exception is meant for parsing requests other
34+
* than the few special commands that Espresso exposes to embedders.
35+
*
36+
* @see EspressoLanguage#parse(TruffleLanguage.ParsingRequest)
37+
* @see com.oracle.truffle.espresso.nodes.commands.GetBindingsNode#EVAL_NAME
38+
* @see com.oracle.truffle.espresso.nodes.commands.ReferenceProcessNode#EVAL_NAME
39+
*/
40+
@ExportLibrary(InteropLibrary.class)
41+
@SuppressWarnings("serial")
42+
class EspressoParseError extends AbstractTruffleException {
43+
44+
EspressoParseError(String message) {
45+
super(message);
46+
}
47+
48+
@ExportMessage
49+
ExceptionType getExceptionType() {
50+
return ExceptionType.PARSE_ERROR;
51+
}
52+
}

0 commit comments

Comments
 (0)