infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-11 10:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

8057611: Nashorn did not dump the JOx classes to disk when running with the -d flag

Browse Source 
Reviewed-by: attila, sundar, hannesw
This commit is contained in:
Marcus Lagergren 2014-09-05 16:28:02 +02:00
parent 6e6817cf2b
commit cbd2f643ad
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
View File

@ -53,6 +53,7 @@ import java.util.EnumSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.runtime.AccessorProperty;
@ -308,7 +309,7 @@ public final class ObjectClassGenerator implements Loggable {
newEmptyInit(className, classEmitter);
newAllocate(className, classEmitter);
return toByteArray(classEmitter);
return toByteArray(className, classEmitter);
}
/**
@ -341,7 +342,7 @@ public final class ObjectClassGenerator implements Loggable {
initWithArguments.returnVoid();
initWithArguments.end();
return toByteArray(classEmitter);
return toByteArray(className, classEmitter);
}
/**
@ -484,15 +485,13 @@ public final class ObjectClassGenerator implements Loggable {
* @param classEmitter Open class emitter.
* @return Byte codes for the class.
*/
private byte[] toByteArray(final ClassEmitter classEmitter) {
private byte[] toByteArray(final String className, final ClassEmitter classEmitter) {
classEmitter.end();
final byte[] code = classEmitter.toByteArray();
final ScriptEnvironment env = context.getEnv();
if (env._print_code && env._print_code_dir == null) {
env.getErr().println(ClassEmitter.disassemble(code));
}
DumpBytecode.dumpBytecode(env, log, code, className);
if (env._verify_code) {
context.verify(code);

1
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java
View File

@ -27,7 +27,6 @@ package jdk.nashorn.internal.runtime;
import static jdk.nashorn.internal.lookup.Lookup.MH;
import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
import java.lang.invoke.CallSite;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;