Skip to content

Commit d9a6a63

Browse files
author
Paolo Tranquilli
committed
Swift: fix log compilation
1 parent e71e7a0 commit d9a6a63

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

swift/extractor/SwiftExtractor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,18 +224,18 @@ void codeql::extractSwiftFiles(SwiftExtractorState& state, swift::CompilerInstan
224224
}
225225
isFromSourceFile = true;
226226
if (inputFiles.count(sourceFile->getFilename().str()) == 0) {
227-
LOG_DEBUG("skipping module {} from file {}, not in input files", module->getName(),
227+
LOG_DEBUG("skipping module {} from file {}, not in input files", module->getName().get(),
228228
sourceFile->getFilename());
229229
continue;
230230
}
231-
LOG_DEBUG("extracting module {} from input file {}", module->getName(),
231+
LOG_DEBUG("extracting module {} from input file {}", module->getName().get(),
232232
sourceFile->getFilename());
233233
archiveFile(state.configuration, *sourceFile);
234234
encounteredModules =
235235
extractDeclarations(state, compiler, *module, sourceFile, /*lazy declaration*/ nullptr);
236236
}
237237
if (!isFromSourceFile) {
238-
LOG_DEBUG("extracting module {} from non-source file", module->getName());
238+
LOG_DEBUG("extracting module {} from non-source file", module->getName().get());
239239
encounteredModules = extractDeclarations(state, compiler, *module, /*source file*/ nullptr,
240240
/*lazy declaration*/ nullptr);
241241
}

swift/extractor/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class Observer : public swift::FrontendObserver {
9393
explicit Observer(const codeql::SwiftExtractorConfiguration& config) : state{config} {}
9494

9595
void parsedArgs(swift::CompilerInvocation& invocation) override {
96-
LOG_DEBUG("{}(...)", __func__);
96+
LOG_DEBUG("{}()", __func__);
9797
auto& options = invocation.getFrontendOptions();
9898
options.KeepASTContext = true;
9999
lockOutputSwiftModuleTraps(state, options);
@@ -102,14 +102,14 @@ class Observer : public swift::FrontendObserver {
102102
}
103103

104104
void configuredCompiler(swift::CompilerInstance& instance) override {
105-
LOG_DEBUG("{}(...)", __func__);
105+
LOG_DEBUG("{}()", __func__);
106106
// remove default consumers to avoid double messaging
107107
instance.getDiags().takeConsumers();
108108
instance.addDiagnosticConsumer(&diagConsumer);
109109
}
110110

111111
void performedCompilation(swift::CompilerInstance& compiler) override {
112-
LOG_DEBUG("{}(...)", __func__);
112+
LOG_DEBUG("{}()", __func__);
113113
codeql::extractSwiftFiles(state, compiler);
114114
codeql::extractSwiftInvocation(state, compiler, invocationTrap);
115115
codeql::extractExtractLazyDeclarations(state, compiler);

0 commit comments

Comments
 (0)