# HG changeset patch # User Doug Simon # Date 1408805756 -7200 # Node ID a85d43d86ea148ef9a98ead60c6deb86857c6e42 # Parent e86071cdba96ef9db7e922e11dec3042a080a90e indirect through NodeClass when looking up the HSAIL lowering strategy map diff -r e86071cdba96 -r a85d43d86ea1 graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java --- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java Sat Aug 23 16:54:56 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java Sat Aug 23 16:55:56 2014 +0200 @@ -103,22 +103,22 @@ } }; - private HashMap, LoweringStrategy> strategyMap = new HashMap<>(); + private HashMap strategyMap = new HashMap<>(); void initStrategyMap() { - strategyMap.put(ConvertNode.class, PassThruStrategy); - strategyMap.put(FloatConvertNode.class, PassThruStrategy); - strategyMap.put(NewInstanceNode.class, NewObjectStrategy); - strategyMap.put(NewArrayNode.class, NewObjectStrategy); - strategyMap.put(NewMultiArrayNode.class, RejectStrategy); - strategyMap.put(DynamicNewArrayNode.class, RejectStrategy); - strategyMap.put(MonitorEnterNode.class, RejectStrategy); - strategyMap.put(MonitorExitNode.class, RejectStrategy); - strategyMap.put(UnwindNode.class, UnwindNodeStrategy); + strategyMap.put(NodeClass.get(ConvertNode.class), PassThruStrategy); + strategyMap.put(NodeClass.get(FloatConvertNode.class), PassThruStrategy); + strategyMap.put(NodeClass.get(NewInstanceNode.class), NewObjectStrategy); + strategyMap.put(NodeClass.get(NewArrayNode.class), NewObjectStrategy); + strategyMap.put(NodeClass.get(NewMultiArrayNode.class), RejectStrategy); + strategyMap.put(NodeClass.get(DynamicNewArrayNode.class), RejectStrategy); + strategyMap.put(NodeClass.get(MonitorEnterNode.class), RejectStrategy); + strategyMap.put(NodeClass.get(MonitorExitNode.class), RejectStrategy); + strategyMap.put(NodeClass.get(UnwindNode.class), UnwindNodeStrategy); } private LoweringStrategy getStrategy(Node n) { - return strategyMap.get(n.getClass()); + return strategyMap.get(n.getNodeClass()); } public HSAILHotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, TargetDescription target) {