# HG changeset patch # User Thomas Wuerthinger # Date 1424029566 -3600 # Node ID fc390dcb0ba505c28c8a5953e76d86577f4f0df2 # Parent 664b396dbe64920cfa519a2686476cb77f9c7832 Enable bytecode instruction level tracing only when assertions are enabled. diff -r 664b396dbe64 -r fc390dcb0ba5 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 Sun Feb 15 20:45:45 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java Sun Feb 15 20:46:06 2015 +0100 @@ -1148,10 +1148,11 @@ return frameState; } - protected void traceInstruction(int bci, int opcode, boolean blockStart) { + protected boolean traceInstruction(int bci, int opcode, boolean blockStart) { if (Debug.isEnabled() && Options.TraceBytecodeParserLevel.getValue() >= TRACELEVEL_INSTRUCTIONS && Debug.isLogEnabled()) { traceInstructionHelper(bci, opcode, blockStart); } + return true; } private void traceInstructionHelper(int bci, int opcode, boolean blockStart) { diff -r 664b396dbe64 -r fc390dcb0ba5 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 Sun Feb 15 20:45:45 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Sun Feb 15 20:46:06 2015 +0100 @@ -1584,8 +1584,8 @@ // read the opcode int opcode = stream.currentBC(); - traceState(); - traceInstruction(bci, opcode, bci == block.startBci); + assert traceState(); + assert traceInstruction(bci, opcode, bci == block.startBci); if (currentDepth == 0 && bci == entryBCI) { if (block.getJsrScope() != JsrScope.EMPTY_SCOPE) { throw new BailoutException("OSR into a JSR scope is not supported"); @@ -1648,10 +1648,11 @@ } } - private void traceState() { + private boolean traceState() { if (Debug.isEnabled() && Options.TraceBytecodeParserLevel.getValue() >= TRACELEVEL_STATE && Debug.isLogEnabled()) { traceStateHelper(); } + return true; } private void traceStateHelper() {