[GR-61724] Improve context sensitivity of AccessController#doPriviled…

…ge in language permission tool. PullRequest: graal/19939
oracle · Jan 31, 2025 · 1b5e415 · 1b5e415
2 parents 86b6d9f + b7c8bbf
commit 1b5e415
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/substratevm/src/com.oracle.svm.truffle.tck/src/META-INF/native-image/native-image.properties b/substratevm/src/com.oracle.svm.truffle.tck/src/META-INF/native-image/native-image.properties
@@ -13,6 +13,7 @@ JavaArgs = --add-exports org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UN
            --add-exports jdk.graal.compiler/jdk.graal.compiler.nodes=ALL-UNNAMED \
            --add-exports jdk.graal.compiler/jdk.graal.compiler.nodes.java=ALL-UNNAMED \
            --add-exports=jdk.graal.compiler/jdk.graal.compiler.nodes.spi=ALL-UNNAMED \
+           --add-exports=jdk.graal.compiler/jdk.graal.compiler.nodes.virtual=ALL-UNNAMED \
            --add-exports jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED \
            --add-exports org.graalvm.truffle.runtime/com.oracle.truffle.runtime=ALL-UNNAMED \
            --add-exports jdk.graal.compiler/jdk.graal.compiler.util.json=ALL-UNNAMED \

diff --git a/...evm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java b/...evm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java
@@ -55,6 +55,7 @@
 
 import com.oracle.svm.hosted.code.FactoryMethod;
 import com.oracle.svm.util.LogUtils;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.polyglot.io.FileSystem;
@@ -837,6 +838,8 @@ public boolean test(BaseMethodNode methodNode, BaseMethodNode callerNode, List<B
                         if (targetMethod.wrapped instanceof FactoryMethod factoryMethod) {
                             newType = method.getUniverse().lookup(factoryMethod.getTargetConstructor().getDeclaringClass());
                         }
+                    } else if (arg0 instanceof AllocatedObjectNode allocatedObjectNode) {
+                        newType = allocatedObjectNode.getVirtualObject().type();
                     }
                     if (newType == null) {
                         return false;