Skip to content

Commit 7347a1a

Browse files
committed
[GR-24618] Update Truffle to get the Env#getPublicLanguages() fix
1 parent e6b7a2a commit 7347a1a

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

mx.truffleruby/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"name": "sulong",
99
"subdir": True,
10-
"version": "8b8603b39b55288db5e23750066efbd6d52ee2db",
10+
"version": "06123acce40608ee9e7b505e9bb6d37d39904698",
1111
"urls": [
1212
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1313
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
fails(GR-24618):Truffle::Interop.other_languages? returns true with --polyglot
21
slow:Truffle::Interop.languages returns only ruby from the RubyLauncher
32
slow:Truffle::Interop.other_languages? returns false without --polyglot
3+
slow:Truffle::Interop.other_languages? returns true with --polyglot

spec/truffle/interop/languages_spec.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
Truffle::Interop.languages.should.include?('ruby')
1414
end
1515

16-
guard_not -> { TruffleRuby.native? and Truffle::Boot.was_preinitialized? } do # GR-24618
17-
it "returns only ruby from the RubyLauncher" do
18-
# Use RbConfig.ruby to remove a potential --polyglot option
19-
`#{RbConfig.ruby} -e 'p Truffle::Interop.languages'`.should == "[\"ruby\"]\n"
20-
end
16+
it "returns only ruby from the RubyLauncher" do
17+
# Use RbConfig.ruby to remove a potential --polyglot option
18+
`#{RbConfig.ruby} -e 'p Truffle::Interop.languages'`.should == "[\"ruby\"]\n"
2119
end
2220
end
2321

src/main/java/org/truffleruby/RubyContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ private Options createOptions(TruffleLanguage.Env env) {
368368

369369
private static boolean computeHasOtherPublicLanguages(Env env) {
370370
for (String language : env.getPublicLanguages().keySet()) {
371-
if (!language.equals(TruffleRuby.LANGUAGE_ID) && !language.equals("llvm") /* GR-24618 */) {
371+
if (!language.equals(TruffleRuby.LANGUAGE_ID)) {
372372
return true;
373373
}
374374
}

0 commit comments

Comments
 (0)