simplify parseInCurrentLayer criteria

teshull · teshull · commit 6f91603a8aac · 2024-12-19T12:48:04.000+01:00
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java
@@ -985,11 +985,8 @@ public void scheduleDeoptTargets() {
     }
 
     private static boolean parseInCurrentLayer(HostedMethod method) {
-        if (method.wrapped.isInBaseLayer() && !method.wrapped.reachableInCurrentLayer()) {
-            return false;
-        }
         var hasAnalyzedGraph = method.wrapped.getAnalyzedGraph() != null;
-        if (!hasAnalyzedGraph && method.wrapped.reachableInCurrentLayer() && HostedImageLayerBuildingSupport.buildingExtensionLayer()) {
+        if (!hasAnalyzedGraph && method.wrapped.reachableInCurrentLayer()) {
             ImageLayerLoader imageLayerLoader = HostedImageLayerBuildingSupport.singleton().getLoader();
             hasAnalyzedGraph = imageLayerLoader.hasStrengthenedGraph(method.wrapped);
         }

Original file line number	Diff line number	Diff line change
`@@ -985,11 +985,8 @@ public void scheduleDeoptTargets() {`
`985`	`985`	`}`
`986`	`986`
`987`	`987`	`private static boolean parseInCurrentLayer(HostedMethod method) {`
`988`		`- if (method.wrapped.isInBaseLayer() && !method.wrapped.reachableInCurrentLayer()) {`
`989`		`- return false;`
`990`		`- }`
`991`	`988`	`var hasAnalyzedGraph = method.wrapped.getAnalyzedGraph() != null;`
`992`		`- if (!hasAnalyzedGraph && method.wrapped.reachableInCurrentLayer() && HostedImageLayerBuildingSupport.buildingExtensionLayer()) {`
	`989`	`+ if (!hasAnalyzedGraph && method.wrapped.reachableInCurrentLayer()) {`
`993`	`990`	`ImageLayerLoader imageLayerLoader = HostedImageLayerBuildingSupport.singleton().getLoader();`
`994`	`991`	`hasAnalyzedGraph = imageLayerLoader.hasStrengthenedGraph(method.wrapped);`
`995`	`992`	`}`