# HG changeset patch # User Doug Simon # Date 1417085477 -3600 # Node ID 3566e1edb3b4cceb3e74cb7c2dc74d95d4a6108a # Parent c4da2e160178f142dac7245c74c995a728189a67 removed static references to HotSpotGraalRuntime diff -r c4da2e160178 -r 3566e1edb3b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java Thu Nov 27 11:50:17 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java Thu Nov 27 11:51:17 2014 +0100 @@ -44,8 +44,13 @@ public class AESCryptSubstitutions { public static class Guard implements SubstitutionGuard { + private HotSpotVMConfig config; + + public Guard(HotSpotVMConfig config) { + this.config = config; + } + public boolean execute() { - HotSpotVMConfig config = HotSpotGraalRuntime.runtime().getConfig(); if (config.useAESIntrinsics) { assert config.aescryptEncryptBlockStub != 0L; assert config.aescryptDecryptBlockStub != 0L; diff -r c4da2e160178 -r 3566e1edb3b4 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java Thu Nov 27 11:50:17 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java Thu Nov 27 11:51:17 2014 +0100 @@ -44,14 +44,14 @@ public static class Guard implements SubstitutionGuard { - private HotSpotGraalRuntimeProvider runtime; + private HotSpotVMConfig config; - public Guard(HotSpotGraalRuntimeProvider runtime) { - this.runtime = runtime; + public Guard(HotSpotVMConfig config) { + this.config = config; } public boolean execute() { - return runtime.getConfig().useCRC32Intrinsics; + return config.useCRC32Intrinsics; } }