@@ -779,44 +779,36 @@ generateFullDependencyGraph(CompilerInstance &instance,
779
779
: create_null ();
780
780
781
781
details->kind = SWIFTSCAN_DEPENDENCY_INFO_SWIFT_TEXTUAL;
782
+
782
783
details->swift_textual_details = {
783
- .module_interface_path = moduleInterfacePath,
784
- .compiled_module_candidates =
785
- create_set (swiftTextualDeps->compiledModuleCandidates ),
786
- .bridging_header_path = bridgingHeaderPath,
787
- .bridging_source_files =
788
- create_set (swiftTextualDeps->bridgingSourceFiles ),
789
- .bridging_module_dependencies =
790
- create_set (swiftTextualDeps->bridgingModuleDependencies ),
791
- .command_line = create_set (swiftTextualDeps->buildCommandLine ),
792
- .extra_pcm_args = create_set (swiftTextualDeps->extraPCMArgs ),
793
- .context_hash = create_clone (swiftTextualDeps->contextHash .c_str ()),
794
- .is_framework = swiftTextualDeps->isFramework };
784
+ moduleInterfacePath,
785
+ create_set (swiftTextualDeps->compiledModuleCandidates ),
786
+ bridgingHeaderPath,
787
+ create_set (swiftTextualDeps->bridgingSourceFiles ),
788
+ create_set (swiftTextualDeps->bridgingModuleDependencies ),
789
+ create_set (swiftTextualDeps->buildCommandLine ),
790
+ create_set (swiftTextualDeps->extraPCMArgs ),
791
+ create_clone (swiftTextualDeps->contextHash .c_str ()),
792
+ swiftTextualDeps->isFramework };
795
793
} else if (swiftPlaceholderDeps) {
796
794
details->kind = SWIFTSCAN_DEPENDENCY_INFO_SWIFT_PLACEHOLDER;
797
795
details->swift_placeholder_details = {
798
- .compiled_module_path =
799
- create_clone (swiftPlaceholderDeps->compiledModulePath .c_str ()),
800
- .module_doc_path =
801
- create_clone (swiftPlaceholderDeps->moduleDocPath .c_str ()),
802
- .module_source_info_path =
803
- create_clone (swiftPlaceholderDeps->sourceInfoPath .c_str ())};
796
+ create_clone (swiftPlaceholderDeps->compiledModulePath .c_str ()),
797
+ create_clone (swiftPlaceholderDeps->moduleDocPath .c_str ()),
798
+ create_clone (swiftPlaceholderDeps->sourceInfoPath .c_str ())};
804
799
} else if (swiftBinaryDeps) {
805
800
details->kind = SWIFTSCAN_DEPENDENCY_INFO_SWIFT_BINARY;
806
801
details->swift_binary_details = {
807
- .compiled_module_path =
808
- create_clone (swiftBinaryDeps->compiledModulePath .c_str ()),
809
- .module_doc_path =
810
- create_clone (swiftBinaryDeps->moduleDocPath .c_str ()),
811
- .module_source_info_path =
812
- create_clone (swiftBinaryDeps->sourceInfoPath .c_str ())};
802
+ create_clone (swiftBinaryDeps->compiledModulePath .c_str ()),
803
+ create_clone (swiftBinaryDeps->moduleDocPath .c_str ()),
804
+ create_clone (swiftBinaryDeps->sourceInfoPath .c_str ())};
813
805
} else {
814
806
// Clang module details
815
807
details->kind = SWIFTSCAN_DEPENDENCY_INFO_CLANG;
816
808
details->clang_details = {
817
- . module_map_path = create_clone (clangDeps->moduleMapFile .c_str ()),
818
- . context_hash = create_clone (clangDeps->contextHash .c_str ()),
819
- . command_line = create_set (clangDeps->nonPathCommandLine )};
809
+ create_clone (clangDeps->moduleMapFile .c_str ()),
810
+ create_clone (clangDeps->contextHash .c_str ()),
811
+ create_set (clangDeps->nonPathCommandLine )};
820
812
}
821
813
return details;
822
814
};
0 commit comments