stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8048009: Type info caching accidentally defeated

Browse Source 
Reviewed-by: hannesw, jlaskey
This commit is contained in:
Attila Szegedi 2014-06-24 19:29:41 +02:00
parent 566786aba6
commit d983b0b09c
2 changed files with 12 additions and 18 deletions
nashorn/src/jdk/nashorn/internal/codegen
Compiler.javaOptimisticTypesPersistence.java

10
nashorn/src/jdk/nashorn/internal/codegen/Compiler.java

@ -45,7 +45,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
@ -122,11 +121,7 @@ public final class Compiler implements Loggable {
* that using whatever was at program point 17 as an int failed.
*/
private final Map<Integer, Type> invalidatedProgramPoints;
/**
* The snapshot of invalidatedProgramPoints before the compilation. Used to compare it to invalidatedProgramPoints,
* and if the two are equal, not write the type information to a file.
*/
private final Map<Integer, Type> invalidatedProgramPointsOnEntry;
/**
* Descriptor of the location where we write the type information after compilation.
*/
@ -381,7 +376,6 @@ public final class Compiler implements Loggable {
this.firstCompileUnitName = firstCompileUnitName();
this.strict = isStrict;
this.invalidatedProgramPointsOnEntry = typeInformationFile == null ? null : new HashMap<>(this.invalidatedProgramPoints);
this.optimistic = env._optimistic_types;
}
@ -537,7 +531,7 @@ public final class Compiler implements Loggable {
time += (env.isTimingEnabled() ? phase.getEndTime() - phase.getStartTime() : 0L);
}
if(typeInformationFile != null && !phases.isRestOfCompilation() && !Objects.equals(invalidatedProgramPoints, invalidatedProgramPointsOnEntry)) {
if(typeInformationFile != null && !phases.isRestOfCompilation()) {
OptimisticTypesPersistence.store(typeInformationFile, invalidatedProgramPoints);
}

20
nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java

@ -136,11 +136,7 @@ public final class OptimisticTypesPersistence {
}
dout.flush();
} catch(final Exception e) {
final long now = System.currentTimeMillis();
if(now - lastReportedError > ERROR_REPORT_THRESHOLD) {
getLogger().warning("Failed to write " + file, e);
lastReportedError = now;
}
reportError("write", file, e);
}
}
return null;
@ -190,17 +186,21 @@ public final class OptimisticTypesPersistence {
}
}
} catch (final Exception e) {
final long now = System.currentTimeMillis();
if(now - lastReportedError > ERROR_REPORT_THRESHOLD) {
getLogger().warning("Failed to read " + file, e);
lastReportedError = now;
}
reportError("read", file, e);
return null;
}
}
});
}
private static void reportError(final String msg, final File file, final Exception e) {
final long now = System.currentTimeMillis();
if(now - lastReportedError > ERROR_REPORT_THRESHOLD) {
getLogger().warning(String.format("Failed to %s %s", msg, file), e);
lastReportedError = now;
}
}
private static File createCacheDir() {
if(Options.getBooleanProperty("nashorn.typeInfo.disabled")) {
return null;