# HG changeset patch # User Andreas Woess # Date 1365595882 -7200 # Node ID c6d4a69d5129093c3d8410b01359d0018cb9b7de # Parent bd2ace51ba04925d1acd7b0d9ee64c3334ab7497 Move call site substitutions to inner classes. diff -r bd2ace51ba04 -r c6d4a69d5129 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteSubstitutions.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteSubstitutions.java Thu Apr 11 13:47:12 2013 -0400 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteSubstitutions.java Wed Apr 10 14:11:22 2013 +0200 @@ -40,25 +40,25 @@ replacements.registerSubstitutions(VolatileCallSiteSubstitutions.class); } } -} + + @ClassSubstitution(ConstantCallSite.class) + private static class ConstantCallSiteSubstitutions { -@ClassSubstitution(ConstantCallSite.class) -class ConstantCallSiteSubstitutions { + @MacroSubstitution(isStatic = false, macro = CallSiteTargetNode.class) + public static native MethodHandle getTarget(ConstantCallSite callSite); + } - @MacroSubstitution(isStatic = false, macro = CallSiteTargetNode.class) - public static native MethodHandle getTarget(ConstantCallSite callSite); -} + @ClassSubstitution(MutableCallSite.class) + private static class MutableCallSiteSubstitutions { -@ClassSubstitution(MutableCallSite.class) -class MutableCallSiteSubstitutions { - - @MacroSubstitution(isStatic = false, macro = CallSiteTargetNode.class) - public static native MethodHandle getTarget(MutableCallSite callSite); -} + @MacroSubstitution(isStatic = false, macro = CallSiteTargetNode.class) + public static native MethodHandle getTarget(MutableCallSite callSite); + } -@ClassSubstitution(VolatileCallSite.class) -class VolatileCallSiteSubstitutions { + @ClassSubstitution(VolatileCallSite.class) + private static class VolatileCallSiteSubstitutions { - @MacroSubstitution(isStatic = false, macro = CallSiteTargetNode.class) - public static native MethodHandle getTarget(VolatileCallSite callSite); + @MacroSubstitution(isStatic = false, macro = CallSiteTargetNode.class) + public static native MethodHandle getTarget(VolatileCallSite callSite); + } }