[SR-2855] Show inputs mismatch in -driver-show-incremental #5340
Conversation
| inputArgs.insert(inputPair.second->getValue()); | ||
| } | ||
|
|
||
| llvm::StringSet<> missingInputs; |
There was a problem hiding this comment.
Please use a SmallVector for this, so that the results come out deterministically!
| llvm::StringSet<> missingInputs; | ||
| for (auto &previousInput : previousInputs) { | ||
| auto previousInputArg = previousInput.getKey(); | ||
| if(inputArgs.find(previousInputArg) == inputArgs.end()) { |
There was a problem hiding this comment.
Nitpick: missing space after 'if'.
| << "in the current compilation.\n" | ||
| << "\tInputs not included in this compilation:"; | ||
| for (auto &missing : missingInputs) { | ||
| llvm::outs() << " " << missing.getKey(); |
There was a problem hiding this comment.
Most of the time these are going to be absolute paths, so I suggest putting them on their own lines.
modocache
force-pushed
the
sr-2855-driver-show-incremental-inputs-mismatch
branch
from
c5cbcb9 to
336d1bc
Compare
|
@swift-ci please test |
| // CHECK-INCREMENTAL: Queuing main.swift (initial) | ||
|
|
||
| // RUN: cd %t && %swiftc_driver -driver-use-frontend-path %S/Inputs/update-dependencies.py -c ./main.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s | ||
| // CHECK-INPUTS-MISMATCH: Incremental compilation has been disabled |
There was a problem hiding this comment.
I think it's important to include enough of the message to say why it was disabled, since you're adding several of these messages.
There was a problem hiding this comment.
To be clear, I'm worried about the test matching a case where it's disabled for some other reason.
|
Build failed |
SR-2855 suggests `-driver-show-incremental` not only print information about why certain files are included in incremental compilation, but also print out why incremental compilation may be disabled altogether. Add a message for one such reason: when the inputs passed to the Swift compiler don't match the ones used previously.
modocache
force-pushed
the
sr-2855-driver-show-incremental-inputs-mismatch
branch
from
336d1bc to
c2002ea
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test os x platform |
SR-2855 suggests
-driver-show-incrementalnot only print information about why certain files are included in incremental compilation, but also print out why incremental compilation may be disabled altogether.Add a message for one such reason: when the inputs passed to the Swift compiler don't match the ones used previously.
This addresses one part of SR-2855.