Skip to content

Fix a couple of memory bugs #32955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2020
Merged

Fix a couple of memory bugs #32955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3401f3c
[SILLLVMGen] Fix a stack-use-after-scope
hamishknight Jul 17, 2020
47a9e18
[TBD] Add defaults for TBDGenOptions
hamishknight Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/swift/TBDGen/TBDGen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ class ModuleDecl;
/// output.
struct TBDGenOptions {
/// Whether this compilation has multiple IRGen instances.
bool HasMultipleIGMs;
bool HasMultipleIGMs = false;

/// Whether this compilation is producing a TBD for InstallAPI.
bool IsInstallAPI;
bool IsInstallAPI = false;

/// Only collect linker directive symbols.
bool LinkerDirectivesOnly = false;
Expand Down
2 changes: 0 additions & 2 deletions test/sil-llvm-gen/alloc.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// REQUIRES: CODEGENERATOR=X86
// REQUIRES: CODEGENERATOR=ARM

// REQUIRES: rdar65712583

import Builtin

struct Pair<T> {
Expand Down
12 changes: 6 additions & 6 deletions tools/sil-llvm-gen/SILLLVMGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ int main(int argc, char **argv) {
auto *mod = CI.getMainModule();
assert(mod->getFiles().size() == 1);

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

auto getDescriptor = [&]() -> IRGenDescriptor {
if (PerformWMO) {
return IRGenDescriptor::forWholeModule(
mod, Opts, TBDOpts, SILOpts, SILTypes,
Expand Down