Skip to content

Commit 5e9934c

Browse files
authored
Merge pull request #32955 from hamishknight/thanks-asan
2 parents fc9ee1e + 47a9e18 commit 5e9934c

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

include/swift/TBDGen/TBDGen.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class ModuleDecl;
3030
/// output.
3131
struct TBDGenOptions {
3232
/// Whether this compilation has multiple IRGen instances.
33-
bool HasMultipleIGMs;
33+
bool HasMultipleIGMs = false;
3434

3535
/// Whether this compilation is producing a TBD for InstallAPI.
36-
bool IsInstallAPI;
36+
bool IsInstallAPI = false;
3737

3838
/// Only collect linker directive symbols.
3939
bool LinkerDirectivesOnly = false;

test/sil-llvm-gen/alloc.sil

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// REQUIRES: CODEGENERATOR=X86
99
// REQUIRES: CODEGENERATOR=ARM
1010

11-
// REQUIRES: rdar65712583
12-
1311
import Builtin
1412

1513
struct Pair<T> {

tools/sil-llvm-gen/SILLLVMGen.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ int main(int argc, char **argv) {
190190
auto *mod = CI.getMainModule();
191191
assert(mod->getFiles().size() == 1);
192192

193-
auto getDescriptor = [&]() -> IRGenDescriptor {
194-
const auto &TBDOpts = Invocation.getTBDGenOptions();
195-
const auto &SILOpts = Invocation.getSILOptions();
196-
auto &SILTypes = CI.getSILTypes();
197-
auto moduleName = CI.getMainModule()->getName().str();
198-
const PrimarySpecificPaths PSPs(OutputFilename, InputFilename);
193+
const auto &TBDOpts = Invocation.getTBDGenOptions();
194+
const auto &SILOpts = Invocation.getSILOptions();
195+
auto &SILTypes = CI.getSILTypes();
196+
auto moduleName = CI.getMainModule()->getName().str();
197+
const PrimarySpecificPaths PSPs(OutputFilename, InputFilename);
199198

199+
auto getDescriptor = [&]() -> IRGenDescriptor {
200200
if (PerformWMO) {
201201
return IRGenDescriptor::forWholeModule(
202202
mod, Opts, TBDOpts, SILOpts, SILTypes,

0 commit comments

Comments
 (0)