Skip to content

[pull] swift/main from apple:swift/main #999

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 11 commits into from
Dec 19, 2020
Merged

[pull] swift/main from apple:swift/main #999

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1d65ca1
Disable AST type caching for SILFunctionTypes since the mapping isn't
adrian-prantl Dec 15, 2020
1e4ded8
Merge pull request #2245 from adrian-prantl/70552614
adrian-prantl Dec 15, 2020
c957ce7
Convert inline test to regular test
adrian-prantl Dec 15, 2020
3747805
unskip test that appears to be working
adrian-prantl Dec 15, 2020
2a12a45
Merge pull request #2249 from adrian-prantl/66842937
adrian-prantl Dec 16, 2020
081cef3
[lldb] Lift GetIndexOfChildWithName into TypeSystemSwift base class
kastiglione Dec 14, 2020
495cc21
remove from TypeSystemSwiftTypeRef too
kastiglione Dec 14, 2020
596ec47
tweak docstrings
kastiglione Dec 14, 2020
f9d0b91
Merge pull request #2259 from apple/lldb-Lift-GetIndexOfChildWithName…
kastiglione Dec 17, 2020
659e139
Merge commit '58b71bb621fe' from apple/stable/20200714 into swift/rel…
Dec 18, 2020
d48df29
Merge commit '659e139d89ff' from swift/release/5.4 into swift/main
Dec 19, 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
Prev Previous commit
Next Next commit
tweak docstrings
  • Loading branch information
@kastiglione
kastiglione committed Dec 17, 2020
commit 596ec47ac76e4485ec60742356d1ae9010a4aaec
3 changes: 0 additions & 3 deletions lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ bool TypeSystemSwift::ShouldTreatScalarValueAsAddress(
.AnySet(eTypeInstanceIsPointer | eTypeIsReference);
}

/// Get the index of the child of "clang_type" whose name matches. This function
/// doesn't descend into the children, but only looks one level deep and name
/// matches can include base class names.
uint32_t
TypeSystemSwift::GetIndexOfChildWithName(opaque_compiler_type_t type,
const char *name,
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class TypeSystemSwift : public TypeSystem {
ShouldTreatScalarValueAsAddress(lldb::opaque_compiler_type_t type) override;

/// Lookup a child given a name. This function will match base class names
/// and member names in "clang_type" only, not descendants.
/// and member names in \p type only, not descendants.
uint32_t GetIndexOfChildWithName(lldb::opaque_compiler_type_t type,
const char *name,
bool omit_empty_base_classes) override;
Expand Down