Mercurial > hg > graal-jvmci-8
changeset 19518:387d7192e18f
Replace abstract type usage in graph builder with concrete type usage.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 19 Feb 2015 23:56:04 +0100 |
parents | 55d0b9ec7587 |
children | 108fbab4e0e8 |
files | graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Feb 19 23:53:58 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Feb 19 23:56:04 2015 +0100 @@ -197,9 +197,9 @@ private boolean controlFlowSplit; private FixedWithNextNode[] firstInstructionArray; - private AbstractFrameStateBuilder<?, ?>[] entryStateArray; + private HIRFrameStateBuilder[] entryStateArray; private FixedWithNextNode[][] firstInstructionMatrix; - private AbstractFrameStateBuilder<?, ?>[][] entryStateMatrix; + private HIRFrameStateBuilder[][] entryStateMatrix; /** * @param isReplacement specifies if this object is being used to parse a method that @@ -253,7 +253,7 @@ BciBlockMapping newMapping = BciBlockMapping.create(stream, method); this.blockMap = newMapping; this.firstInstructionArray = new FixedWithNextNode[blockMap.getBlockCount()]; - this.entryStateArray = new AbstractFrameStateBuilder<?, ?>[blockMap.getBlockCount()]; + this.entryStateArray = new HIRFrameStateBuilder[blockMap.getBlockCount()]; if (graphBuilderConfig.doLivenessAnalysis()) { try (Scope s = Debug.scope("LivenessAnalysis")) { @@ -1260,7 +1260,7 @@ } } - private void setEntryState(BciBlock block, int dimension, AbstractFrameStateBuilder<?, ?> entryState) { + private void setEntryState(BciBlock block, int dimension, HIRFrameStateBuilder entryState) { int id = block.id; if (dimension == 0) { this.entryStateArray[id] = entryState; @@ -1269,9 +1269,9 @@ } } - private void setEntryStateMultiDimension(int dimension, AbstractFrameStateBuilder<?, ?> entryState, int id) { + private void setEntryStateMultiDimension(int dimension, HIRFrameStateBuilder entryState, int id) { if (entryStateMatrix == null) { - entryStateMatrix = new AbstractFrameStateBuilder<?, ?>[4][]; + entryStateMatrix = new HIRFrameStateBuilder[4][]; } if (dimension - 1 < entryStateMatrix.length) { // We are within bounds. @@ -1280,7 +1280,7 @@ entryStateMatrix = Arrays.copyOf(entryStateMatrix, Math.max(entryStateMatrix.length * 2, dimension)); } if (entryStateMatrix[dimension - 1] == null) { - entryStateMatrix[dimension - 1] = new AbstractFrameStateBuilder<?, ?>[blockMap.getBlockCount()]; + entryStateMatrix[dimension - 1] = new HIRFrameStateBuilder[blockMap.getBlockCount()]; } entryStateMatrix[dimension - 1][id] = entryState; } @@ -1367,7 +1367,7 @@ targetNode = getFirstInstruction(block, operatingDimension); Target target = checkLoopExit(targetNode, block, state); FixedNode result = target.fixed; - AbstractFrameStateBuilder<?, ?> currentEntryState = target.state == state ? state.copy() : target.state; + HIRFrameStateBuilder currentEntryState = target.state == state ? state.copy() : target.state; setEntryState(block, operatingDimension, currentEntryState); currentEntryState.clearNonLiveLocals(block, liveness, true);