diff options
| author |  Janak Ramakrishnan <janakr@google.com> | 2015-03-25 21:50:05 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-03-26 08:40:09 +0000 |
| commit | bad299402cf118a9e078e7ddb66c651c37cb800d (patch) | |
| tree | e2d6458cabf2494386bd434f934a14c659832e51 /src/main/java/com/google/devtools | |
| parent | a258fa89e5b6f0a4605cedfa057e88b946c66838 (diff) | |
Fix bug where inputs are updated from action cache but not tracked in Skyframe.
This bug, and all of them like it, will be fixed in an upcoming cl that makes sure all input metadata is obtained through Skyframe. But I think we should have this fix now.
--
MOS_MIGRATED_REVID=89540265
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java index 59f6e4bbe0..f2a81fc6db 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java @@ -214,6 +214,10 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver } if (state.token == null) { + if (action.discoversInputs()) { + // Action may have had its inputs updated. Keep track of those new inputs. + declareAdditionalDependencies(env, action); + } // We got a hit from the action cache -- no need to execute. return new ActionExecutionValue( fileAndMetadataCache.getOutputData(), |