changeset 11360:9b64c7982932

Merge.
author Doug Simon <doug.simon@oracle.com>
date Mon, 19 Aug 2013 14:05:55 +0200
parents 51b0b1104114 (current diff) f75491043d40 (diff)
children 07625ef93345
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteMemoryCheckpointNode.java
diffstat 2 files changed, 1 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Mon Aug 19 12:55:34 2013 +0200
+++ b/.hgignore	Mon Aug 19 14:05:55 2013 +0200
@@ -75,3 +75,4 @@
 coverage
 jacoco.exec
 workingsets.xml
+.buildbot/
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteMemoryCheckpointNode.java	Mon Aug 19 12:55:34 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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.nodes.extended;
-
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.spi.*;
-import com.oracle.graal.nodes.type.*;
-
-public final class WriteMemoryCheckpointNode extends AbstractStateSplit implements StateSplit, LIRLowerable, MemoryCheckpoint.Single {
-
-    public WriteMemoryCheckpointNode() {
-        this(StampFactory.forVoid());
-    }
-
-    public WriteMemoryCheckpointNode(Stamp stamp) {
-        super(stamp);
-    }
-
-    @Override
-    public LocationIdentity getLocationIdentity() {
-        return LocationIdentity.ANY_LOCATION;
-    }
-
-    @Override
-    public void generate(LIRGeneratorTool generator) {
-        // nothing to do...
-    }
-}