# HG changeset patch
# User Doug Simon
# Date 1408095278 -7200
# Node ID cbd42807a31f391422dcf51315991c19ae256ef1
# Parent 71f3c23158c9fe59361522583b9176a2c4474163
moved NodeInfo and friends into separate com.oracle.graal.nodeinfo project so that annotation processor can be applied to the base Node class
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSenReduTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSenReduTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSenReduTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,25 +22,21 @@
*/
package com.oracle.graal.compiler.test;
-import com.oracle.graal.debug.Debug;
-import com.oracle.graal.debug.DebugConfig;
-import com.oracle.graal.debug.DebugConfigScope;
-import com.oracle.graal.debug.internal.DebugScope;
-import com.oracle.graal.graph.Node;
-import com.oracle.graal.nodes.calc.ObjectEqualsNode;
-import com.oracle.graal.nodes.util.GraphUtil;
-import com.oracle.graal.phases.common.cfs.FlowSensitiveReductionPhase;
+import java.util.*;
import org.junit.*;
+import com.oracle.graal.debug.*;
+import com.oracle.graal.debug.internal.*;
+import com.oracle.graal.graph.*;
import com.oracle.graal.nodes.*;
+import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.java.*;
+import com.oracle.graal.nodes.util.*;
import com.oracle.graal.phases.common.*;
+import com.oracle.graal.phases.common.cfs.*;
import com.oracle.graal.phases.tiers.*;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Tests whether {@link com.oracle.graal.phases.common.cfs.FlowSensitiveReductionPhase} actually
* performs some graph rewritings that it's supposed to perform.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSensitiveReductionTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSensitiveReductionTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSensitiveReductionTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,16 +26,15 @@
import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*;
import static org.junit.Assert.*;
-import com.oracle.graal.phases.common.cfs.FlowSensitiveReductionPhase;
-
import org.junit.*;
+import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.phases.common.*;
+import com.oracle.graal.phases.common.cfs.*;
import com.oracle.graal.phases.tiers.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -45,9 +45,9 @@
import com.oracle.graal.debug.*;
import com.oracle.graal.debug.Debug.Scope;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.java.*;
import com.oracle.graal.lir.asm.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.cfg.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import static com.oracle.graal.compiler.common.GraalOptions.*;
import static org.junit.Assert.*;
+
import java.util.*;
import org.junit.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MonitorGraphTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MonitorGraphTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MonitorGraphTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.compiler.test;
import static com.oracle.graal.graph.iterators.NodePredicates.*;
+
import java.util.*;
import org.junit.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ScalarTypeSystemTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ScalarTypeSystemTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ScalarTypeSystemTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,13 +22,13 @@
*/
package com.oracle.graal.compiler.test;
-import com.oracle.graal.phases.common.cfs.FlowSensitiveReductionPhase;
import org.junit.*;
import com.oracle.graal.api.code.*;
import com.oracle.graal.debug.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.phases.common.*;
+import com.oracle.graal.phases.common.cfs.*;
import com.oracle.graal.phases.tiers.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SimpleCFGTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SimpleCFGTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SimpleCFGTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.compiler.test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,18 +24,17 @@
import java.io.*;
-import com.oracle.graal.phases.common.cfs.FlowSensitiveReductionPhase;
-
import org.junit.*;
import com.oracle.graal.api.code.*;
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.cfg.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.phases.common.*;
+import com.oracle.graal.phases.common.cfs.*;
import com.oracle.graal.phases.schedule.*;
import com.oracle.graal.phases.tiers.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAReadEliminationTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAReadEliminationTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAReadEliminationTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.compiler.test.ea;
import static org.junit.Assert.*;
+
import java.util.*;
import org.junit.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.compiler.test.inlining;
import static org.junit.Assert.*;
+
import java.lang.reflect.*;
import org.junit.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugConfig.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugConfig.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugConfig.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,8 +29,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.lir.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.util.*;
import com.oracle.graal.options.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.compiler.match;
import com.oracle.graal.debug.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatement.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatement.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatement.java Fri Aug 15 11:34:38 2014 +0200
@@ -32,7 +32,7 @@
import com.oracle.graal.compiler.match.MatchPattern.Result;
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph.processor/src/META-INF/services/javax.annotation.processing.Processor
--- a/graal/com.oracle.graal.graph.processor/src/META-INF/services/javax.annotation.processing.Processor Fri Aug 15 11:28:46 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-com.oracle.graal.graph.processor.GraphNodeProcessor
\ No newline at end of file
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph.processor/src/com/oracle/graal/graph/processor/GraphNode.java
--- a/graal/com.oracle.graal.graph.processor/src/com/oracle/graal/graph/processor/GraphNode.java Fri Aug 15 11:28:46 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 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.graph.processor;
-
-import javax.lang.model.element.*;
-
-import com.oracle.graal.graph.*;
-
-public class GraphNode {
-
- private final NodeInfo nodeInfo;
- private final TypeElement declaration;
-
- public GraphNode(TypeElement type, NodeInfo nodeInfo) {
- this.declaration = type;
- this.nodeInfo = nodeInfo;
- }
-
- public NodeInfo getNodeInfo() {
- return nodeInfo;
- }
-
- public TypeElement getDeclaration() {
- return declaration;
- }
-
-}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph.processor/src/com/oracle/graal/graph/processor/GraphNodeGenerator.java
--- a/graal/com.oracle.graal.graph.processor/src/com/oracle/graal/graph/processor/GraphNodeGenerator.java Fri Aug 15 11:28:46 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 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.graph.processor;
-
-import static com.oracle.truffle.dsl.processor.java.ElementUtils.*;
-
-import javax.annotation.processing.*;
-import javax.lang.model.element.*;
-import javax.lang.model.type.*;
-import javax.lang.model.util.*;
-
-import com.oracle.graal.graph.*;
-import com.oracle.truffle.dsl.processor.java.*;
-import com.oracle.truffle.dsl.processor.java.model.*;
-
-/**
- * Generates the source code for a {@link Node} class.
- */
-public class GraphNodeGenerator {
-
- private final GraphNodeProcessor processor;
-
- public GraphNodeGenerator(GraphNodeProcessor processor) {
- this.processor = processor;
- }
-
- public ProcessingEnvironment getProcessingEnv() {
- return processor.getProcessingEnv();
- }
-
- private String getGeneratedClassName(GraphNode node) {
-
- TypeElement typeElement = node.getDeclaration();
-
- String newClassName = typeElement.getSimpleName().toString() + "Gen";
- Element enclosing = typeElement.getEnclosingElement();
- while (enclosing != null) {
- if (enclosing.getKind() == ElementKind.CLASS || enclosing.getKind() == ElementKind.INTERFACE) {
- if (enclosing.getModifiers().contains(Modifier.PRIVATE)) {
- processor.errorMessage(enclosing, "%s %s cannot be private", enclosing.getKind().name().toLowerCase(), enclosing);
- return null;
- }
- newClassName = enclosing.getSimpleName() + "$" + newClassName;
- } else {
- assert enclosing.getKind() == ElementKind.PACKAGE;
- }
- enclosing = enclosing.getEnclosingElement();
- }
- return newClassName;
- }
-
- public CodeCompilationUnit process(GraphNode node) {
- CodeCompilationUnit compilationUnit = new CodeCompilationUnit();
-
- TypeElement typeElement = node.getDeclaration();
- PackageElement packageElement = ElementUtils.findPackageElement(node.getDeclaration());
-
- String newClassName = getGeneratedClassName(node);
-
- CodeTypeElement nodeGenElement = new CodeTypeElement(modifiers(), ElementKind.CLASS, packageElement, newClassName);
-
- if (typeElement.getModifiers().contains(Modifier.ABSTRACT)) {
- // we do not support implementation of abstract methods yet.
- nodeGenElement.getModifiers().add(Modifier.ABSTRACT);
- }
-
- nodeGenElement.setSuperClass(typeElement.asType());
-
- for (ExecutableElement constructor : ElementFilter.constructorsIn(typeElement.getEnclosedElements())) {
- if (constructor.getModifiers().contains(Modifier.PRIVATE)) {
- // ignore private constructors
- continue;
- }
- nodeGenElement.add(createSuperConstructor(nodeGenElement, constructor));
- }
-
- DeclaredType generatedNode = (DeclaredType) ElementUtils.getType(getProcessingEnv(), GeneratedNode.class);
- CodeAnnotationMirror generatedByMirror = new CodeAnnotationMirror(generatedNode);
- generatedByMirror.setElementValue(generatedByMirror.findExecutableElement("value"), new CodeAnnotationValue(typeElement.asType()));
- nodeGenElement.getAnnotationMirrors().add(generatedByMirror);
-
- nodeGenElement.add(createDummyExampleMethod());
-
- compilationUnit.add(nodeGenElement);
- return compilationUnit;
- }
-
- private CodeExecutableElement createSuperConstructor(TypeElement type, ExecutableElement element) {
- CodeExecutableElement executable = CodeExecutableElement.clone(getProcessingEnv(), element);
-
- // to create a constructor we have to set the return type to null.(TODO needs fix)
- executable.setReturnType(null);
- // we have to set the name manually otherwise is inferred (TODO needs fix)
- executable.setSimpleName(CodeNames.of(type.getSimpleName().toString()));
-
- CodeTreeBuilder b = executable.createBuilder();
- b.startStatement().startSuperCall();
- for (VariableElement v : element.getParameters()) {
- b.string(v.getSimpleName().toString());
- }
- b.end().end();
-
- return executable;
- }
-
- public ExecutableElement createDummyExampleMethod() {
- CodeExecutableElement method = new CodeExecutableElement(modifiers(Modifier.PROTECTED), ElementUtils.getType(getProcessingEnv(), int.class), "computeTheMeaningOfLife");
-
- CodeTreeBuilder builder = method.createBuilder();
- builder.string("// this method got partially evaluated").newLine();
- builder.startReturn().string("42").end();
-
- return method;
- }
-
-}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph.processor/src/com/oracle/graal/graph/processor/GraphNodeProcessor.java
--- a/graal/com.oracle.graal.graph.processor/src/com/oracle/graal/graph/processor/GraphNodeProcessor.java Fri Aug 15 11:28:46 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 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.graph.processor;
-
-import java.io.*;
-import java.util.*;
-
-import javax.annotation.processing.*;
-import javax.lang.model.*;
-import javax.lang.model.element.*;
-import javax.lang.model.type.*;
-import javax.lang.model.util.*;
-import javax.tools.Diagnostic.Kind;
-
-import com.oracle.graal.graph.*;
-import com.oracle.truffle.dsl.processor.*;
-import com.oracle.truffle.dsl.processor.java.*;
-import com.oracle.truffle.dsl.processor.java.model.*;
-import com.oracle.truffle.dsl.processor.java.transform.*;
-
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes({"com.oracle.graal.graph.NodeInfo"})
-public class GraphNodeProcessor extends AbstractProcessor {
- @Override
- public SourceVersion getSupportedSourceVersion() {
- return SourceVersion.latest();
- }
-
- void errorMessage(Element element, String format, Object... args) {
- processingEnv.getMessager().printMessage(Kind.ERROR, String.format(format, args), element);
- }
-
- /**
- * Bugs in an annotation processor can cause silent failure so try to report any exception
- * throws as errors.
- */
- private void reportException(Element element, Throwable t) {
- StringWriter buf = new StringWriter();
- t.printStackTrace(new PrintWriter(buf));
- buf.toString();
- errorMessage(element, "Exception thrown during processing: %s", buf.toString());
- }
-
- ProcessingEnvironment getProcessingEnv() {
- return processingEnv;
- }
-
- @Override
- public boolean process(Set extends TypeElement> annotations, RoundEnvironment roundEnv) {
- if (roundEnv.processingOver()) {
- return false;
- }
-
- GraphNodeGenerator gen = new GraphNodeGenerator(this);
- Types types = processingEnv.getTypeUtils();
- Elements elements = processingEnv.getElementUtils();
-
- TypeMirror nodeType = elements.getTypeElement(Node.class.getName()).asType();
-
- for (Element element : roundEnv.getElementsAnnotatedWith(NodeInfo.class)) {
- try {
- if (!types.isSubtype(element.asType(), nodeType)) {
- errorMessage(element, "%s can only be applied to %s subclasses", NodeInfo.class.getSimpleName(), Node.class.getSimpleName());
- continue;
- }
-
- NodeInfo nodeInfo = element.getAnnotation(NodeInfo.class);
- if (nodeInfo == null) {
- errorMessage(element, "Cannot get %s annotation from annotated element", NodeInfo.class.getSimpleName());
- continue;
- }
-
- TypeElement typeElement = (TypeElement) element;
-
- if (typeElement.getModifiers().contains(Modifier.FINAL)) {
- errorMessage(element, "%s annotated class cannot be final", NodeInfo.class.getSimpleName());
- continue;
- }
-
- GraphNode graphNode = new GraphNode(typeElement, nodeInfo);
- CodeCompilationUnit unit = gen.process(graphNode);
- unit.setGeneratorElement(typeElement);
-
- DeclaredType overrideType = (DeclaredType) ElementUtils.getType(processingEnv, Override.class);
- DeclaredType unusedType = (DeclaredType) ElementUtils.getType(processingEnv, SuppressWarnings.class);
- unit.accept(new GenerateOverrideVisitor(overrideType), null);
- unit.accept(new FixWarningsVisitor(processingEnv, unusedType, overrideType), null);
- unit.accept(new CodeWriter(processingEnv, typeElement), null);
- } catch (Throwable t) {
- if (!isBug367599(t)) {
- reportException(element, t);
- }
- }
- }
- return false;
- }
-
- /**
- * Determines if a given exception is (most likely) caused by Bug 367599.
- */
- public static boolean isBug367599(Throwable t) {
- for (StackTraceElement ste : t.getStackTrace()) {
- if (ste.toString().contains("org.eclipse.jdt.internal.apt.pluggable.core.filer.IdeFilerImpl.create")) {
- // See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=367599
- return true;
- }
- }
- if (t.getCause() != null) {
- return isBug367599(t.getCause());
- }
- return false;
- }
-}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GeneratedNode.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GeneratedNode.java Fri Aug 15 11:28:46 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 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.graph;
-
-import java.lang.annotation.*;
-
-/**
- * Denotes a {@link Node} class derived from a {@link NodeInfo} annotated {@link Node} type.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-public @interface GeneratedNode {
-
- /**
- * The {@link Node} class from which the annotated type was generated.
- */
- Class> value();
-}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,6 +30,7 @@
import com.oracle.graal.graph.NodeClass.NodeClassIterator;
import com.oracle.graal.graph.NodeClass.Position;
import com.oracle.graal.graph.iterators.*;
+import com.oracle.graal.nodeinfo.*;
/**
* This class is a graph container, it contains the set of nodes that belong to this graph.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph/src/com/oracle/graal/graph/InputType.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/InputType.java Fri Aug 15 11:28:46 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 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.graph;
-
-public enum InputType {
- /**
- * Inputs that consume an actual value generated by the referenced node.
- */
- Value,
- /**
- * Inputs that consume the memory state of the referenced node.
- */
- Memory,
- /**
- * Inputs that reference a condition.
- */
- Condition,
- /**
- * Inputs that reference a frame state.
- */
- State,
- /**
- * Inputs that reference a guard (guards, begin nodes).
- */
- Guard,
- /**
- * Inputs that reference an anchor (begin nodes, value anchors).
- */
- Anchor,
- /**
- * Inputs that represent an association between nodes, e.g., a phi and the merge or a loop begin
- * and loop exits and ends.
- */
- Association,
- /**
- * Inputs that connect tightly coupled nodes, e.g., an InvokeNode and its CallTargetNode.
- */
- Extension,
- /**
- * Inputs of this type are temporarily exempt from type checking. This should only be used in
- * exceptional cases and should never survive to later stages of compilation.
- */
- Unchecked
-}
\ No newline at end of file
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Fri Aug 15 11:34:38 2014 +0200
@@ -31,6 +31,7 @@
import com.oracle.graal.graph.NodeClass.Position;
import com.oracle.graal.graph.iterators.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
/**
* This class is the base class for all nodes, it represent a node which can be inserted in a
@@ -997,34 +998,6 @@
return toString(Verbosity.Short);
}
- public enum Verbosity {
- /**
- * Only the id of the node.
- */
- Id,
- /**
- * Only the name of the node, which may contain some more information for certain node types
- * (constants, ...).
- */
- Name,
- /**
- * {@link #Id} + {@link #Name}.
- */
- Short,
- /**
- * Defaults to {@link #Short} and may be enhanced by subclasses.
- */
- Long,
- /**
- * For use by a custom formatting facility in an IDE.
- */
- Debugger,
- /**
- * All the other information plus all debug properties of the node.
- */
- All
- }
-
/**
* Creates a String representation for this node with a given {@link Verbosity}.
*/
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Fri Aug 15 11:34:38 2014 +0200
@@ -33,8 +33,8 @@
import com.oracle.graal.graph.Graph.DuplicationReplacement;
import com.oracle.graal.graph.Node.Input;
import com.oracle.graal.graph.Node.Successor;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
/**
* Metadata for every {@link Node} type. The metadata includes:
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeInfo.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeInfo.java Fri Aug 15 11:28:46 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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.graph;
-
-import java.lang.annotation.*;
-
-import com.oracle.graal.graph.Node.Verbosity;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface NodeInfo {
-
- String shortName() default "";
-
- /**
- * The template used to build the {@link Verbosity#Name} version. Variable part are specified
- * using {i#inputName} or {p#propertyName}.
- */
- String nameTemplate() default "";
-
- InputType[] allowedUsageTypes() default {};
-}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.asm.amd64.*;
import com.oracle.graal.lir.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.BlockEndOp;
import com.oracle.graal.lir.amd64.*;
import com.oracle.graal.lir.asm.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEnterUnpackFramesStackFrameOp.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEnterUnpackFramesStackFrameOp.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEnterUnpackFramesStackFrameOp.java Fri Aug 15 11:34:38 2014 +0200
@@ -31,7 +31,7 @@
import com.oracle.graal.asm.amd64.*;
import com.oracle.graal.hotspot.*;
import com.oracle.graal.lir.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
import com.oracle.graal.lir.amd64.*;
import com.oracle.graal.lir.asm.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Fri Aug 15 11:34:38 2014 +0200
@@ -31,7 +31,7 @@
import com.oracle.graal.asm.amd64.*;
import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag;
import com.oracle.graal.lir.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.BlockEndOp;
import com.oracle.graal.lir.asm.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,8 +22,8 @@
*/
package com.oracle.graal.hotspot.amd64;
+import static com.oracle.graal.amd64.AMD64.*;
import static com.oracle.graal.api.code.ValueUtil.*;
-import static com.oracle.graal.amd64.AMD64.*;
import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*;
import com.oracle.graal.api.code.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveUnpackFramesStackFrameOp.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveUnpackFramesStackFrameOp.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveUnpackFramesStackFrameOp.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,7 +27,7 @@
import com.oracle.graal.asm.amd64.*;
import com.oracle.graal.hotspot.*;
import com.oracle.graal.lir.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
import com.oracle.graal.lir.amd64.*;
import com.oracle.graal.lir.asm.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Fri Aug 15 11:34:38 2014 +0200
@@ -47,8 +47,8 @@
import com.oracle.graal.lir.amd64.*;
import com.oracle.graal.lir.amd64.AMD64Move.CompareAndSwapOp;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,7 +29,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.asm.amd64.*;
import com.oracle.graal.lir.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.BlockEndOp;
import com.oracle.graal.lir.asm.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java Fri Aug 15 11:34:38 2014 +0200
@@ -31,7 +31,7 @@
import com.oracle.graal.asm.amd64.*;
import com.oracle.graal.hotspot.stubs.*;
import com.oracle.graal.lir.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.BlockEndOp;
import com.oracle.graal.lir.amd64.*;
import com.oracle.graal.lir.asm.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,6 +28,7 @@
import com.oracle.graal.compiler.amd64.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,12 +27,12 @@
import java.lang.reflect.*;
import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.*;
import java.util.function.*;
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.compiler.common.GraalInternalError;
+import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.hsail.*;
import com.oracle.graal.compiler.target.*;
import com.oracle.graal.debug.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,12 +26,12 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.api.runtime.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.hotspot.hsail.replacements.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hsail.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.phases.tiers.*;
import com.oracle.graal.phases.util.*;
-import com.oracle.graal.hotspot.hsail.replacements.*;
@ServiceProvider(HotSpotBackendFactory.class)
public class HSAILHotSpotBackendFactory implements HotSpotBackendFactory {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,20 +22,20 @@
*/
package com.oracle.graal.hotspot.hsail;
+import java.util.*;
+
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.hotspot.hsail.replacements.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
-import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.java.*;
-import com.oracle.graal.hotspot.hsail.replacements.*;
-
-import java.util.HashMap;
+import com.oracle.graal.nodes.spi.*;
public class HSAILHotSpotLoweringProvider extends DefaultHotSpotLoweringProvider {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILDirectLoadAcquireNode.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILDirectLoadAcquireNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILDirectLoadAcquireNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.hotspot.hsail.replacements;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.hsail.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILDirectStoreReleaseNode.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILDirectStoreReleaseNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILDirectStoreReleaseNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.hotspot.hsail.replacements;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.hsail.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILHotSpotReplacementsUtil.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILHotSpotReplacementsUtil.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILHotSpotReplacementsUtil.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,11 +24,11 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
+import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.hotspot.replacements.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.replacements.Snippet.Fold;
import com.oracle.graal.word.*;
-import com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil;
-import com.oracle.graal.hotspot.meta.*;
//JaCoCo Exclude
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILWorkItemAbsIdNode.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILWorkItemAbsIdNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILWorkItemAbsIdNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.hsail.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Fri Aug 15 11:34:38 2014 +0200
@@ -52,7 +52,7 @@
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.phases.*;
import com.oracle.graal.java.*;
-import com.oracle.graal.java.GraphBuilderConfiguration.*;
+import com.oracle.graal.java.GraphBuilderConfiguration.DebugInfoMode;
import com.oracle.graal.lir.asm.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,8 +27,8 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayRangeWriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayRangeWriteBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayRangeWriteBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,10 +22,10 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetClassLoader0Node.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetClassLoader0Node.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetClassLoader0Node.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetComponentTypeNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetComponentTypeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetComponentTypeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetModifiersNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetModifiersNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetModifiersNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsArrayNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsArrayNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsArrayNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInstanceNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInstanceNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInstanceNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.java.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInterfaceNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInterfaceNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInterfaceNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsPrimitiveNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsPrimitiveNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsPrimitiveNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f 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 Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,12 +25,12 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.*;
import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.nodes.type.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,8 +28,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,9 +27,9 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizingStubCall.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizingStubCall.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizingStubCall.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,8 +28,8 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.java.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EnterUnpackFramesStackFrameNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EnterUnpackFramesStackFrameNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EnterUnpackFramesStackFrameNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePostWriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePostWriteBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePostWriteBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePreWriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePreWriteBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePreWriteBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PostWriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PostWriteBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PostWriteBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ReferentFieldReadBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ReferentFieldReadBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ReferentFieldReadBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,7 +27,7 @@
import com.oracle.graal.api.code.CallingConvention.Type;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,7 +27,7 @@
import com.oracle.graal.api.code.CallingConvention.Type;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveCurrentStackFrameNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveCurrentStackFrameNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveCurrentStackFrameNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,9 +23,9 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveDeoptimizedStackFrameNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveDeoptimizedStackFrameNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveDeoptimizedStackFrameNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
import com.oracle.graal.hotspot.stubs.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveUnpackFramesStackFrameNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveUnpackFramesStackFrameNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveUnpackFramesStackFrameNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,9 +23,9 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,10 +26,10 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.stubs.*;
import com.oracle.graal.lir.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,9 +27,9 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.stubs.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,8 +27,8 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PatchReturnAddressNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PatchReturnAddressNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PatchReturnAddressNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PrefetchAllocateNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PrefetchAllocateNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PrefetchAllocateNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PushInterpreterFrameNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PushInterpreterFrameNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PushInterpreterFrameNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.word.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SaveAllRegistersNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SaveAllRegistersNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SaveAllRegistersNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
-import com.oracle.graal.lir.StandardOp.*;
+import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialArrayRangeWriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialArrayRangeWriteBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialArrayRangeWriteBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialWriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialWriteBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialWriteBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetAnchorNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetAnchorNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetAnchorNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.hotspot.nodes;
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.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetLocationProxyNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetLocationProxyNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetLocationProxyNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
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.calc.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,6 +29,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.replacements.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubStartNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubStartNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubStartNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,8 +22,8 @@
*/
package com.oracle.graal.hotspot.nodes;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.stubs.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,10 +29,10 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
import com.oracle.graal.java.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,9 +27,9 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.*;
import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,7 +28,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.replacements.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.hotspot.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,7 +28,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.hotspot.HotSpotVMConfig.*;
+import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.nodes.*;
import com.oracle.graal.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,9 +26,9 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.graph.iterators.*;
import com.oracle.graal.loop.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyCallNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyCallNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,9 +30,9 @@
import com.oracle.graal.api.runtime.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.nodes.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ArrayCopyNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,8 +29,8 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.debug.*;
import com.oracle.graal.debug.Debug.Scope;
-import com.oracle.graal.graph.*;
import com.oracle.graal.loop.phases.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteTargetNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,6 +29,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CompositeValueClassSubstitutions.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CompositeValueClassSubstitutions.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CompositeValueClassSubstitutions.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,9 +26,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.api.replacements.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.lir.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotNodeClassSubstitutions.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotNodeClassSubstitutions.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotNodeClassSubstitutions.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,6 +28,7 @@
import com.oracle.graal.api.replacements.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MethodHandleNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MethodHandleNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MethodHandleNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -34,6 +34,7 @@
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.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.java.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -32,7 +32,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.debug.*;
import com.oracle.graal.debug.Debug.Scope;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectGetClassNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectGetClassNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectGetClassNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,6 +28,7 @@
import com.oracle.graal.api.meta.ResolvedJavaType.Representation;
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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionGetCallerClassNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionGetCallerClassNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionGetCallerClassNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,6 +29,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/SystemIdentityHashCodeNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/SystemIdentityHashCodeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/SystemIdentityHashCodeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,8 +25,8 @@
import static com.oracle.graal.compiler.common.GraalOptions.*;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeArrayCopyNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeArrayCopyNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeArrayCopyNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UncommonTrapStub.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UncommonTrapStub.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UncommonTrapStub.java Fri Aug 15 11:34:38 2014 +0200
@@ -35,7 +35,8 @@
import com.oracle.graal.hotspot.meta.*;
import com.oracle.graal.hotspot.nodes.*;
import com.oracle.graal.replacements.*;
-import com.oracle.graal.replacements.Snippet.*;
+import com.oracle.graal.replacements.Snippet.ConstantParameter;
+import com.oracle.graal.replacements.Snippet.Fold;
import com.oracle.graal.word.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/block/DecompilerBlock.java
--- a/graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/block/DecompilerBlock.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/block/DecompilerBlock.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,9 +25,9 @@
import java.io.*;
import java.util.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.java.decompiler.*;
import com.oracle.graal.java.decompiler.lines.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.cfg.*;
import com.oracle.graal.phases.schedule.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/lines/DecompilerAssignmentLine.java
--- a/graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/lines/DecompilerAssignmentLine.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/lines/DecompilerAssignmentLine.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.java.decompiler.lines;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.java.decompiler.block.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
public class DecompilerAssignmentLine extends DecompilerSyntaxLine {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/lines/DecompilerControlSplitLine.java
--- a/graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/lines/DecompilerControlSplitLine.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/lines/DecompilerControlSplitLine.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.java.decompiler.lines;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.java.decompiler.block.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.cfg.*;
public class DecompilerControlSplitLine extends DecompilerSyntaxLine {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import static com.oracle.graal.api.code.TypeCheckHints.*;
import static com.oracle.graal.bytecode.Bytecodes.*;
+
import java.util.*;
import com.oracle.graal.api.code.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -43,6 +43,7 @@
import com.oracle.graal.java.BciBlockMapping.BciBlock;
import com.oracle.graal.java.BciBlockMapping.ExceptionDispatchBlock;
import com.oracle.graal.java.BciBlockMapping.LocalLiveness;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.calc.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,13 +23,14 @@
package com.oracle.graal.java;
import static com.oracle.graal.graph.iterators.NodePredicates.*;
+
import java.util.*;
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.debug.*;
-import com.oracle.graal.graph.Node.Verbosity;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.java.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopTransformations.java
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopTransformations.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopTransformations.java Fri Aug 15 11:34:38 2014 +0200
@@ -31,6 +31,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.NodeClass.NodeClassIterator;
import com.oracle.graal.graph.NodeClass.Position;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.phases.common.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodeinfo/.checkstyle_checks.xml.disabled
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodeinfo/.checkstyle_checks.xml.disabled Fri Aug 15 11:34:38 2014 +0200
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodeinfo/src/META-INF/services/javax.annotation.processing.Processor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodeinfo/src/META-INF/services/javax.annotation.processing.Processor Fri Aug 15 11:34:38 2014 +0200
@@ -0,0 +1,1 @@
+com.oracle.graal.nodeinfo.processor.GraphNodeProcessor
\ No newline at end of file
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/GeneratedNode.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/GeneratedNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 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.nodeinfo;
+
+import java.lang.annotation.*;
+
+/**
+ * Denotes a Node class derived from a {@link NodeInfo} annotated Node type.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface GeneratedNode {
+
+ /**
+ * The Node class from which the annotated type was generated.
+ */
+ Class> value();
+}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/InputType.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/InputType.java Fri Aug 15 11:34:38 2014 +0200
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 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.nodeinfo;
+
+public enum InputType {
+ /**
+ * Inputs that consume an actual value generated by the referenced node.
+ */
+ Value,
+ /**
+ * Inputs that consume the memory state of the referenced node.
+ */
+ Memory,
+ /**
+ * Inputs that reference a condition.
+ */
+ Condition,
+ /**
+ * Inputs that reference a frame state.
+ */
+ State,
+ /**
+ * Inputs that reference a guard (guards, begin nodes).
+ */
+ Guard,
+ /**
+ * Inputs that reference an anchor (begin nodes, value anchors).
+ */
+ Anchor,
+ /**
+ * Inputs that represent an association between nodes, e.g., a phi and the merge or a loop begin
+ * and loop exits and ends.
+ */
+ Association,
+ /**
+ * Inputs that connect tightly coupled nodes, e.g., an InvokeNode and its CallTargetNode.
+ */
+ Extension,
+ /**
+ * Inputs of this type are temporarily exempt from type checking. This should only be used in
+ * exceptional cases and should never survive to later stages of compilation.
+ */
+ Unchecked
+}
\ No newline at end of file
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/NodeInfo.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/NodeInfo.java Fri Aug 15 11:34:38 2014 +0200
@@ -0,0 +1,40 @@
+/*
+ * 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.nodeinfo;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface NodeInfo {
+
+ String shortName() default "";
+
+ /**
+ * The template used to build the {@link Verbosity#Name} version. Variable part are specified
+ * using {i#inputName} or {p#propertyName}.
+ */
+ String nameTemplate() default "";
+
+ InputType[] allowedUsageTypes() default {};
+}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/Verbosity.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/Verbosity.java Fri Aug 15 11:34:38 2014 +0200
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 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.nodeinfo;
+
+public enum Verbosity {
+ /**
+ * Only the id of the node.
+ */
+ Id,
+ /**
+ * Only the name of the node, which may contain some more information for certain node types
+ * (constants, ...).
+ */
+ Name,
+ /**
+ * {@link #Id} + {@link #Name}.
+ */
+ Short,
+ /**
+ * Defaults to {@link #Short} and may be enhanced by subclasses.
+ */
+ Long,
+ /**
+ * For use by a custom formatting facility in an IDE.
+ */
+ Debugger,
+ /**
+ * All the other information plus all debug properties of the node.
+ */
+ All
+}
\ No newline at end of file
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/processor/GraphNodeGenerator.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/processor/GraphNodeGenerator.java Fri Aug 15 11:34:38 2014 +0200
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 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.nodeinfo.processor;
+
+import static com.oracle.truffle.dsl.processor.java.ElementUtils.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import javax.lang.model.util.*;
+
+import com.oracle.graal.nodeinfo.*;
+import com.oracle.truffle.dsl.processor.java.*;
+import com.oracle.truffle.dsl.processor.java.model.*;
+
+/**
+ * Generates the source code for a Node class.
+ */
+public class GraphNodeGenerator {
+
+ private final GraphNodeProcessor processor;
+
+ public GraphNodeGenerator(GraphNodeProcessor processor) {
+ this.processor = processor;
+ }
+
+ public ProcessingEnvironment getProcessingEnv() {
+ return processor.getProcessingEnv();
+ }
+
+ private String getGeneratedClassName(TypeElement node) {
+
+ TypeElement typeElement = node;
+
+ String newClassName = typeElement.getSimpleName().toString() + "Gen";
+ Element enclosing = typeElement.getEnclosingElement();
+ while (enclosing != null) {
+ if (enclosing.getKind() == ElementKind.CLASS || enclosing.getKind() == ElementKind.INTERFACE) {
+ if (enclosing.getModifiers().contains(Modifier.PRIVATE)) {
+ processor.errorMessage(enclosing, "%s %s cannot be private", enclosing.getKind().name().toLowerCase(), enclosing);
+ return null;
+ }
+ newClassName = enclosing.getSimpleName() + "$" + newClassName;
+ } else {
+ assert enclosing.getKind() == ElementKind.PACKAGE;
+ }
+ enclosing = enclosing.getEnclosingElement();
+ }
+ return newClassName;
+ }
+
+ public CodeCompilationUnit process(TypeElement node) {
+ CodeCompilationUnit compilationUnit = new CodeCompilationUnit();
+
+ PackageElement packageElement = ElementUtils.findPackageElement(node);
+
+ String newClassName = getGeneratedClassName(node);
+
+ CodeTypeElement nodeGenElement = new CodeTypeElement(modifiers(), ElementKind.CLASS, packageElement, newClassName);
+
+ if (node.getModifiers().contains(Modifier.ABSTRACT)) {
+ // we do not support implementation of abstract methods yet.
+ nodeGenElement.getModifiers().add(Modifier.ABSTRACT);
+ }
+
+ nodeGenElement.setSuperClass(node.asType());
+
+ for (ExecutableElement constructor : ElementFilter.constructorsIn(node.getEnclosedElements())) {
+ if (constructor.getModifiers().contains(Modifier.PRIVATE)) {
+ // ignore private constructors
+ continue;
+ }
+ nodeGenElement.add(createSuperConstructor(nodeGenElement, constructor));
+ }
+
+ DeclaredType generatedNode = (DeclaredType) ElementUtils.getType(getProcessingEnv(), GeneratedNode.class);
+ CodeAnnotationMirror generatedByMirror = new CodeAnnotationMirror(generatedNode);
+ generatedByMirror.setElementValue(generatedByMirror.findExecutableElement("value"), new CodeAnnotationValue(node.asType()));
+ nodeGenElement.getAnnotationMirrors().add(generatedByMirror);
+
+ nodeGenElement.add(createDummyExampleMethod());
+
+ compilationUnit.add(nodeGenElement);
+ return compilationUnit;
+ }
+
+ private CodeExecutableElement createSuperConstructor(TypeElement type, ExecutableElement element) {
+ CodeExecutableElement executable = CodeExecutableElement.clone(getProcessingEnv(), element);
+
+ // to create a constructor we have to set the return type to null.(TODO needs fix)
+ executable.setReturnType(null);
+ // we have to set the name manually otherwise is inferred (TODO needs fix)
+ executable.setSimpleName(CodeNames.of(type.getSimpleName().toString()));
+
+ CodeTreeBuilder b = executable.createBuilder();
+ b.startStatement().startSuperCall();
+ for (VariableElement v : element.getParameters()) {
+ b.string(v.getSimpleName().toString());
+ }
+ b.end().end();
+
+ return executable;
+ }
+
+ public ExecutableElement createDummyExampleMethod() {
+ CodeExecutableElement method = new CodeExecutableElement(modifiers(Modifier.PROTECTED), ElementUtils.getType(getProcessingEnv(), int.class), "computeTheMeaningOfLife");
+
+ CodeTreeBuilder builder = method.createBuilder();
+ builder.string("// this method got partially evaluated").newLine();
+ builder.startReturn().string("42").end();
+
+ return method;
+ }
+
+}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/processor/GraphNodeProcessor.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/processor/GraphNodeProcessor.java Fri Aug 15 11:34:38 2014 +0200
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 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.nodeinfo.processor;
+
+import java.io.*;
+import java.util.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import javax.lang.model.util.*;
+import javax.tools.Diagnostic.Kind;
+
+import com.oracle.graal.nodeinfo.*;
+import com.oracle.truffle.dsl.processor.*;
+import com.oracle.truffle.dsl.processor.java.*;
+import com.oracle.truffle.dsl.processor.java.model.*;
+import com.oracle.truffle.dsl.processor.java.transform.*;
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes({"com.oracle.graal.nodeinfo.NodeInfo"})
+public class GraphNodeProcessor extends AbstractProcessor {
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+
+ void errorMessage(Element element, String format, Object... args) {
+ processingEnv.getMessager().printMessage(Kind.ERROR, String.format(format, args), element);
+ }
+
+ /**
+ * Bugs in an annotation processor can cause silent failure so try to report any exception
+ * throws as errors.
+ */
+ private void reportException(Element element, Throwable t) {
+ StringWriter buf = new StringWriter();
+ t.printStackTrace(new PrintWriter(buf));
+ buf.toString();
+ errorMessage(element, "Exception thrown during processing: %s", buf.toString());
+ }
+
+ ProcessingEnvironment getProcessingEnv() {
+ return processingEnv;
+ }
+
+ boolean isNodeType(Element element) {
+ if (element.getKind() != ElementKind.CLASS) {
+ return false;
+ }
+ TypeElement type = (TypeElement) element;
+ Types types = processingEnv.getTypeUtils();
+
+ while (type != null) {
+ if (type.toString().equals("com.oracle.graal.graph.Node")) {
+ return true;
+ }
+ type = (TypeElement) types.asElement(type.getSuperclass());
+ }
+ return false;
+ }
+
+ @Override
+ public boolean process(Set extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ if (roundEnv.processingOver()) {
+ return false;
+ }
+
+ GraphNodeGenerator gen = new GraphNodeGenerator(this);
+
+ for (Element element : roundEnv.getElementsAnnotatedWith(NodeInfo.class)) {
+ try {
+ if (!isNodeType(element)) {
+ errorMessage(element, "%s can only be applied to Node subclasses", NodeInfo.class.getSimpleName());
+ continue;
+ }
+
+ NodeInfo nodeInfo = element.getAnnotation(NodeInfo.class);
+ if (nodeInfo == null) {
+ errorMessage(element, "Cannot get %s annotation from annotated element", NodeInfo.class.getSimpleName());
+ continue;
+ }
+
+ TypeElement typeElement = (TypeElement) element;
+
+ if (typeElement.getModifiers().contains(Modifier.FINAL)) {
+ errorMessage(element, "%s annotated class cannot be final", NodeInfo.class.getSimpleName());
+ continue;
+ }
+
+ CodeCompilationUnit unit = gen.process(typeElement);
+ unit.setGeneratorElement(typeElement);
+
+ DeclaredType overrideType = (DeclaredType) ElementUtils.getType(processingEnv, Override.class);
+ DeclaredType unusedType = (DeclaredType) ElementUtils.getType(processingEnv, SuppressWarnings.class);
+ unit.accept(new GenerateOverrideVisitor(overrideType), null);
+ unit.accept(new FixWarningsVisitor(processingEnv, unusedType, overrideType), null);
+ unit.accept(new CodeWriter(processingEnv, typeElement), null);
+ } catch (Throwable t) {
+ if (!isBug367599(t)) {
+ reportException(element, t);
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Determines if a given exception is (most likely) caused by Bug 367599.
+ */
+ public static boolean isBug367599(Throwable t) {
+ for (StackTraceElement ste : t.getStackTrace()) {
+ if (ste.toString().contains("org.eclipse.jdt.internal.apt.pluggable.core.filer.IdeFilerImpl.create")) {
+ // See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=367599
+ return true;
+ }
+ }
+ if (t.getCause() != null) {
+ return isBug367599(t.getCause());
+ }
+ return false;
+ }
+}
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
/**
* This node represents an unconditional explicit request for immediate deoptimization.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.extended.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractLocalNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractLocalNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractLocalNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractMemoryCheckpoint.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractMemoryCheckpoint.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractMemoryCheckpoint.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractStateSplit.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractStateSplit.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractStateSplit.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
/**
* Provides an implementation of {@link StateSplit}.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,6 +30,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginStateSplitNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginStateSplitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginStateSplitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
/**
* Base class for {@link BeginNode}s that are associated with a frame state.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BinaryOpLogicNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BinaryOpLogicNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BinaryOpLogicNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,8 +22,8 @@
*/
package com.oracle.graal.nodes;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,6 +27,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo(allowedUsageTypes = {InputType.Extension})
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
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.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,6 +30,7 @@
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public abstract class ControlSinkNode extends FixedNode {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSplitNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSplitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSplitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
/**
* The {@code ControlSplitNode} is a base class for all instructions that split the control flow
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo(shortName = "Deopt", nameTemplate = "Deopt {p#reason/s}")
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingFixedWithNextNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingFixedWithNextNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingFixedWithNextNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public abstract class DeoptimizingFixedWithNextNode extends FixedWithNextNode implements DeoptimizingNode.DeoptBefore {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DirectCallTargetNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DirectCallTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DirectCallTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,7 +27,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public class DirectCallTargetNode extends LoweredCallTargetNode {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DispatchBeginNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DispatchBeginNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DispatchBeginNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
/**
* The entry node of an exception dispatcher block.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EndNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EndNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EndNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.nodes;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo(allowedUsageTypes = {InputType.Association})
public class EndNode extends AbstractEndNode {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public abstract class FixedNode extends ValueNode {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedWithNextNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedWithNextNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedWithNextNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
/**
* Base class of all nodes that are fixed within the control flow graph and have an immediate
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingAnchoredNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingAnchoredNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingAnchoredNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingGuardedNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingGuardedNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingGuardedNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,6 +29,7 @@
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.virtual.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FullInfopointNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FullInfopointNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FullInfopointNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.api.code.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.extended.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardPhiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardPhiNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardPhiNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardProxyNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardProxyNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardProxyNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.calc.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -34,6 +34,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,7 +27,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public class IndirectCallTargetNode extends LoweredCallTargetNode {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public abstract class InfopointNode extends FixedWithNextNode {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.nodes.CallTargetNode.*;
+import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,6 +27,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
@NodeInfo(allowedUsageTypes = {InputType.Memory})
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNegationNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNegationNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNegationNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,8 +22,8 @@
*/
package com.oracle.graal.nodes;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
/**
* Logic node that negates its argument.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,10 +22,10 @@
*/
package com.oracle.graal.nodes;
-import static com.oracle.graal.graph.InputType.*;
+import static com.oracle.graal.nodeinfo.InputType.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
@NodeInfo(allowedUsageTypes = {Condition})
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,6 +29,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import java.util.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopExitNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopExitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopExitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo(allowedUsageTypes = {InputType.Association})
public class LoopExitNode extends BeginStateSplitNode implements IterableNodeType {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoweredCallTargetNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoweredCallTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoweredCallTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,7 +27,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public abstract class LoweredCallTargetNode extends CallTargetNode {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryMapNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryMapNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryMapNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,6 +29,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,6 +30,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ParameterNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ParameterNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ParameterNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
/**
* The {@code Parameter} instruction is a placeholder for an incoming argument to a function call.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,6 +27,7 @@
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.calc.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiArrayNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiArrayNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
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.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,6 +28,7 @@
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.extended.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ProxyNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ProxyNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ProxyNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.Node.ValueNumberable;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ScheduledNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ScheduledNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ScheduledNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public abstract class ScheduledNode extends Node {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ShortCircuitOrNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ShortCircuitOrNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ShortCircuitOrNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
@NodeInfo
public class ShortCircuitOrNode extends LogicNode implements IterableNodeType, Canonicalizable.Binary {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimpleInfopointNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimpleInfopointNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimpleInfopointNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeProfileProxyNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeProfileProxyNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeProfileProxyNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,6 +28,7 @@
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnaryOpLogicNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnaryOpLogicNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnaryOpLogicNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,8 +22,8 @@
*/
package com.oracle.graal.nodes;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f 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 Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
+import com.oracle.graal.nodeinfo.*;
/**
* This class represents a value within the graph, including local variables, phis, and all other
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.extended.*;
public class ValueNodeUtil {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.type.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueProxyNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueProxyNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueProxyNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/VirtualState.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/VirtualState.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/VirtualState.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.nodes;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
/**
* Base class for nodes that contain "virtual" state, like FrameState and VirtualObjectState.
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BitLogicNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BitLogicNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BitLogicNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.calc;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,8 +25,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.calc.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/* TODO (thomaswue/gdub) For high-level optimization purpose the compare node should be a boolean *value* (it is currently only a helper node)
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,8 +27,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.calc.*;
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.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.calc.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FixedBinaryNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FixedBinaryNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FixedBinaryNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.nodes.calc;
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.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatArithmeticNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatArithmeticNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatArithmeticNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.calc;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,9 +26,9 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.calc.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatEqualsNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatEqualsNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatEqualsNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,8 +25,8 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.calc.*;
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.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,8 +25,8 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.calc.*;
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.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,9 +23,9 @@
package com.oracle.graal.nodes.calc;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatingNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatingNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatingNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerAddNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerAddNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerAddNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerArithmeticNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerArithmeticNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerArithmeticNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.calc;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.compiler.common.calc.*;
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.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerConvertNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerConvertNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerConvertNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.calc;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,8 +26,8 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.calc.*;
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.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,8 +26,8 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.calc.*;
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.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerMulNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerMulNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerMulNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,9 +25,9 @@
import com.oracle.graal.api.code.*;
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.code.*;
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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerSubNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerSubNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerSubNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.nodes.calc;
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.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,9 +23,9 @@
package com.oracle.graal.nodes.calc;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.calc.*;
-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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,9 +25,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.calc;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnaryNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnaryNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnaryNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.nodes.calc;
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.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.code.*;
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.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.api.code.*;
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.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,9 +23,9 @@
package com.oracle.graal.nodes.calc;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
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.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,9 +25,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.calc.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/DynamicCounterNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/DynamicCounterNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/DynamicCounterNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.debug;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/WeakCounterNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/WeakCounterNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/WeakCounterNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,8 +22,8 @@
*/
package com.oracle.graal.nodes.debug;
-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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AbstractWriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AbstractWriteNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AbstractWriteNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo(allowedUsageTypes = {InputType.Memory})
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,6 +27,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ArrayRangeWriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ArrayRangeWriteNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ArrayRangeWriteNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.extended;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,8 +26,8 @@
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.calc.*;
import com.oracle.graal.nodes.java.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.calc.*;
-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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BytecodeExceptionNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BytecodeExceptionNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BytecodeExceptionNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.spi.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedAccessNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedAccessNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedAccessNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.extended;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.extended;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatableAccessNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatableAccessNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatableAccessNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,6 +28,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,6 +28,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,8 +26,8 @@
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.spi.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.extended;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaWriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaWriteNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaWriteNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.nodes.extended;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,8 +25,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.api.meta.ResolvedJavaType.Representation;
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.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,9 +24,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.Node.ValueNumberable;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -32,7 +32,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.extended;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRLocalNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRLocalNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRLocalNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo(nameTemplate = "OSRLocal({p#index})")
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRStartNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRStartNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRStartNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,8 +22,8 @@
*/
package com.oracle.graal.nodes.extended;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/StoreHubNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/StoreHubNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/StoreHubNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.extended;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,6 +28,7 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.nodes.extended;
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.nodes.extended;
import com.oracle.graal.api.meta.*;
-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.extended.LocationNode.Location;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewArrayNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewArrayNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.nodes.java;
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.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewObjectNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewObjectNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,6 +27,7 @@
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.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessArrayNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessArrayNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.java;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.spi.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndAddNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndAddNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndAddNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,16 +23,15 @@
package com.oracle.graal.nodes.java;
import static com.oracle.graal.compiler.common.UnsafeAccess.*;
+import sun.misc.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
-import sun.misc.*;
-
/**
* Represents an atomic read-and-add operation like {@link Unsafe#getAndAddInt(Object, long, int)}.
*/
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndWriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndWriteNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndWriteNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,16 +23,15 @@
package com.oracle.graal.nodes.java;
import static com.oracle.graal.compiler.common.UnsafeAccess.*;
+import sun.misc.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
-import sun.misc.*;
-
/**
* Represents an atomic read-and-write operation like {@link Unsafe#getAndSetInt(Object, long, int)}
* .
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.nodes.java;
import com.oracle.graal.api.meta.*;
-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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -31,6 +31,7 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,6 +30,7 @@
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.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.nodes.java;
import com.oracle.graal.api.meta.*;
-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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadExceptionObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadExceptionObjectNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadExceptionObjectNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.java;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,8 +26,8 @@
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.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,14 +22,14 @@
*/
package com.oracle.graal.nodes.java;
+import sun.misc.*;
+
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
-import sun.misc.*;
-
/**
* Represents the lowered version of an atomic read-and-write operation like
* {@link Unsafe#getAndSetInt(Object, long, int)} .
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorEnterNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorEnterNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorEnterNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorExitNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorExitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorExitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.api.meta.*;
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.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,7 +27,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.virtual.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,8 +26,8 @@
import com.oracle.graal.api.code.*;
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.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/SelfReplacingMethodCallTargetNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/SelfReplacingMethodCallTargetNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/SelfReplacingMethodCallTargetNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.virtual.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.type.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,8 +27,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.api.meta.ResolvedJavaType.Representation;
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.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/AllocatedObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/AllocatedObjectNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/AllocatedObjectNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.virtual;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/CommitAllocationNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/CommitAllocationNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/CommitAllocationNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,6 +27,7 @@
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.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,8 +22,8 @@
*/
package com.oracle.graal.nodes.virtual;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.Node.ValueNumberable;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,7 +25,7 @@
import sun.misc.*;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualBoxingNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualBoxingNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualBoxingNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.virtual;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.nodes.virtual;
import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo(nameTemplate = "VirtualInstance {p#type/s}")
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -29,6 +29,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.Graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -32,6 +32,7 @@
import com.oracle.graal.graph.Graph.Mark;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.iterators.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.cfg.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/TailDuplicationPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/TailDuplicationPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/TailDuplicationPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -35,6 +35,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.NodeClass.NodeClassIterator;
import com.oracle.graal.graph.NodeClass.Position;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.VirtualState.NodeClosure;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,6 +27,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.StructuredGraph.GuardsStage;
import com.oracle.graal.nodes.calc.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java Fri Aug 15 11:34:38 2014 +0200
@@ -46,8 +46,8 @@
* Such evaluator comes handy when visiting a {@link com.oracle.graal.nodes.FixedNode} N, just
* before updating the state for N. At the pre-state, an {@link EquationalReasoner} can be used to
* reduce N's inputs (actually only those inputs of Value and Condition
- * {@link com.oracle.graal.graph.InputType InputType}). For an explanation of where it's warranted
- * to replace "old input" with "reduced input", see the inline comments in method
+ * {@link com.oracle.graal.nodeinfo.InputType InputType}). For an explanation of where it's
+ * warranted to replace "old input" with "reduced input", see the inline comments in method
* {@link EquationalReasoner#deverbosify(com.oracle.graal.graph.Node n) deverbosify(Node n)}
*
*
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowUtil.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowUtil.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowUtil.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,9 +23,9 @@
package com.oracle.graal.phases.common.cfs;
import com.oracle.graal.api.meta.ResolvedJavaType;
-import com.oracle.graal.graph.InputType;
import com.oracle.graal.graph.Node;
import com.oracle.graal.graph.NodeClass;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.compiler.common.type.ObjectStamp;
import com.oracle.graal.compiler.common.type.Stamp;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/GuardingPiReduction.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/GuardingPiReduction.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/GuardingPiReduction.java Fri Aug 15 11:34:38 2014 +0200
@@ -182,8 +182,8 @@
* Provided a condition as above can be reduced to a constant (and an anchor obtained in the
* process), this method replaces all usages of the
* {@link com.oracle.graal.nodes.GuardingPiNode} (necessarily of
- * {@link com.oracle.graal.graph.InputType#Value}) with a {@link com.oracle.graal.nodes.PiNode}
- * that wraps the payload and the anchor in question.
+ * {@link com.oracle.graal.nodeinfo.InputType#Value}) with a
+ * {@link com.oracle.graal.nodes.PiNode} that wraps the payload and the anchor in question.
*
*
*
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Fri Aug 15 11:34:38 2014 +0200
@@ -37,7 +37,7 @@
import com.oracle.graal.debug.Debug.Scope;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.Graph.DuplicationReplacement;
-import com.oracle.graal.graph.Node.Verbosity;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.calc.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -33,7 +33,7 @@
import com.oracle.graal.compiler.common.cfg.*;
import com.oracle.graal.debug.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.cfg.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Fri Aug 15 11:34:38 2014 +0200
@@ -34,12 +34,12 @@
import com.oracle.graal.compiler.common.cfg.*;
import com.oracle.graal.compiler.gen.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.graph.NodeClass.NodeClassIterator;
import com.oracle.graal.graph.NodeClass.Position;
import com.oracle.graal.java.*;
import com.oracle.graal.java.BciBlockMapping.BciBlock;
import com.oracle.graal.lir.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.cfg.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,10 +30,10 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Node.Verbosity;
import com.oracle.graal.graph.NodeClass.NodeClassIterator;
import com.oracle.graal.graph.NodeClass.Position;
import com.oracle.graal.java.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.cfg.*;
import com.oracle.graal.phases.schedule.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,9 +26,9 @@
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.calc.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathIntrinsicsNode.java
--- a/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathIntrinsicsNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathIntrinsicsNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,6 +30,7 @@
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
import com.oracle.graal.lir.hsail.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/JStrictMath.java
--- a/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/JStrictMath.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/JStrictMath.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,13 +23,12 @@
package com.oracle.graal.replacements.hsail;
-import java.util.Random;
+import java.util.*;
+
+import sun.misc.*;
import com.oracle.graal.api.replacements.*;
-import sun.misc.FpUtils;
-import sun.misc.DoubleConsts;
-
/**
* This class contains methods for performing basic numeric operations such as the elementary
* exponential, logarithm, square root, and trigonometric functions. It is a Java port of the native
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Fri Aug 15 11:34:38 2014 +0200
@@ -41,8 +41,8 @@
import com.oracle.graal.debug.*;
import com.oracle.graal.debug.Debug.Scope;
import com.oracle.graal.debug.internal.*;
+import com.oracle.graal.graph.Graph.Mark;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Graph.Mark;
import com.oracle.graal.java.*;
import com.oracle.graal.java.GraphBuilderPhase.Instance;
import com.oracle.graal.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Snippet.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Snippet.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Snippet.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.replacements;
import java.lang.annotation.*;
+
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.Node.NodeIntrinsic;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Fri Aug 15 11:34:38 2014 +0200
@@ -45,8 +45,9 @@
import com.oracle.graal.debug.Debug.Scope;
import com.oracle.graal.debug.internal.*;
import com.oracle.graal.graph.Graph.Mark;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.graph.Node;
import com.oracle.graal.loop.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.StructuredGraph.GuardsStage;
import com.oracle.graal.nodes.calc.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/AssertionNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/AssertionNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/AssertionNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.HeapAccess.BarrierType;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ExplodeLoopNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ExplodeLoopNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ExplodeLoopNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.compiler.common.type.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.Snippet.VarargsParameter;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/LoadSnippetVarargParameterNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/LoadSnippetVarargParameterNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
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.replacements.Snippet.VarargsParameter;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -30,8 +30,9 @@
import com.oracle.graal.debug.*;
import com.oracle.graal.debug.Debug.Scope;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
+import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.StructuredGraph.GuardsStage;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,7 +25,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.java.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MathIntrinsicNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MathIntrinsicNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MathIntrinsicNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,9 +25,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MemoryAnchorNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MemoryAnchorNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MemoryAnchorNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
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.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/PureFunctionMacroNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/PureFunctionMacroNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/PureFunctionMacroNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
/**
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,7 +25,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,7 +25,7 @@
import com.oracle.graal.api.code.*;
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategyNew.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategyNew.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategyNew.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,7 +26,7 @@
import com.oracle.truffle.api.*;
import com.oracle.truffle.api.nodes.*;
-import com.oracle.truffle.api.nodes.NodeUtil.*;
+import com.oracle.truffle.api.nodes.NodeUtil.NodeCountFilter;
public class DefaultTruffleSplittingStrategyNew implements TruffleSplittingStrategy {
private static int splitChangeCount;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/MaterializedFrameNotify.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/MaterializedFrameNotify.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/MaterializedFrameNotify.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.truffle;
-import com.oracle.truffle.api.frame.FrameInstance.*;
+import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
public interface MaterializedFrameNotify {
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Fri Aug 15 11:34:38 2014 +0200
@@ -38,8 +38,8 @@
import com.oracle.graal.graph.Node;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.loop.*;
+import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java Fri Aug 15 11:34:38 2014 +0200
@@ -37,8 +37,8 @@
import com.oracle.graal.graph.Node;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.java.*;
+import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.type.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/AssumptionNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/AssumptionNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/AssumptionNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,8 +26,8 @@
import com.oracle.graal.api.replacements.*;
import com.oracle.graal.api.runtime.*;
import com.oracle.graal.compiler.common.*;
-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.spi.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/BailoutNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/BailoutNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/BailoutNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.code.*;
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.spi.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/LoadIndexedFinalNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/LoadIndexedFinalNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/LoadIndexedFinalNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactSplitNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactSplitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactSplitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactSplitNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactSplitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactSplitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulHighNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulHighNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulHighNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,9 +27,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,8 +24,8 @@
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.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactSplitNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactSplitNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactSplitNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,7 +24,7 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/UnsignedMulHighNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/UnsignedMulHighNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/UnsignedMulHighNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,9 +27,9 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.*;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.calc.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/CompilationConstantNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/CompilationConstantNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/CompilationConstantNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -24,6 +24,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
@NodeInfo
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/NeverInlineMacroNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/NeverInlineMacroNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/NeverInlineMacroNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -22,7 +22,7 @@
*/
package com.oracle.graal.truffle.nodes.asserts;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.truffle.nodes.asserts;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.replacements.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,7 +23,7 @@
package com.oracle.graal.truffle.nodes.frame;
import com.oracle.graal.compiler.common.type.*;
-import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/MaterializeFrameNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/MaterializeFrameNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/MaterializeFrameNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.truffle.nodes.frame;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.truffle.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -31,6 +31,7 @@
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.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -27,6 +27,7 @@
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.calc.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadMacroNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadMacroNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadMacroNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
import com.oracle.graal.compiler.common.calc.*;
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.calc.*;
import com.oracle.graal.nodes.extended.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeStoreMacroNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeStoreMacroNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeStoreMacroNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import com.oracle.graal.api.meta.*;
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.extended.*;
import com.oracle.graal.truffle.nodes.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/UnsafeTypeCastMacroNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/UnsafeTypeCastMacroNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/UnsafeTypeCastMacroNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,8 +25,8 @@
import com.oracle.graal.api.meta.*;
import com.oracle.graal.compiler.common.calc.*;
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.calc.*;
import com.oracle.graal.nodes.util.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/phases/ReplaceIntrinsicsPhase.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/phases/ReplaceIntrinsicsPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/phases/ReplaceIntrinsicsPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,8 +23,8 @@
package com.oracle.graal.truffle.phases;
import com.oracle.graal.debug.*;
+import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
import com.oracle.graal.nodes.java.*;
import com.oracle.graal.nodes.spi.*;
import com.oracle.graal.phases.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java Fri Aug 15 11:34:38 2014 +0200
@@ -23,6 +23,7 @@
package com.oracle.graal.virtual.nodes;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.virtual.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java Fri Aug 15 11:34:38 2014 +0200
@@ -25,6 +25,7 @@
import java.util.*;
import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.virtual.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java Fri Aug 15 11:34:38 2014 +0200
@@ -28,8 +28,8 @@
import com.oracle.graal.debug.*;
import com.oracle.graal.debug.Debug.Scope;
+import com.oracle.graal.graph.Graph.NodeEventScope;
import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.Graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.cfg.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/SnippetLocationNode.java
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/SnippetLocationNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/SnippetLocationNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -31,6 +31,7 @@
import com.oracle.graal.graph.*;
import com.oracle.graal.graph.spi.*;
import com.oracle.graal.lir.gen.*;
+import com.oracle.graal.nodeinfo.*;
import com.oracle.graal.nodes.*;
import com.oracle.graal.nodes.extended.*;
import com.oracle.graal.nodes.spi.*;
diff -r 71f3c23158c9 -r cbd42807a31f graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Fri Aug 15 11:28:46 2014 +0200
+++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Fri Aug 15 11:34:38 2014 +0200
@@ -26,6 +26,7 @@
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.spi.*;
import com.oracle.graal.word.phases.*;
diff -r 71f3c23158c9 -r cbd42807a31f mx/projects
--- a/mx/projects Fri Aug 15 11:28:46 2014 +0200
+++ b/mx/projects Fri Aug 15 11:34:38 2014 +0200
@@ -341,21 +341,21 @@
project@com.oracle.graal.options.test@javaCompliance=1.8
project@com.oracle.graal.options.test@workingSets=Graal
+# graal.nodeinfo
+project@com.oracle.graal.nodeinfo@subDir=graal
+project@com.oracle.graal.nodeinfo@sourceDirs=src
+project@com.oracle.graal.nodeinfo@dependencies=com.oracle.truffle.dsl.processor
+project@com.oracle.graal.nodeinfo@javaCompliance=1.8
+project@com.oracle.graal.nodeinfo@workingSets=Graal,Graph
+
# graal.graph
project@com.oracle.graal.graph@subDir=graal
project@com.oracle.graal.graph@sourceDirs=src
-project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug,com.oracle.graal.compiler.common,com.oracle.graal.api.collections,com.oracle.graal.api.runtime,FINDBUGS
+project@com.oracle.graal.graph@dependencies=com.oracle.graal.nodeinfo,com.oracle.graal.debug,com.oracle.graal.compiler.common,com.oracle.graal.api.collections,com.oracle.graal.api.runtime,FINDBUGS
project@com.oracle.graal.graph@javaCompliance=1.8
+project@com.oracle.graal.graph@annotationProcessors=com.oracle.graal.nodeinfo
project@com.oracle.graal.graph@workingSets=Graal,Graph
-# graal.graph
-project@com.oracle.graal.graph.processor@subDir=graal
-project@com.oracle.graal.graph.processor@sourceDirs=src
-project@com.oracle.graal.graph.processor@dependencies=com.oracle.graal.graph,com.oracle.truffle.dsl.processor
-project@com.oracle.graal.graph.processor@javaCompliance=1.8
-project@com.oracle.graal.graph.processor@checkstyle=com.oracle.graal.graph
-project@com.oracle.graal.graph.processor@workingSets=Graal,Graph
-
# graal.graph.test
project@com.oracle.graal.graph.test@subDir=graal
project@com.oracle.graal.graph.test@sourceDirs=src
@@ -483,7 +483,7 @@
project@com.oracle.graal.nodes@dependencies=com.oracle.graal.graph,com.oracle.graal.api.replacements,com.oracle.graal.lir
project@com.oracle.graal.nodes@checkstyle=com.oracle.graal.graph
project@com.oracle.graal.nodes@javaCompliance=1.8
-project@com.oracle.graal.nodes@annotationProcessors=com.oracle.graal.replacements.verifier,com.oracle.graal.graph.processor
+project@com.oracle.graal.nodes@annotationProcessors=com.oracle.graal.replacements.verifier
project@com.oracle.graal.nodes@workingSets=Graal,Graph
# graal.nodes.test