commit 14f8c25015f60e2e1af2c2806df9315b2c5ef2ed
author Ulf Adams <ulfjack@google.com> Wed Sep 09 14:56:35 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Wed Sep 09 17:35:14 2015 +0000
tree 711ec6890c5bb9c7f57838e0155679ba7c9b65bd
parent 5529c1a456b785c7b7da19f2dda35bf7cb91fcb3

Rewrite the preprocessor infrastructure to return events as part of the result.

--
MOS_MIGRATED_REVID=102658808

src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index 9e3b8d5..5cb7685 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
@@ -797,12 +797,10 @@
       try {
         Globber globber = packageFactory.createLegacyGlobber(buildFilePath.getParentDirectory(),
             packageId, packageLocator);
-        StoredEventHandler localReporter = new StoredEventHandler();
         Preprocessor.Result preprocessingResult = preprocessCache.getIfPresent(packageId);
         if (preprocessingResult == null) {
           preprocessingResult = replacementSource == null
-              ? packageFactory.preprocess(packageId, buildFilePath, inputSource, globber,
-                  localReporter)
+              ? packageFactory.preprocess(packageId, buildFilePath, inputSource, globber)
               : Preprocessor.Result.noPreprocessing(replacementSource);
           preprocessCache.put(packageId, preprocessingResult);
         }
@@ -821,7 +819,7 @@
         preprocessCache.invalidate(packageId);
 
         pkgBuilder = packageFactory.createPackageFromPreprocessingResult(externalPkg, packageId,
-            buildFilePath, preprocessingResult, localReporter.getEvents(), preludeStatements,
+            buildFilePath, preprocessingResult, preprocessingResult.events, preludeStatements,
             importResult.importMap, importResult.fileDependencies, packageLocator,
             defaultVisibility, globber);
         numPackagesLoaded.incrementAndGet();