Skip to content

Commit 448e43f

Browse files
committed
Fix lambda type loading.
1 parent 53f614c commit 448e43f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,9 @@ protected boolean delegateLoadType(PersistedAnalysisType.Reader typeData) {
471471
*/
472472
private void loadLambdaTypes(Class<?> capturingClass) {
473473
capturingClasses.computeIfAbsent(capturingClass, key -> {
474-
LambdaParser.allExecutablesDeclaredInClass(universe.getOriginalMetaAccess().lookupJavaType(capturingClass))
474+
LambdaParser.allExecutablesDeclaredInClass(universe.getBigbang().getMetaAccess().lookupJavaType(capturingClass))
475475
.filter(m -> m.getCode() != null)
476-
.forEach(m -> loadLambdaTypes(m, universe.getBigbang()));
476+
.forEach(m -> loadLambdaTypes(((AnalysisMethod) m).getWrapped(), universe.getBigbang()));
477477
return true;
478478
});
479479
}

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public StackTraceElement asStackTraceElement(int bci) {
204204

205205
@Override
206206
public ProfilingInfo getProfilingInfo(boolean includeNormal, boolean includeOSR) {
207-
throw intentionallyUnimplemented(); // ExcludeFromJacocoGeneratedReport
207+
return annotated.getProfilingInfo(includeNormal, includeOSR);
208208
}
209209

210210
@Override

0 commit comments

Comments
 (0)