Mercurial > hg > truffle
comparison graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java @ 21528:513f8d0ae27d
merge fixes
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 22 May 2015 23:58:35 +0200 |
parents | 1da7aef31a08 |
children | 93c50cefb9e8 |
comparison
equal
deleted
inserted
replaced
21527:07b088d61d5d | 21528:513f8d0ae27d |
---|---|
520 return super.arrayScalingFactor(kind); | 520 return super.arrayScalingFactor(kind); |
521 } | 521 } |
522 | 522 |
523 @Override | 523 @Override |
524 protected int arrayBaseOffset(Kind kind) { | 524 protected int arrayBaseOffset(Kind kind) { |
525 return runtime.getArrayBaseOffset(kind); | 525 return runtime.getJVMCIRuntime().getArrayBaseOffset(kind); |
526 } | 526 } |
527 | 527 |
528 @Override | 528 @Override |
529 protected int arrayLengthOffset() { | 529 protected int arrayLengthOffset() { |
530 return runtime.getConfig().arrayLengthOffset; | 530 return runtime.getConfig().arrayLengthOffset; |