Mercurial > hg > graal-compiler
changeset 22569:d2fcadb5bc37
Update jvmci: Collapse Value/AbstractValue.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Wed, 02 Sep 2015 14:18:39 +0200 |
parents | 3714119dfbc0 |
children | 479bccee7915 |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ConstantValue.java mx.graal/suite.py |
diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java Wed Sep 02 11:47:11 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java Wed Sep 02 14:18:39 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,13 +31,13 @@ * closure because Value is serializable which is a hassle for the little inner classes which * usually occur here. */ -public class ComplexMatchValue extends AbstractValue { +public class ComplexMatchValue extends Value { /** * This is the Value of a node which was matched as part of a complex match. The value isn't * actually useable but this marks it as having been evaluated. */ - public static final Value INTERIOR_MATCH = new AbstractValue(LIRKind.Illegal) { + public static final Value INTERIOR_MATCH = new Value(LIRKind.Illegal) { @Override public String toString() {
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java Wed Sep 02 11:47:11 2015 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java Wed Sep 02 14:18:39 2015 +0200 @@ -68,7 +68,7 @@ } } - private static class DummyValue extends AbstractValue { + private static class DummyValue extends Value { private final int id; private static int counter = 1;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java Wed Sep 02 11:47:11 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java Wed Sep 02 14:18:39 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,7 @@ * intended to support addresses and not general arbitrary nesting of composite values. Because of * the possibility of sharing of CompositeValues they should be immutable. */ -public abstract class CompositeValue extends AbstractValue { +public abstract class CompositeValue extends Value { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD)
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ConstantValue.java Wed Sep 02 11:47:11 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ConstantValue.java Wed Sep 02 14:18:39 2015 +0200 @@ -27,7 +27,7 @@ /** * Represents an inlined {@link Constant} value. */ -public class ConstantValue extends AbstractValue { +public class ConstantValue extends Value { private final Constant constant;
--- a/mx.graal/suite.py Wed Sep 02 11:47:11 2015 +0200 +++ b/mx.graal/suite.py Wed Sep 02 14:18:39 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "90c4254dc25aebe42e0140f67b1026d44e665b4c", + "version" : "943c2bf064fa3bb15f73a77fb0d8d746db9020d7", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"},