Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Register all polyglot java import classes for refective access #9997

Merged
merged 22 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5cddb23
Register all polyglot java import classes for refective access
JaroslavTulach May 18, 2024
773af10
org.enso.syntax2.Parser may be loaded during image build time now
JaroslavTulach May 19, 2024
e70f53a
Print out summary in EnsoLibraryFeature
JaroslavTulach May 19, 2024
ee24418
Don't initialize HttpClient in static class initializer
JaroslavTulach May 19, 2024
6886b12
Simpler and less verbose lookupJavaClass
JaroslavTulach May 19, 2024
6f3bfad
Test native-image to include instance methods of additional classes
JaroslavTulach May 19, 2024
e409b00
Right now we only analyze Standard.Base
JaroslavTulach May 19, 2024
e9551b7
Don't use asGuestValue in GetSourceLocationNode
JaroslavTulach May 19, 2024
e9a55f0
Report missing Java classes as DataflowError
JaroslavTulach May 19, 2024
5cc50de
Execute all Text. tests in CI
JaroslavTulach May 19, 2024
8ab9362
Initialize Parser before executing the tests
JaroslavTulach May 20, 2024
da144be
License framework believes guava and checkerframework are gone from t…
JaroslavTulach May 20, 2024
c5f03b0
./runner --run test/Base_Tests/ ^Text succeeds
JaroslavTulach May 20, 2024
e08f747
Don't call safepoint() on Espresso, it is not needed
JaroslavTulach May 20, 2024
8d1d8af
Skip test/Base_Tests on Espresso, as we don't have regex engine right…
JaroslavTulach May 20, 2024
1be75e6
Reverting Environment_Utils.safepoint() changes
JaroslavTulach May 20, 2024
d36bc75
Merge remote-tracking branch 'origin/develop' into wip/jtulach/EnsoLi…
JaroslavTulach May 20, 2024
5a1743a
Text - general group
JaroslavTulach May 20, 2024
e8a3325
Merge remote-tracking branch 'origin/develop' into wip/jtulach/EnsoLi…
JaroslavTulach May 21, 2024
3db825c
CompareException is imported by Statistics
JaroslavTulach May 21, 2024
d22357c
Merge remote-tracking branch 'origin/develop' into wip/jtulach/EnsoLi…
JaroslavTulach May 22, 2024
aaa5e9e
Moving all extra polyglot java import into a single file
JaroslavTulach May 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2435,14 +2435,15 @@ lazy val `engine-runner` = project
// "-g",
// "-H:+SourceLevelDebug",
// "-H:-DeleteLocalSymbols",
// you may need to set smallJdk := None to use following flags:
// "--trace-class-initialization=org.enso.syntax2.Parser",
"-Dnic=nic"
),
mainClass = Some("org.enso.runner.Main"),
initializeAtRuntime = Seq(
"org.jline.nativ.JLineLibrary",
"org.jline.terminal.impl.jna",
"io.methvin.watchservice.jna.CarbonAPI",
"org.enso.syntax2.Parser",
"zio.internal.ZScheduler$$anon$4",
"org.enso.runner.Main$",
"sun.awt",
Expand Down Expand Up @@ -2476,6 +2477,7 @@ lazy val `engine-runner` = project
.dependsOn(`library-manager`)
.dependsOn(`language-server`)
.dependsOn(`edition-updater`)
.dependsOn(`runtime-parser`)
JaroslavTulach marked this conversation as resolved.
Show resolved Hide resolved
.dependsOn(`logging-service`)
.dependsOn(`logging-service-logback` % Runtime)
.dependsOn(`polyglot-api`)
Expand Down
12 changes: 12 additions & 0 deletions build/build/src/engine/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -649,5 +649,17 @@ pub async fn runner_sanity_test(
output.contains(factorial_expected_output),
"Native runner output does not contain expected result '{factorial_expected_output}'. Output:\n{output}",
);
if enso_java.is_none() {
Copy link
Member Author

@JaroslavTulach JaroslavTulach May 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Espresso cannot run --run test/Base_Tests ^Text as that requires access to Truffle RegEx and Truffle RegEx doesn't work on small JDK (created by jlink) until

gets propagated to some release. We have to disable this CI check on Espresso. As such the e08f747 isn't strictly necessary to go in and has been reverted.

let test_base = Command::new(&repo_root.runner)
.args(["--run", repo_root.test.join("Base_Tests").as_str(), "^Text"])
.set_env_opt(ENSO_JAVA, enso_java)?
.set_env(ENSO_DATA_DIRECTORY, engine_package)?
.run_stdout()
.await?;
ensure!(
test_base.contains("0 tests failed."),
"All tests shall succeed. Output:\n{test_base}",
);
}
Ok(())
}
25 changes: 0 additions & 25 deletions distribution/engine/THIRD-PARTY/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,11 @@ The license information can be found along with the copyright notices.
Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.module.jackson-module-scala_2.13-2.15.2`.


'error_prone_annotations', licensed under the Apache 2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.google.errorprone.error_prone_annotations-2.18.0`.


'flatbuffers-java', licensed under the Apache License V2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.google.flatbuffers.flatbuffers-java-24.3.25`.


'failureaccess', licensed under the The Apache Software License, Version 2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.google.guava.failureaccess-1.0.1`.


'guava', licensed under the Apache License, Version 2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.google.guava.guava-32.0.0-jre`.


'j2objc-annotations', licensed under the Apache License, Version 2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.google.j2objc.j2objc-annotations-2.8`.


'JavaEWAH', licensed under the Apache 2, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.googlecode.javaewah.JavaEWAH-1.2.3`.
Expand Down Expand Up @@ -311,11 +291,6 @@ The license file can be found at `licenses/Bouncy_Castle_Licence.txt`.
Copyright notices related to this dependency can be found in the directory `org.bouncycastle.bcutil-jdk18on-1.76`.


'checker-qual', licensed under the The MIT License, is distributed with the engine.
The license information can be found along with the copyright notices.
Copyright notices related to this dependency can be found in the directory `org.checkerframework.checker-qual-3.33.0`.


'org.eclipse.jgit', licensed under the Eclipse Distribution License (New BSD License), is distributed with the engine.
The license file can be found at `licenses/Eclipse_Distribution_License_(New_BSD_License)`.
Copyright notices related to this dependency can be found in the directory `org.eclipse.jgit.org.eclipse.jgit-6.7.0.202309050840-r`.
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading