[Dependency Scanning] Miscellaneous fixes to import statement info serialization #80723
Conversation
|
@swift-ci smoke test |
| // | ||
| // RUN: grep "IMPORT_STATEMENT_NODE" %t/cache.moddepcache.initial.dump.txt | wc -l > %t/initial_scan_import_count.txt | ||
| // RUN: grep "IMPORT_STATEMENT_NODE" %t/cache.moddepcache.dump.txt | wc -l > %t/secondary_scan_import_count.txt | ||
| // RUN: diff %t/initial_scan_import_count.txt %t/secondary_scan_import_count.txt |
There was a problem hiding this comment.
Does output change order somehow? Should we just diff all the import line, rather than the count?
If we only care about count, I assume it is a known number that doesn't change? Maybe use CHECK-COUNT-{NUM} instead of diffing?
There was a problem hiding this comment.
Does output change order somehow? Should we just diff all the import line, rather than the count?
While I don't think the order should change, we haven't actually intentionally ensured that all the various string identifiers will have identical order and values. If we intend to have that, then that's something to pursue. But in the meantime I want to have the test be a bit simpler and at least ensure that we have preserved the same count of imports.
I assume it is a known number that doesn't change?
There is a lot of precedent of Swift adding implicit imports throughout the years and I really didn't want to hard-code this into the test so that it would have to be updated in the future.
…rialization - Deserialization of binary module dependencies was still relying on stale code (e.g. 'currentModuleImports', 'currentOptionalModuleImports') from serialized import strings, instead of the now in-use import infos. - Imports without a source location (e.g. implicit imports of stdlib) were not getting serialized at all - Optional import arrays were not being written out at all
artemcm
force-pushed
the
FixDepScanImportSerialization
branch
from
dbaf99c to
e2f50b5
Compare
|
@swift-ci smoke test |
currentModuleImports,currentOptionalModuleImports) from serialized import strings, instead of the now in-use import infos.