# HG changeset patch # User Gilles Duboscq # Date 1335441573 -7200 # Node ID 654318af685db692801bd6695bdbd923b97e8450 # Parent 527ff42e0b26de5ae357834957dddc533b916ec9# Parent 31110c447ad2991b4048f0f8fdc520688c3b9798 Merge diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Apr 26 13:59:33 2012 +0200 @@ -29,7 +29,6 @@ import com.oracle.graal.alloc.simple.*; import com.oracle.graal.compiler.alloc.*; import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.graph.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; import com.oracle.graal.compiler.schedule.*; diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/graph/GraphCache.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/graph/GraphCache.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/graph/GraphCache.java Thu Apr 26 13:59:33 2012 +0200 @@ -138,7 +138,6 @@ } } - @Override public void clear() { graphs.clear(); currentGraphIds.clear(); @@ -150,7 +149,6 @@ putCounter.set(0); } - @Override public void removeGraphs(long[] deoptedGraphs) { for (long graphId : deoptedGraphs) { graphs.remove(graphId); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Thu Apr 26 13:59:33 2012 +0200 @@ -26,10 +26,7 @@ import java.util.*; import java.util.concurrent.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.graph.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; import com.oracle.graal.compiler.util.*; import com.oracle.graal.compiler.util.InliningUtil.InlineInfo; @@ -39,6 +36,8 @@ import com.oracle.graal.debug.internal.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; +import com.oracle.max.cri.ci.*; +import com.oracle.max.cri.ri.*; public class InliningPhase extends Phase implements InliningCallback { diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java --- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java Thu Apr 26 13:59:33 2012 +0200 @@ -23,6 +23,8 @@ package com.oracle.graal.debug; import com.oracle.graal.debug.internal.*; + +import java.io.*; import java.util.*; import java.util.concurrent.*; @@ -32,7 +34,6 @@ public static void enable() { ENABLED = true; - DebugScope.initialize(); } public static boolean isEnabled() { @@ -188,7 +189,7 @@ } } - public static DebugConfig fixedConfig(final boolean isLogEnabled, final boolean isDumpEnabled, final boolean isMeterEnabled, final boolean isTimerEnabled, final Collection dumpHandlers) { + public static DebugConfig fixedConfig(final boolean isLogEnabled, final boolean isDumpEnabled, final boolean isMeterEnabled, final boolean isTimerEnabled, final Collection dumpHandlers, final PrintStream output) { return new DebugConfig() { @Override @@ -220,6 +221,11 @@ public Collection< ? extends DebugDumpHandler> dumpHandlers() { return dumpHandlers; } + + @Override + public PrintStream output() { + return output; + } }; } diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugConfig.java --- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugConfig.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugConfig.java Thu Apr 26 13:59:33 2012 +0200 @@ -22,6 +22,7 @@ */ package com.oracle.graal.debug; +import java.io.*; import java.util.*; @@ -49,4 +50,6 @@ RuntimeException interceptException(Throwable e); Collection dumpHandlers(); + + PrintStream output(); } diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java --- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java Thu Apr 26 13:59:33 2012 +0200 @@ -33,6 +33,7 @@ private static ThreadLocal instanceTL = new ThreadLocal<>(); private static ThreadLocal configTL = new ThreadLocal<>(); private static ThreadLocal lastExceptionThrownTL = new ThreadLocal<>(); + private static ThreadLocal lastLogScope = new ThreadLocal<>(); private static DebugTimer scopeTime = Debug.timer("ScopeTime"); private final DebugScope parent; @@ -49,6 +50,8 @@ private boolean timeEnabled; private boolean dumpEnabled; + private PrintStream output; + public static DebugScope getInstance() { DebugScope result = instanceTL.get(); if (result == null) { @@ -103,7 +106,11 @@ public void log(String msg, Object... args) { if (isLogEnabled()) { - cachedOut.println(String.format(msg, args)); + if (lastLogScope.get() != this) { + output.println("scope: " + qualifiedName + " " + this); + lastLogScope.set(this); + } + output.println(String.format(msg, args)); } } @@ -173,11 +180,13 @@ meterEnabled = false; timeEnabled = false; dumpEnabled = false; + output = null; } else { logEnabled = config.isLogEnabled(); meterEnabled = config.isMeterEnabled(); timeEnabled = config.isTimeEnabled(); dumpEnabled = config.isDumpEnabled(); + output = config.output(); } } @@ -281,10 +290,4 @@ public String getQualifiedName() { return qualifiedName; } - - public static PrintStream cachedOut; - - public static void initialize() { - cachedOut = System.out; - } } diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Thu Apr 26 13:59:33 2012 +0200 @@ -63,10 +63,6 @@ @Target(ElementType.FIELD) public static @interface Successor {} - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - public static @interface Data {} - /** * Denotes that a parameter of an {@linkplain NodeIntrinsic intrinsic} method * must be a compile time constant at all call sites to the intrinic method. diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Thu Apr 26 13:59:33 2012 +0200 @@ -27,8 +27,6 @@ import java.util.Map.*; import java.util.concurrent.ConcurrentHashMap; -import com.oracle.graal.graph.Node.Data; - import sun.misc.Unsafe; public class NodeClass { @@ -273,15 +271,13 @@ successorTypesMap.put(offset, type); } successorNamesMap.put(offset, name); - } else if (field.isAnnotationPresent(Node.Data.class)) { - assert !Node.class.isAssignableFrom(field.getType()) : "cannot have a node as data: " + currentClazz; - dataOffsets.add(offset); - dataTypes.add(type); - dataNames.add(name); } else { assert !NODE_CLASS.isAssignableFrom(type) || name.equals("Null") : "suspicious node field: " + field; assert !INPUT_LIST_CLASS.isAssignableFrom(type) : "suspicious node input list field: " + field; assert !SUCCESSOR_LIST_CLASS.isAssignableFrom(type) : "suspicious node successor list field: " + field; + dataOffsets.add(offset); + dataTypes.add(type); + dataNames.add(name); } } } @@ -601,8 +597,14 @@ if (aBoolean != bBoolean) { return false; } + } else if (type == Long.TYPE) { + long aLong = unsafe.getLong(a, dataOffsets[i]); + long bLong = unsafe.getLong(b, dataOffsets[i]); + if (aLong != bLong) { + return false; + } } else { - assert false; + assert false : "unhandled type: " + type; } } else { Object objectA = unsafe.getObject(a, dataOffsets[i]); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.graph/test/com/oracle/graal/graph/test/TestNode.java --- a/graal/com.oracle.graal.graph/test/com/oracle/graal/graph/test/TestNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.graph/test/com/oracle/graal/graph/test/TestNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -26,7 +26,7 @@ public class TestNode extends Node implements Node.IterableNodeType { - @Data private String name; + private String name; public TestNode(String name) { this.name = name; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Apr 26 13:59:33 2012 +0200 @@ -26,7 +26,6 @@ import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.phases.*; -import com.oracle.graal.cri.*; import com.oracle.graal.debug.*; import com.oracle.graal.hotspot.ri.*; import com.oracle.graal.nodes.*; diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilerThread.java Thu Apr 26 13:59:33 2012 +0200 @@ -57,7 +57,7 @@ public void run() { if (GraalOptions.Debug) { Debug.enable(); - HotSpotDebugConfig hotspotDebugConfig = new HotSpotDebugConfig(GraalOptions.Log, GraalOptions.Meter, GraalOptions.Time, GraalOptions.Dump, GraalOptions.MethodFilter); + HotSpotDebugConfig hotspotDebugConfig = new HotSpotDebugConfig(GraalOptions.Log, GraalOptions.Meter, GraalOptions.Time, GraalOptions.Dump, GraalOptions.MethodFilter, GraalOptions.LogFile); Debug.setConfig(hotspotDebugConfig); } super.run(); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java Thu Apr 26 13:59:33 2012 +0200 @@ -22,6 +22,7 @@ */ package com.oracle.graal.hotspot; +import java.io.*; import java.util.*; import com.oracle.graal.compiler.*; @@ -40,10 +41,12 @@ private final DebugFilter dumpFilter; private final MethodFilter[] methodFilter; private final List dumpHandlers = new ArrayList<>(); + private final PrintStream output; + + private static final PrintStream cachedOut = System.out; - - public HotSpotDebugConfig(String logFilter, String meterFilter, String timerFilter, String dumpFilter, String methodFilter) { + public HotSpotDebugConfig(String logFilter, String meterFilter, String timerFilter, String dumpFilter, String methodFilter, String logFile) { this.logFilter = DebugFilter.parse(logFilter); this.meterFilter = DebugFilter.parse(meterFilter); this.timerFilter = DebugFilter.parse(timerFilter); @@ -69,6 +72,15 @@ dumpHandlers.add(new IdealGraphPrinterDumpHandler(GraalOptions.PrintIdealGraphAddress, GraalOptions.PrintIdealGraphPort)); } dumpHandlers.add(new CFGPrinterObserver()); + if (logFile == null || logFile.isEmpty()) { + output = cachedOut; + } else { + try { + output = new PrintStream(logFile); + } catch (FileNotFoundException e) { + throw new RuntimeException("couldn't create log file: " + logFile, e); + } + } } public boolean isLogEnabled() { @@ -87,6 +99,10 @@ return isEnabled(timerFilter); } + public PrintStream output() { + return output; + } + private boolean isEnabled(DebugFilter filter) { return checkDebugFilter(Debug.currentScope(), filter) && checkMethodFilter(); } @@ -142,7 +158,7 @@ if (e instanceof CiBailout) { return null; } - Debug.setConfig(Debug.fixedConfig(true, true, false, false, dumpHandlers)); + Debug.setConfig(Debug.fixedConfig(true, true, false, false, dumpHandlers, output)); // sync "Exception occured in scope: " with mx/sanitycheck.py::Test.__init__ Debug.log(String.format("Exception occured in scope: %s", Debug.currentScope())); for (Object o : Debug.context()) { diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Apr 26 13:59:33 2012 +0200 @@ -92,7 +92,7 @@ if (GraalOptions.Debug) { Debug.enable(); - HotSpotDebugConfig hotspotDebugConfig = new HotSpotDebugConfig(GraalOptions.Log, GraalOptions.Meter, GraalOptions.Time, GraalOptions.Dump, GraalOptions.MethodFilter); + HotSpotDebugConfig hotspotDebugConfig = new HotSpotDebugConfig(GraalOptions.Log, GraalOptions.Meter, GraalOptions.Time, GraalOptions.Dump, GraalOptions.MethodFilter, GraalOptions.LogFile); Debug.setConfig(hotspotDebugConfig); } // Install intrinsics. diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Thu Apr 26 13:59:33 2012 +0200 @@ -28,7 +28,6 @@ import java.util.*; import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.graph.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; import com.oracle.graal.compiler.target.*; diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java Thu Apr 26 13:59:33 2012 +0200 @@ -488,15 +488,15 @@ // -- out of line ------------------------------------------------------- asm.bindOutOfLine(slowPath); } else { - XirOperand scratchObject = asm.createRegisterTemp("scratch", CiKind.Object, AMD64.r10); // if we get an exact match: succeed immediately + XirOperand hintHub = asm.createTemp("hintHub", CiKind.Object); for (int i = 0; i < hintCount; i++) { - XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, CiKind.Object); - asm.mov(scratchObject, hintHub); + XirParameter hintMirror = asm.createConstantInputParameter("hintMirror" + i, CiKind.Object); + asm.pload(CiKind.Object, hintHub, hintMirror, asm.i(config.klassOopOffset), false); if (i < hintCount - 1) { - asm.jeq(end, objHub, scratchObject); + asm.jeq(end, objHub, hintHub); } else { - asm.jneq(slowPath, objHub, scratchObject); + asm.jneq(slowPath, objHub, hintHub); } } asm.bindInline(end); @@ -545,21 +545,21 @@ asm.jmp(trueSucc); } else { XirLabel slowPath = null; - XirOperand scratchObject = asm.createRegisterTemp("scratch", CiKind.Object, AMD64.r10); + XirOperand hintHub = asm.createTemp("hintHub", CiKind.Object); // if we get an exact match: succeed immediately for (int i = 0; i < hintCount; i++) { - XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, CiKind.Object); - asm.mov(scratchObject, hintHub); + XirParameter hintMirror = asm.createConstantInputParameter("hintMirror" + i, CiKind.Object); + asm.pload(CiKind.Object, hintHub, hintMirror, asm.i(config.klassOopOffset), false); if (i < hintCount - 1) { - asm.jeq(trueSucc, objHub, scratchObject); + asm.jeq(trueSucc, objHub, hintHub); } else { if (is(EXACT_HINTS, flags)) { - asm.jneq(falseSucc, objHub, scratchObject); + asm.jneq(falseSucc, objHub, hintHub); asm.jmp(trueSucc); } else { slowPath = asm.createOutOfLineLabel("slow path"); - asm.jneq(slowPath, objHub, scratchObject); + asm.jneq(slowPath, objHub, hintHub); asm.jmp(trueSucc); } } @@ -610,20 +610,20 @@ asm.bindInline(end); } else { XirLabel slowPath = null; - XirOperand scratchObject = asm.createRegisterTemp("scratch", CiKind.Object, AMD64.r10); + XirOperand hintHub = asm.createRegisterTemp("scratch", CiKind.Object, AMD64.r10); // if we get an exact match: succeed immediately for (int i = 0; i < hintCount; i++) { - XirParameter hintHub = asm.createConstantInputParameter("hintHub" + i, CiKind.Object); - asm.mov(scratchObject, hintHub); + XirParameter hintMirror = asm.createConstantInputParameter("hintMirror" + i, CiKind.Object); + asm.pload(CiKind.Object, hintHub, hintMirror, asm.i(config.klassOopOffset), false); if (i < hintCount - 1) { - asm.jeq(end, objHub, scratchObject); + asm.jeq(end, objHub, hintHub); } else { if (is(EXACT_HINTS, flags)) { - asm.jeq(end, objHub, scratchObject); + asm.jeq(end, objHub, hintHub); } else { slowPath = asm.createOutOfLineLabel("slow path"); - asm.jeq(end, objHub, scratchObject); + asm.jeq(end, objHub, hintHub); asm.jmp(slowPath); } } @@ -906,7 +906,8 @@ params[i++] = hub; } for (RiResolvedType hint : hints) { - params[i++] = XirArgument.forObject(hint); + Object hintMirror = hint.toJava(); + params[i++] = XirArgument.forObject(hintMirror); } XirTemplate template = hintsExact ? checkCastTemplates.get(site, hints.length, EXACT_HINTS) : checkCastTemplates.get(site, hints.length); return new XirSnippet(template, params); @@ -925,7 +926,8 @@ params[i++] = hub; } for (RiResolvedType hint : hints) { - params[i++] = XirArgument.forObject(hint); + Object hintMirror = hint.toJava(); + params[i++] = XirArgument.forObject(hintMirror); } XirTemplate template = hintsExact ? instanceOfTemplates.get(site, hints.length, EXACT_HINTS) : instanceOfTemplates.get(site, hints.length); return new XirSnippet(template, params); @@ -946,7 +948,8 @@ params[i++] = trueValue; params[i++] = falseValue; for (RiResolvedType hint : hints) { - params[i++] = XirArgument.forObject(hint); + Object hintMirror = hint.toJava(); + params[i++] = XirArgument.forObject(hintMirror); } XirTemplate template = hintsExact ? materializeInstanceOfTemplates.get(site, hints.length, EXACT_HINTS) : materializeInstanceOfTemplates.get(site, hints.length); return new XirSnippet(template, params); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java Thu Apr 26 13:59:33 2012 +0200 @@ -400,7 +400,7 @@ @Input private ValueNode object; @Input private ValueNode value; @Input private ValueNode offset; - @Data private final int displacement; + private final int displacement; public DirectObjectStoreNode(ValueNode object, int displacement, ValueNode offset, ValueNode value) { super(StampFactory.illegal()); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/RiGraphCache.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/RiGraphCache.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/RiGraphCache.java Thu Apr 26 13:59:33 2012 +0200 @@ -32,8 +32,4 @@ StructuredGraph get(RiResolvedMethod method); - void removeGraphs(long[] deoptedGraphs); - - void clear(); - } diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -36,7 +36,7 @@ @NodeInfo(shortName = "Const") public class ConstantNode extends BooleanNode implements LIRLowerable { - @Data public final CiConstant value; + public final CiConstant value; protected ConstantNode(CiConstant value) { super(StampFactory.forConstant(value)); diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSplitNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -46,7 +46,7 @@ return blockSuccessors.size(); } - @Data protected final double[] branchProbability; + protected final double[] branchProbability; public ControlSplitNode(Stamp stamp, BeginNode[] blockSuccessors, double[] branchProbability) { super(stamp); diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -30,9 +30,9 @@ @NodeInfo(shortName = "Deopt") public class DeoptimizeNode extends FixedNode implements Node.IterableNodeType, LIRLowerable { - @Data private String message; - @Data private final RiDeoptAction action; - @Data private final RiDeoptReason reason; + private String message; + private final RiDeoptAction action; + private final RiDeoptReason reason; private final long leafGraphId; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -31,8 +31,8 @@ public final class FixedGuardNode extends FixedWithNextNode implements Simplifiable, Lowerable, LIRLowerable, Node.IterableNodeType { @Input private final NodeInputList conditions; - @Data private final RiDeoptReason deoptReason; - @Data private final RiDeoptAction action; + private final RiDeoptReason deoptReason; + private final RiDeoptAction action; private final long leafGraphId; public FixedGuardNode(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, long leafGraphId) { diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -26,7 +26,7 @@ public abstract class FixedNode extends ValueNode { - @Data private double probability; + private double probability; public FixedNode(Stamp stamp) { super(stamp); diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -33,8 +33,8 @@ @Input private BooleanNode condition; @Input(notDataflow = true) private FixedNode anchor; - @Data private final RiDeoptReason reason; - @Data private final RiDeoptAction action; + private final RiDeoptReason reason; + private final RiDeoptAction action; private final long leafGraphId; public FixedNode anchor() { diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -122,7 +122,7 @@ EndNode trueEnd = (EndNode) trueSuccessor().next(); EndNode falseEnd = (EndNode) falseSuccessor().next(); MergeNode merge = trueEnd.merge(); - if (merge == falseEnd.merge() && merge.forwardEndCount() == 2) { + if (merge == falseEnd.merge() && merge.forwardEndCount() == 2 && trueSuccessor().anchored().isEmpty() && falseSuccessor().anchored().isEmpty()) { Iterator phis = merge.phis().iterator(); if (!phis.hasNext()) { // empty if construct with no phis: remove it diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -37,9 +37,9 @@ public final class InvokeNode extends AbstractStateSplit implements Node.IterableNodeType, Invoke, LIRLowerable, MemoryCheckpoint { @Input private final MethodCallTargetNode callTarget; - @Data private final int bci; + private final int bci; // megamorph should only be true when the compiler is sure that the call site is megamorph, and false when in doubt - @Data private boolean megamorph; + private boolean megamorph; private boolean useForInlining; private final long leafGraphId; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -37,9 +37,9 @@ @Input private final MethodCallTargetNode callTarget; @Input private FrameState stateAfter; - @Data private final int bci; + private final int bci; // megamorph should only be true when the compiler is sure that the call site is megamorph, and false when in doubt - @Data private boolean megamorph; + private boolean megamorph; private boolean useForInlining; private final long leafGraphId; diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LocalNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LocalNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LocalNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -34,7 +34,7 @@ public final class LocalNode extends FloatingNode implements Node.IterableNodeType { - @Data private final int index; + private final int index; public LocalNode(CiKind kind, int index) { this(index, StampFactory.forKind(kind)); diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -31,8 +31,8 @@ public final class LoopEndNode extends EndNode { @Input(notDataflow = true) private LoopBeginNode loopBegin; - @Data private boolean canSafepoint; - @Data private int endIndex; + private boolean canSafepoint; + private int endIndex; public LoopEndNode(LoopBeginNode begin) { int idx = begin.nextEndIndex(); diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -41,7 +41,7 @@ @Input(notDataflow = true) private MergeNode merge; @Input private final NodeInputList values = new NodeInputList<>(this); - @Data private final PhiType type; + private final PhiType type; public PhiNode(CiKind kind, MergeNode merge, PhiType type) { super(StampFactory.forKind(kind)); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -39,7 +39,7 @@ * The kind of this value. This is {@link CiKind#Void} for instructions that produce no value. * This kind is guaranteed to be a {@linkplain CiKind#stackKind() stack kind}. */ - @Data private Stamp stamp; + private Stamp stamp; @Input private NodeInputList dependencies; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueProxyNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -32,7 +32,7 @@ public class ValueProxyNode extends FloatingNode implements Node.IterableNodeType, ValueNumberable { @Input(notDataflow = true) private BeginNode proxyPoint; @Input private ValueNode value; - @Data private final PhiType type; + private final PhiType type; public ValueProxyNode(ValueNode value, BeginNode exit, PhiType type) { super(value.stamp()); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -30,7 +30,7 @@ */ public abstract class ArithmeticNode extends BinaryNode { - @Data private final boolean isStrictFP; + private final boolean isStrictFP; /** * Creates a new arithmetic operation. diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -40,8 +40,8 @@ @Input private ValueNode x; @Input private ValueNode y; - @Data private final Condition condition; - @Data private final boolean unorderedIsTrue; + private final Condition condition; + private final boolean unorderedIsTrue; public ValueNode x() { return x; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -66,7 +66,7 @@ @Input private ValueNode value; - @Data public final Op opcode; + public final Op opcode; public ValueNode value() { return value; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -31,7 +31,7 @@ * Returns -1, 0, or 1 if either x < y, x == y, or x > y. */ public final class NormalizeCompareNode extends BinaryNode implements Lowerable { - @Data public final boolean isUnorderedLess; + public final boolean isUnorderedLess; /** * Creates a new compare operation. diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -31,7 +31,7 @@ public final class NullCheckNode extends BooleanNode implements Canonicalizable, LIRLowerable, ConditionalTypeFeedbackProvider, TypeCanonicalizable { @Input private ValueNode object; - @Data public final boolean expectedNull; + public final boolean expectedNull; public ValueNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -30,7 +30,7 @@ @Input private ValueNode object; @Input private GuardNode guard; @Input private LocationNode location; - @Data private boolean nullCheck; + private boolean nullCheck; public ValueNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -34,8 +34,8 @@ public final class BoxNode extends AbstractStateSplit implements Node.IterableNodeType { @Input private ValueNode source; - @Data private int bci; - @Data private CiKind sourceKind; + private int bci; + private CiKind sourceKind; public BoxNode(ValueNode value, RiResolvedType type, CiKind sourceKind, int bci) { super(StampFactory.exactNonNull(type)); diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -32,7 +32,7 @@ @Input private ValueNode object; @Input private GuardNode guard; @Input private LocationNode location; - @Data private boolean nullCheck; + private boolean nullCheck; public ValueNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -29,7 +29,7 @@ public final class IndexedLocationNode extends LocationNode implements LIRLowerable, Canonicalizable { @Input private ValueNode index; - @Data private boolean indexScalingEnabled; + private boolean indexScalingEnabled; public ValueNode index() { return index; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -31,9 +31,9 @@ public class LocationNode extends FloatingNode implements LIRLowerable, ValueNumberable { - @Data private int displacement; - @Data private CiKind valueKind; - @Data private Object locationIdentity; + private int displacement; + private CiKind valueKind; + private Object locationIdentity; public static final Object ANY_LOCATION = new Object() { @Override diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LookupSwitchNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LookupSwitchNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LookupSwitchNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -31,7 +31,7 @@ */ public final class LookupSwitchNode extends SwitchNode implements LIRLowerable, Simplifiable { - @Data private final int[] keys; + private final int[] keys; /** * Constructs a new LookupSwitch instruction. diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/RuntimeCallNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/RuntimeCallNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/RuntimeCallNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -29,7 +29,7 @@ public final class RuntimeCallNode extends AbstractCallNode implements LIRLowerable { - @Data private final CiRuntimeCall call; + private final CiRuntimeCall call; public CiRuntimeCall call() { return call; diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/TableSwitchNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/TableSwitchNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/TableSwitchNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -30,7 +30,7 @@ */ public final class TableSwitchNode extends SwitchNode implements LIRLowerable, Simplifiable { - @Data private final int lowKey; + private final int lowKey; /** * Constructs a new TableSwitch instruction. diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -34,7 +34,7 @@ public final class UnboxNode extends FixedWithNextNode implements Node.IterableNodeType, Canonicalizable { @Input private ValueNode source; - @Data private CiKind destinationKind; + private CiKind destinationKind; public UnboxNode(CiKind kind, ValueNode source) { super(StampFactory.forKind(kind)); diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -35,7 +35,7 @@ public final class UnsafeCastNode extends FloatingNode implements Canonicalizable, Lowerable { @Input private ValueNode object; - @Data private RiResolvedType toType; + private RiResolvedType toType; public ValueNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -35,8 +35,8 @@ @Input private ValueNode object; @Input private ValueNode offset; - @Data private final int displacement; - @Data private final CiKind loadKind; + private final int displacement; + private final CiKind loadKind; public ValueNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -36,8 +36,8 @@ @Input private ValueNode object; @Input private ValueNode offset; @Input private ValueNode value; - @Data private final int displacement; - @Data private final CiKind storeKind; + private final int displacement; + private final CiKind storeKind; public UnsafeStoreNode(ValueNode object, int displacement, ValueNode offset, ValueNode value, CiKind kind) { super(StampFactory.illegal()); diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -39,7 +39,7 @@ @Input private ValueNode object; - @Data protected final RiResolvedField field; + protected final RiResolvedField field; public ValueNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -36,7 +36,7 @@ @Input private ValueNode index; @Input private ValueNode length; - @Data private final CiKind elementType; + private final CiKind elementType; private final long leafGraphId; public ValueNode index() { diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -46,7 +46,7 @@ public abstract class AccessMonitorNode extends AbstractStateSplit implements MemoryCheckpoint { @Input private ValueNode object; - @Data private boolean eliminated; + private boolean eliminated; public ValueNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -40,7 +40,7 @@ public final class CheckCastNode extends TypeCheckNode implements Canonicalizable, LIRLowerable, Node.IterableNodeType, TypeFeedbackProvider, TypeCanonicalizable { @Input(notDataflow = true) protected final FixedNode anchor; - @Data protected final boolean emitCode; + protected final boolean emitCode; public FixedNode anchor() { return anchor; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -39,7 +39,7 @@ @Input private ValueNode offset; @Input private ValueNode expected; @Input private ValueNode newValue; - @Data private final int displacement; + private final int displacement; public ValueNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -35,7 +35,7 @@ */ public final class InstanceOfNode extends TypeCheckNode implements Canonicalizable, LIRLowerable, ConditionalTypeFeedbackProvider, TypeCanonicalizable { - @Data private final boolean negated; + private final boolean negated; public boolean negated() { return negated; diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -34,7 +34,7 @@ public final class IsTypeNode extends BooleanNode implements Canonicalizable, LIRLowerable { @Input private ValueNode objectClass; - @Data private final RiResolvedType type; + private final RiResolvedType type; public ValueNode objectClass() { return objectClass; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -37,9 +37,9 @@ Virtual } - @Data private final RiType returnType; - @Data private RiResolvedMethod targetMethod; - @Data private InvokeKind invokeKind; + private final RiType returnType; + private RiResolvedMethod targetMethod; + private InvokeKind invokeKind; /** * @param arguments diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -36,7 +36,7 @@ */ public final class NewInstanceNode extends FixedWithNextNode implements EscapeAnalyzable, LIRLowerable, Node.IterableNodeType { - @Data private final RiResolvedType instanceClass; + private final RiResolvedType instanceClass; /** * Constructs a NewInstanceNode. diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -38,7 +38,7 @@ public final class NewMultiArrayNode extends FixedWithNextNode implements LIRLowerable, TypeFeedbackProvider { @Input private final NodeInputList dimensions; - @Data private final RiResolvedType type; + private final RiResolvedType type; public ValueNode dimension(int index) { return dimensions.get(index); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewObjectArrayNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewObjectArrayNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewObjectArrayNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -33,7 +33,7 @@ */ public final class NewObjectArrayNode extends NewArrayNode implements LIRLowerable, Node.IterableNodeType { - @Data private final RiResolvedType elementClass; + private final RiResolvedType elementClass; /** * Constructs a new NewObjectArrayNode. diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewTypeArrayNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewTypeArrayNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewTypeArrayNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -32,7 +32,7 @@ */ public final class NewTypeArrayNode extends NewArrayNode implements LIRLowerable { - @Data private final RiResolvedType elementType; + private final RiResolvedType elementType; public NewTypeArrayNode(ValueNode length, RiResolvedType elementType) { super(StampFactory.exactNonNull(elementType.arrayOf()), length); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -34,9 +34,9 @@ protected static final RiResolvedType[] EMPTY_HINTS = new RiResolvedType[0]; @Input private ValueNode object; @Input private ValueNode targetClassInstruction; - @Data private final RiResolvedType targetClass; - @Data private final RiResolvedType[] hints; - @Data private final boolean hintsExact; + private final RiResolvedType targetClass; + private final RiResolvedType[] hints; + private final boolean hintsExact; /** * Creates a new TypeCheckNode. diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectFieldNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectFieldNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectFieldNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -34,7 +34,7 @@ @Input private ValueNode lastState; @Input private ValueNode input; - @Data private int index; + private int index; public VirtualObjectNode object() { return object; diff -r 527ff42e0b26 -r 654318af685d 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 Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -30,9 +30,9 @@ public class VirtualObjectNode extends ValueNode implements LIRLowerable { - @Data private RiResolvedType type; - @Data private EscapeField[] fields; - @Data private int fieldsCount; + private RiResolvedType type; + private EscapeField[] fields; + private int fieldsCount; public VirtualObjectNode(RiResolvedType type, EscapeField[] fields) { super(StampFactory.illegal()); diff -r 527ff42e0b26 -r 654318af685d graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java --- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java Thu Apr 26 13:59:12 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java Thu Apr 26 13:59:33 2012 +0200 @@ -38,7 +38,7 @@ public class MathIntrinsicNode extends FloatingNode implements Canonicalizable, AMD64LIRLowerable { @Input private ValueNode x; - @Data private final Operation operation; + private final Operation operation; public enum Operation { ABS, SQRT, LOG, LOG10, SIN, COS, TAN,