Mercurial > hg > truffle
changeset 20860:dc795777f789
converted @MethodSubstitutions for java.lang.Object to MethodSubstitutionPlugins
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 09 Apr 2015 08:54:09 +0200 |
| parents | 619c0e8bb728 |
| children | ce38ee1b67ab |
| files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotSubstitutions.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectSubstitutions.java graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathIntrinsicNode.java graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathSubstitutions.java |
| diffstat | 3 files changed, 1 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Wed Apr 08 23:00:45 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Thu Apr 09 08:54:09 2015 +0200 @@ -100,6 +100,7 @@ return true; } }); + r.registerMethodSubstitution(ObjectSubstitutions.class, "hashCode", Receiver.class); } private static void registerClassPlugins(InvocationPlugins plugins) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotSubstitutions.java Wed Apr 08 23:00:45 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotSubstitutions.java Thu Apr 09 08:54:09 2015 +0200 @@ -40,7 +40,6 @@ @Override public void registerReplacements(MetaAccessProvider metaAccess, LoweringProvider loweringProvider, SnippetReflectionProvider snippetReflection, Replacements replacements, TargetDescription target) { - replacements.registerSubstitutions(Object.class, ObjectSubstitutions.class); replacements.registerSubstitutions(System.class, SystemSubstitutions.class); replacements.registerSubstitutions(Thread.class, ThreadSubstitutions.class); replacements.registerSubstitutions(Unsafe.class, UnsafeSubstitutions.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectSubstitutions.java Wed Apr 08 23:00:45 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectSubstitutions.java Thu Apr 09 08:54:09 2015 +0200 @@ -24,23 +24,11 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.*; - /** * Substitutions for {@link java.lang.Object} methods. */ -@ClassSubstitution(java.lang.Object.class) public class ObjectSubstitutions { - @MethodSubstitution(isStatic = false, forced = true) - public static Class<?> getClass(final Object thisObj) { - KlassPointer hub = loadHub(GuardingPiNode.guardingNonNull(thisObj)); - return HubGetClassNode.readClass(hub); - } - - @MethodSubstitution(isStatic = false) public static int hashCode(final Object thisObj) { return computeHashCode(thisObj); }