hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-08 20:20:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #460 from xiemaisi/js/in-dist-trap-cache

Browse Source 
JavaScript: Teach `AutoBuild` to use in-dist externs trap cache.
This commit is contained in:
Asger F
2018-11-15 13:08:44 +00:00
committed by GitHub
parent 0d7c5eaa6e 851e71c7d0
commit 737ec70ca2
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
View File

@@ -285,9 +285,8 @@ public class AutoBuild {
excludes.add(toRealPath(folderPath));
} catch (InvalidPathException | URISyntaxException | ResourceError e) {
Exceptions.ignore(e, "Ignore path and print warning message instead");
System.err.println("Ignoring '" + fields[0] + "' classification for " +
warn("Ignoring '" + fields[0] + "' classification for " +
folder + ", which is not a valid path.");
System.err.flush();
}
}
}
@@ -354,8 +353,7 @@ public class AutoBuild {
patterns.add(realPath);
} catch (ResourceError e) {
Exceptions.ignore(e, "Ignore exception and print warning instead.");
System.err.println("Skipping path " + path + ", which does not exist.");
System.err.flush();
warn("Skipping path " + path + ", which does not exist.");
}
return true;
}
@@ -374,6 +372,35 @@ public class AutoBuild {
*/
private void extractExterns() throws IOException {
ExtractorConfig config = new ExtractorConfig(false).withExterns(true);
// use explicitly specified trap cache, or otherwise $SEMMLE_DIST/.cache/trap-cache/javascript,
// which we pre-populate when building the distribution
ITrapCache trapCache = this.trapCache;
if (trapCache instanceof DummyTrapCache) {
Path trapCachePath = SEMMLE_DIST.resolve(".cache").resolve("trap-cache").resolve("javascript");
if (Files.isDirectory(trapCachePath)) {
trapCache = new DefaultTrapCache(trapCachePath.toString(), null, Main.EXTRACTOR_VERSION) {
boolean warnedAboutCacheMiss = false;
@Override
public File lookup(String source, ExtractorConfig config, FileType type) {
File f = super.lookup(source, config, type);
// only return `f` if it exists; this has the effect of making the cache read-only
if (f.exists())
return f;
// warn on first failed lookup
if (!warnedAboutCacheMiss) {
warn("Trap cache lookup for externs failed.");
warnedAboutCacheMiss = true;
}
return null;
}
};
} else {
warn("No externs trap cache found");
}
}
FileExtractor extractor = new FileExtractor(config, outputConfig, trapCache, extractorState);
FileVisitor<? super Path> visitor = new SimpleFileVisitor<Path>() {
@Override
@@ -539,8 +566,7 @@ public class AutoBuild {
protected void extract(FileExtractor extractor, Path file) throws IOException {
File f = file.toFile();
if (!f.exists()) {
System.err.println("Skipping " + file + ", which does not exist.");
System.err.flush();
warn("Skipping " + file + ", which does not exist.");
return;
}
@@ -549,6 +575,11 @@ public class AutoBuild {
logEndProcess();
}
private void warn(String msg) {
System.err.println(msg);
System.err.flush();
}
private void logBeginProcess(String message) {
System.out.print(message + "...");
System.out.flush();