# HG changeset patch # User Roland Schatz # Date 1415887630 -3600 # Node ID ad3c2cacdd1aac6b1acd60778751c3836749fbac # Parent 9cbed4622c3c9ea699f71af5960c9bf126f43312 Remove StampProvider interface. diff -r 9cbed4622c3c -r ad3c2cacdd1a graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/StampProvider.java --- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/StampProvider.java Thu Nov 13 13:49:39 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2011, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.compiler.common.type; - -public interface StampProvider { - - Stamp stamp(); -} diff -r 9cbed4622c3c -r ad3c2cacdd1a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java Thu Nov 13 13:49:39 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java Thu Nov 13 15:07:10 2014 +0100 @@ -23,10 +23,9 @@ package com.oracle.graal.hotspot.meta; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.common.type.*; import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding; -public interface HotSpotMetaspaceConstant extends HotSpotConstant, VMConstant, Remote, StampProvider { +public interface HotSpotMetaspaceConstant extends HotSpotConstant, VMConstant, Remote { boolean isCompressed(); diff -r 9cbed4622c3c -r ad3c2cacdd1a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java Thu Nov 13 13:49:39 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java Thu Nov 13 15:07:10 2014 +0100 @@ -25,7 +25,6 @@ import java.util.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.common.type.*; import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding; public final class HotSpotMetaspaceConstantImpl extends PrimitiveConstant implements HotSpotMetaspaceConstant, VMConstant { @@ -64,13 +63,6 @@ return super.toString() + "{" + metaspaceObject + (compressed ? ";compressed}" : "}"); } - public Stamp stamp() { - if (compressed) { - return StampFactory.forInteger(32); - } - return StampFactory.forInteger(64); - } - public boolean isCompressed() { return compressed; } diff -r 9cbed4622c3c -r ad3c2cacdd1a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Thu Nov 13 13:49:39 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Thu Nov 13 15:07:10 2014 +0100 @@ -79,7 +79,6 @@ } else if (c instanceof HotSpotObjectConstant) { return ((HotSpotObjectConstant) c).compress(); } else if (c instanceof HotSpotMetaspaceConstant) { - assert ((HotSpotMetaspaceConstant) c).stamp().getStackKind() == Kind.Long; return ((HotSpotMetaspaceConstant) c).compress(encoding); } else if (c instanceof PrimitiveConstant) { assert ((PrimitiveConstant) c).getKind() == Kind.Long; @@ -95,7 +94,6 @@ } else if (c instanceof HotSpotObjectConstant) { return ((HotSpotObjectConstant) c).uncompress(); } else if (c instanceof HotSpotMetaspaceConstant) { - assert ((HotSpotMetaspaceConstant) c).stamp().getStackKind() == Kind.Int; return ((HotSpotMetaspaceConstant) c).uncompress(encoding); } else if (c instanceof PrimitiveConstant) { assert ((PrimitiveConstant) c).getKind() == Kind.Int; diff -r 9cbed4622c3c -r ad3c2cacdd1a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Thu Nov 13 13:49:39 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Thu Nov 13 15:07:10 2014 +0100 @@ -32,7 +32,7 @@ * instructions. */ @NodeInfo -public abstract class ValueNode extends ScheduledNode implements StampProvider, KindProvider { +public abstract class ValueNode extends ScheduledNode implements KindProvider { /** * The kind of this value. This is {@link Kind#Void} for instructions that produce no value. diff -r 9cbed4622c3c -r ad3c2cacdd1a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java Thu Nov 13 13:49:39 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java Thu Nov 13 15:07:10 2014 +0100 @@ -34,8 +34,8 @@ */ public class StampTool { - public static Stamp meet(Collection values) { - Iterator iterator = values.iterator(); + public static Stamp meet(Collection values) { + Iterator iterator = values.iterator(); if (iterator.hasNext()) { Stamp stamp = iterator.next().stamp(); while (iterator.hasNext()) {