Skip to content

Commit d93f5c0

Browse files
flohuemerdavleopo
authored andcommitted
partial evluation: create proxies after PE not during
1 parent f282ecd commit d93f5c0

File tree

5 files changed

+567
-392
lines changed

5 files changed

+567
-392
lines changed

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MergeExplodeProxyTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,7 @@
2424
*/
2525
package jdk.graal.compiler.truffle.test;
2626

27-
import jdk.graal.compiler.api.directives.GraalDirectives;
28-
import jdk.graal.compiler.nodes.ProxyNode;
29-
import jdk.graal.compiler.nodes.StructuredGraph;
30-
import jdk.graal.compiler.phases.util.GraphOrder;
3127
import org.junit.Assert;
32-
import org.junit.Ignore;
3328
import org.junit.Test;
3429

3530
import com.oracle.truffle.api.CallTarget;
@@ -43,8 +38,13 @@
4338
import com.oracle.truffle.api.nodes.DirectCallNode;
4439
import com.oracle.truffle.api.nodes.ExplodeLoop;
4540
import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
46-
import com.oracle.truffle.runtime.OptimizedCallTarget;
4741
import com.oracle.truffle.api.nodes.RootNode;
42+
import com.oracle.truffle.runtime.OptimizedCallTarget;
43+
44+
import jdk.graal.compiler.api.directives.GraalDirectives;
45+
import jdk.graal.compiler.nodes.ProxyNode;
46+
import jdk.graal.compiler.nodes.StructuredGraph;
47+
import jdk.graal.compiler.phases.util.GraphOrder;
4848

4949
/**
5050
* Collection of tests that penetrate the partial evaluation logic to produce {@linkplain ProxyNode}
@@ -747,7 +747,6 @@ public Object execute(VirtualFrame frame) {
747747

748748
}
749749

750-
@Ignore("GR-21520: Merge explode partial evaluation cannot proxy nodes that are not alive in the framestate of inner loop begins")
751750
@Test
752751
public void testNoneLiveLoopExitProxy() {
753752
byte[] bytecodes = new byte[]{

0 commit comments

Comments
 (0)