Skip to content

Commit d275ae4

Browse files
committed
Rewrite createLanguages() without Stream for simplicity and clearer stacktraces
1 parent d2d7d44 commit d275ae4

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/LanguageCache.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@
6262
import java.util.Set;
6363
import java.util.TreeSet;
6464
import java.util.function.Supplier;
65-
import java.util.stream.Stream;
66-
import java.util.stream.StreamSupport;
6765

6866
import org.graalvm.home.HomeFinder;
6967
import org.graalvm.polyglot.SandboxPolicy;
@@ -273,7 +271,12 @@ private static synchronized Map<String, LanguageCache> createLanguages(List<Abst
273271
if (loader == null) {
274272
continue;
275273
}
276-
loadProviders(loader).filter((p) -> supplier.accepts(p.getClass())).forEach((p) -> loadLanguageImpl(p, caches, optionalResources));
274+
275+
for (TruffleLanguageProvider provider : ServiceLoader.load(TruffleLanguageProvider.class, loader)) {
276+
if (supplier.accepts(provider.getClass())) {
277+
loadLanguageImpl(provider, caches, optionalResources);
278+
}
279+
}
277280
}
278281

279282
Map<String, LanguageCache> idToCache = new LinkedHashMap<>();
@@ -299,10 +302,6 @@ private static synchronized Map<String, LanguageCache> createLanguages(List<Abst
299302
return idToCache;
300303
}
301304

302-
private static Stream<? extends TruffleLanguageProvider> loadProviders(ClassLoader loader) {
303-
return StreamSupport.stream(ServiceLoader.load(TruffleLanguageProvider.class, loader).spliterator(), false);
304-
}
305-
306305
private static boolean hasSameCodeSource(LanguageCache first, LanguageCache second) {
307306
return first.provider.getClass() == second.provider.getClass();
308307
}

0 commit comments

Comments
 (0)