Fix all use of HostedUniverse.createDeoptTarget

Author: olpaw

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java

@@ -41,6 +41,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ForkJoinPool;
+import java.util.stream.Collectors;
 
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.svm.hosted.phases.StrengthenStampsPhase;
@@ -634,18 +635,20 @@ private void parseDeoptimizationTargetMethods() {
          * Deoptimization target code for all methods that were manually marked as deoptimization
          * targets.
          */
-        universe.getMethods().stream()
+        List<HostedMethod> deoptTargetMethods = universe.getMethods().stream()
                         .filter(method -> CompilationInfoSupport.singleton().isDeoptTarget(method))
-                        .forEach(method -> ensureParsed(universe.createDeoptTarget(method), null, new EntryPointReason()));
+                        .collect(Collectors.toList());
+        deoptTargetMethods.forEach(method -> ensureParsed(universe.createDeoptTarget(method), null, new EntryPointReason()));
 
         /*
          * Deoptimization target code for deoptimization testing: all methods that are not
          * blacklisted are possible deoptimization targets. The methods are also flagged so that all
          * possible deoptimization entry points are emitted.
          */
-        universe.getMethods().stream()
+        List<HostedMethod> deoptTargetForTestingMethods = universe.getMethods().stream()
                         .filter(method -> method.getWrapped().isImplementationInvoked() && canDeoptForTesting(method))
-                        .forEach(this::ensureParsedForDeoptTesting);
+                        .collect(Collectors.toList());
+        deoptTargetForTestingMethods.forEach(this::ensureParsedForDeoptTesting);
 
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java

@@ -311,14 +311,15 @@ public HostedInstanceClass getObjectClass() {
         return result;
     }
 
-    public synchronized HostedMethod createDeoptTarget(HostedMethod method) {
-        if (method.compilationInfo.getDeoptTargetMethod() == null) {
-            HostedMethod deoptTarget = HostedMethod.create(this, method.getWrapped(), method.getDeclaringClass(),
-                            method.getSignature(), method.getConstantPool(), method.getExceptionHandlers(), method);
-            assert method.staticAnalysisResults != null;
-            deoptTarget.staticAnalysisResults = method.staticAnalysisResults;
+    public synchronized HostedMethod createDeoptTarget(HostedMethod deoptOrigin) {
+        assert !deoptOrigin.isDeoptTarget();
+        if (deoptOrigin.compilationInfo.getDeoptTargetMethod() == null) {
+            HostedMethod deoptTarget = HostedMethod.create(this, deoptOrigin.getWrapped(), deoptOrigin.getDeclaringClass(),
+                            deoptOrigin.getSignature(), deoptOrigin.getConstantPool(), deoptOrigin.getExceptionHandlers(), deoptOrigin);
+            assert deoptOrigin.staticAnalysisResults != null;
+            deoptTarget.staticAnalysisResults = deoptOrigin.staticAnalysisResults;
         }
-        return method.compilationInfo.getDeoptTargetMethod();
+        return deoptOrigin.compilationInfo.getDeoptTargetMethod();
     }
 
     public boolean contains(JavaType type) {