Skip to content

Commit fe4754a

Browse files
iamstolisiamstolis
committed
[GR-23997] Periodic update of the graal import (2020-11-13).
PullRequest: js/1756
2 parents 9084904 + 305101d commit fe4754a

File tree

4 files changed

+44
-30
lines changed

4 files changed

+44
-30
lines changed

‎common.json‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

44
"jdks": {
5-
"oraclejdk8": {"name": "oraclejdk", "version": "8u261+33-jvmci-20.3-b01", "platformspecific": true },
6-
"openjdk8": {"name": "openjdk", "version": "8u262+10-jvmci-20.3-b01", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u261+33-jvmci-20.3-b01-fastdebug", "platformspecific": true },
5+
"openjdk8": {"name": "openjdk", "version": "8u272+10-jvmci-20.3-b05", "platformspecific": true },
6+
"oraclejdk8": {"name": "oraclejdk", "version": "8u271+09-jvmci-20.3-b05", "platformspecific": true },
7+
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u271+09-jvmci-20.3-b05-fastdebug", "platformspecific": true },
8+
9+
"openjdk11": {"name": "openjdk", "version": "11.0.3+7", "platformspecific": true },
810
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.6+8", "platformspecific": true },
11+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.9+10-jvmci-20.3-b05", "platformspecific": true },
12+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.9+7-jvmci-20.3-b05", "platformspecific": true },
13+
914
"oraclejdk15": {"name": "oraclejdk", "version": "15.0.1+6", "platformspecific": true },
10-
"openjdk11": {"name": "openjdk", "version": "11.0.3+7", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.8+10-jvmci-20.3-b01", "platformspecific": true },
12-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.8.0.2+1-jvmci-20.3-b01", "platformspecific": true },
13-
"labsjdk-ce-15": {"name": "labsjdk", "version": "ce-15+36-jvmci-20.3-b01", "platformspecific": true },
14-
"labsjdk-ee-15": {"name": "labsjdk", "version": "ee-15.0.1+7-jvmci-20.3-b01", "platformspecific": true },
15-
"labsjdk-ce-15Debug": {"name": "labsjdk", "version": "ce-15.+36-jvmci-20.3-b01", "platformspecific": true },
16-
"labsjdk-ee-15Debug": {"name": "labsjdk", "version": "ee-15.0.1+7-jvmci-20.3-b01", "platformspecific": true }
15+
"labsjdk-ce-15": {"name": "labsjdk", "version": "ce-15.0.1+9-jvmci-20.3-b05", "platformspecific": true },
16+
"labsjdk-ce-15Debug": {"name": "labsjdk", "version": "ce-15.0.1+9-jvmci-20.3-b05-debug", "platformspecific": true },
17+
"labsjdk-ee-15": {"name": "labsjdk", "version": "ee-15.0.1+9-jvmci-20.3-b05", "platformspecific": true },
18+
"labsjdk-ee-15Debug": {"name": "labsjdk", "version": "ee-15.0.1+9-jvmci-20.3-b05-debug", "platformspecific": true }
1719
},
1820

1921
"sulong": {

‎graal-js/mx.graal-js/suite.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"name" : "regex",
2626
"subdir" : True,
27-
"version" : "0e9e7e3cfd6405dedc798c90b8ce12b041cf8c94",
27+
"version" : "3caf7207e20fad3745448a5072f1fce015a555f4",
2828
"urls" : [
2929
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3030
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -196,6 +196,7 @@
196196
"sourceDirs" : ["src"],
197197
"dependencies" : [
198198
"sdk:LAUNCHER_COMMON",
199+
"sdk:JLINE3",
199200
],
200201
"jacoco" : "include",
201202
"checkstyle" : "com.oracle.truffle.js",

‎graal-js/src/com.oracle.truffle.js.shell/src/com/oracle/truffle/js/shell/JLineConsoleHandler.java‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -44,32 +44,43 @@
4444
import java.io.InputStream;
4545
import java.io.OutputStream;
4646

47-
import jline.console.ConsoleReader;
48-
import jline.console.history.MemoryHistory;
47+
import org.graalvm.shadowed.org.jline.reader.EndOfFileException;
48+
import org.graalvm.shadowed.org.jline.reader.History;
49+
import org.graalvm.shadowed.org.jline.reader.LineReader;
50+
import org.graalvm.shadowed.org.jline.reader.LineReaderBuilder;
51+
import org.graalvm.shadowed.org.jline.reader.UserInterruptException;
52+
import org.graalvm.shadowed.org.jline.reader.impl.history.DefaultHistory;
53+
import org.graalvm.shadowed.org.jline.terminal.Terminal;
54+
import org.graalvm.shadowed.org.jline.terminal.TerminalBuilder;
4955

5056
public class JLineConsoleHandler implements ConsoleHandler {
5157

52-
private final ConsoleReader console;
58+
private final Terminal terminal;
59+
private final LineReader reader;
60+
private final History history;
61+
private final String prompt;
5362

54-
public JLineConsoleHandler(InputStream in, OutputStream out, String prompt) throws IOException {
55-
this.console = createConsole(in, out, prompt);
56-
}
63+
public JLineConsoleHandler(InputStream inStream, OutputStream outStream, String prompt) throws IOException {
64+
this.terminal = TerminalBuilder.builder().jna(false).streams(inStream, outStream).system(true).build();
65+
this.history = new DefaultHistory();
66+
this.prompt = prompt;
5767

58-
private static ConsoleReader createConsole(InputStream in, OutputStream out, String prompt) throws IOException {
59-
ConsoleReader console = new ConsoleReader(in, out);
60-
MemoryHistory history = new MemoryHistory();
61-
console.setHistory(history);
62-
console.setExpandEvents(false);
63-
console.setBellEnabled(false);
64-
console.setHandleUserInterrupt(false);
65-
console.setCommentBegin("//");
66-
console.setPrompt(prompt);
67-
return console;
68+
LineReaderBuilder builder = LineReaderBuilder.builder().terminal(terminal).history(history);
69+
builder.option(LineReader.Option.DISABLE_EVENT_EXPANSION, true);
70+
builder.variable(LineReader.COMMENT_BEGIN, "//");
71+
builder.variable(LineReader.BELL_STYLE, "off");
72+
this.reader = builder.build();
6873
}
6974

7075
@Override
7176
public String readLine() throws IOException {
72-
return console.readLine();
77+
try {
78+
return reader.readLine(prompt);
79+
} catch (EndOfFileException e) {
80+
return null;
81+
} catch (UserInterruptException e) {
82+
return null;
83+
}
7384
}
7485

7586
}

‎graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2770,12 +2770,12 @@ public synchronized void isolateTerminateExecution() {
27702770
debugger.startSession(new SuspendedCallback() {
27712771
@Override
27722772
public void onSuspend(SuspendedEvent se) {
2773+
se.getSession().close();
27732774
synchronized (GraalJSAccess.this) {
27742775
if (!terminateExecution) {
27752776
return; // termination has been cancelled
27762777
}
27772778
}
2778-
se.getSession().close();
27792779
throw new GraalJSKillException();
27802780
}
27812781
}).suspendNextExecution();

0 commit comments

Comments
 (0)