Skip to content

Commit 4e064b3

Browse files
authored
fix(cli): native image boot to repl (#1271)
Fixes and closes #1270 Relates-to: #1270 Signed-off-by: Sam Gammon <[email protected]>
1 parent 92f33da commit 4e064b3

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

packages/cli/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ val enableFfm = hostIsLinux && System.getProperty("os.arch") != "aarch64"
139139
val enableEmbeddedResources = false
140140
val enableResourceFilter = false
141141
val enableAuxCache = false
142-
val enableAuxCacheTrace = true
142+
val enableAuxCacheTrace = false
143143
val enableJpms = false
144144
val enableConscrypt = false
145145
val enableBouncycastle = false
@@ -1121,7 +1121,6 @@ val commonNativeArgs = listOfNotNull(
11211121
"-H:ExcludeResources=elide/stream/.*\\.proto",
11221122
"-H:ExcludeResources=elide/page/.*\\.proto",
11231123
"-H:ExcludeResources=elide/vfs/.*\\.proto",
1124-
"-H:ExcludeResources=org/jline/.*",
11251124
"-H:ExcludeResources=logback.xml",
11261125
"-H:ExcludeResources=META-INF/native/libsqlite.*",
11271126
"-H:ExcludeResources=lib/linux-x86_64/libbrotli.so",

packages/cli/src/main/resources/META-INF/native-image/dev/elide/elide-cli/reachability-metadata.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2918,7 +2918,15 @@
29182918
],
29192919
"resources": [
29202920
{
2921-
"glob": "sun/util/logging/resources/logging_en.properties"
2921+
"glob": "org/jline/utils/*.caps"
2922+
},
2923+
{
2924+
"glob": "sun/util/logging/resources/logging_en.properties",
2925+
"module": "java.logging"
2926+
},
2927+
{
2928+
"glob": "sun/util/logging/resources/logging_en_US.properties",
2929+
"module": "java.logging"
29222930
},
29232931
{
29242932
"glob": "META-INF/maven/org.jline/jline-native/pom.properties"
@@ -3097,6 +3105,10 @@
30973105
"name": "com.sun.tools.javac.resources.compiler",
30983106
"locales": ["en"]
30993107
},
3108+
{
3109+
"name": "sun.util.logging.resources.logging",
3110+
"locales": ["en", "en-US"]
3111+
},
31003112
{
31013113
"name": "sun.tools.jar.resources.jar",
31023114
"locales": ["en"]

packages/graalvm/src/main/kotlin/elide/runtime/core/internals/graalvm/GraalVMEngine.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,16 @@ import org.graalvm.polyglot.HostAccess as PolyglotHostAccess
244244
/** Whether to emit trace messages for aux cache usage. */
245245
private val traceCache = System.getProperty("elide.traceCache", "false") == "true"
246246

247+
/** Whether to use the auxiliary engine cache. */
248+
private val enableAuxCache = System.getProperty("elide.auxCache", "false") == "true"
249+
247250
/** Whether the auxiliary cache is actually enabled. */
248251
private val useAuxCache = (
249252
ENABLE_AUX_CACHE &&
253+
enableAuxCache &&
250254
System.getProperty("elide.test") != "true" &&
251255
System.getProperty("ELIDE_TEST") != "true" &&
252-
System.getProperty("elide.vm.engine.preinitialize") != "false" && // manual killswitch
256+
System.getProperty("elide.vm.engine.preinitialize") != "false" && // manual kill-switch
253257
ImageInfo.inImageCode() &&
254258
!ImageInfo.isSharedLibrary() &&
255259
!Platform.includedIn(Platform.WINDOWS::class.java) // disabled on windows - not supported

0 commit comments

Comments
 (0)