Skip to content

Commit 1b5e415

Browse files
committed
[GR-61724] Improve context sensitivity of AccessController#doPriviledge in language permission tool.
PullRequest: graal/19939
2 parents 86b6d9f + b7c8bbf commit 1b5e415

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

substratevm/src/com.oracle.svm.truffle.tck/src/META-INF/native-image/native-image.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ JavaArgs = --add-exports org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UN
1313
--add-exports jdk.graal.compiler/jdk.graal.compiler.nodes=ALL-UNNAMED \
1414
--add-exports jdk.graal.compiler/jdk.graal.compiler.nodes.java=ALL-UNNAMED \
1515
--add-exports=jdk.graal.compiler/jdk.graal.compiler.nodes.spi=ALL-UNNAMED \
16+
--add-exports=jdk.graal.compiler/jdk.graal.compiler.nodes.virtual=ALL-UNNAMED \
1617
--add-exports jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED \
1718
--add-exports org.graalvm.truffle.runtime/com.oracle.truffle.runtime=ALL-UNNAMED \
1819
--add-exports jdk.graal.compiler/jdk.graal.compiler.util.json=ALL-UNNAMED \

substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555

5656
import com.oracle.svm.hosted.code.FactoryMethod;
5757
import com.oracle.svm.util.LogUtils;
58+
import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
5859
import org.graalvm.nativeimage.ImageSingletons;
5960
import org.graalvm.nativeimage.hosted.Feature;
6061
import org.graalvm.polyglot.io.FileSystem;
@@ -837,6 +838,8 @@ public boolean test(BaseMethodNode methodNode, BaseMethodNode callerNode, List<B
837838
if (targetMethod.wrapped instanceof FactoryMethod factoryMethod) {
838839
newType = method.getUniverse().lookup(factoryMethod.getTargetConstructor().getDeclaringClass());
839840
}
841+
} else if (arg0 instanceof AllocatedObjectNode allocatedObjectNode) {
842+
newType = allocatedObjectNode.getVirtualObject().type();
840843
}
841844
if (newType == null) {
842845
return false;

0 commit comments

Comments
 (0)