--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/LoadIndexedFinalNode.java	Mon Nov 10 19:03:06 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, 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.truffle.nodes;
-
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.spi.*;
-import com.oracle.graal.nodeinfo.*;
-import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.java.*;
-import com.oracle.graal.nodes.spi.*;
-import com.oracle.graal.nodes.type.*;
-
-/**
- * @see LoadIndexedNode
- */
-@NodeInfo
-public class LoadIndexedFinalNode extends AccessIndexedNode implements Canonicalizable {
-
-    /**
-     * Creates a new {@link LoadIndexedFinalNode}.
-     *
-     * @param array the instruction producing the array
-     * @param index the instruction producing the index
-     * @param elementKind the element type
-     */
-    public static LoadIndexedFinalNode create(ValueNode array, ValueNode index, Kind elementKind) {
-        return new LoadIndexedFinalNode(array, index, elementKind);
-    }
-
-    protected LoadIndexedFinalNode(ValueNode array, ValueNode index, Kind elementKind) {
-        super(createStamp(array, elementKind), array, index, elementKind);
-    }
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (array().isConstant() && index().isConstant()) {
-            JavaConstant constant = tool.getConstantReflection().readArrayElement(array().asJavaConstant(), index().asJavaConstant().asInt());
-            if (constant != null) {
-                return ConstantNode.forConstant(constant, tool.getMetaAccess());
-            }
-        }
-        return this;
-    }
-
-    private static Stamp createStamp(ValueNode array, Kind kind) {
-        ResolvedJavaType type = StampTool.typeOrNull(array);
-        if (kind == Kind.Object && type != null) {
-            return StampFactory.declared(type.getComponentType(), false, true);
-        } else {
-            return StampFactory.forKind(kind);
-        }
-    }
-
-    @Override
-    public boolean inferStamp() {
-        return updateStamp(createStamp(array(), elementKind()));
-    }
-
-    @Override
-    public void lower(LoweringTool tool) {
-        LoadIndexedNode loadIndexedNode = graph().add(LoadIndexedNode.create(array(), index(), elementKind()));
-        graph().replaceFixedWithFixed(this, loadIndexedNode);
-        loadIndexedNode.lower(tool);
-    }
-}

--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeStoreMacroNode.java	Mon Nov 10 19:03:06 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeStoreMacroNode.java	Mon Nov 10 19:08:52 2014 +0100
@@ -33,7 +33,7 @@
 import com.oracle.truffle.api.*;
 
 /**
- * Macro node for method {@link CompilerDirectives#unsafeCast(Object, Class, boolean)}.
+ * Macro node for method {@link CompilerDirectives#unsafePutInt(Object, long, int, Object)} et al.
  */
 @NodeInfo
 public class CustomizedUnsafeStoreMacroNode extends NeverPartOfCompilationNode implements Canonicalizable, StateSplit {