Skip to content

Manually merged upstream commits from apple/llvm-project:apple/swift-master #1803

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.

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

Conversation

dabrahams
Copy link

No description provided.

git apple-llvm automerger and others added 30 commits August 26, 2020 17:24
This allows the logic to be reused by both the builders and the tests.

(cherry picked from commit a3fc61c)
…c80f89ea709a1128caa2de2723fe307c81

[lldb] Move Xcode SDK helper functions into lldbutil
 Conflicts:
	lldb/packages/Python/lldbsuite/test/make/Makefile.rules
	lldb/packages/Python/lldbsuite/test/plugins/builder_base.py
	lldb/packages/Python/lldbsuite/test/plugins/builder_darwin.py
Temporarily remove remote support from TestPlaygrounds.py to facilitate
the merge passing PR testing. This will require upstream changes which
I'll cherry-pick separately.
The version of `st1d` that operates with vector plus immediate
addressing mode uses the alias `st1d { <Zn>.d }, <Pg>, [<Za>.d]` for
rendering `st1d { <Zn>.d }, <Pg>, [<Za>.d, #0]`. The disassembler was
generating `<Zn>.s` instead of `<Zn>.d>`.

Differential Revision: https://reviews.llvm.org/D86633
…to-rebranch

Merge bastille into rebranch
rdar://problem/67347966&67348151&67348391&67884852
… DWARFExpression holds the data that represents a constant value

In some cases when we have a DW_AT_const_value and the data can be found in the
DWARFExpression then ValueObjectVariable does not handle it properly and we end
up with an extracting data from value failed error.

The test is a very stripped down assembly file since reproducing this relies on the results of compiling with -O1 which may not be stable over time.

Differential Revision: https://reviews.llvm.org/D86311

(cherry picked from commit 93b2551)
Fixes error: no matching constructor for initialization of
'std::pair<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >'
with older toolchain (clang/libcxx) on Ubuntu 16.04. The issue is the
StringRef-to-std::string conversion.

(cherry picked from commit 7f717b6)
…6d1f65f8474e8633b040a16c55f0ad6b96

[lldb] Fix "no matching std::pair constructor" on Ubuntu 16.04 (NFC)
…tvariable_dw_at_const_value_when_dwarf_expr_holds_constant_value

[LLDB] Fix how ValueObjectVariable handles DW_AT_const_value when the DWARFExpression holds the data that represents a constant value
We saw a crash recently (rdar://problem/65276489) that looks related to an invalid ValueObjectSP in a summary providers in Cocoa.cpp e.g. NSBundleSummaryProvider(...).
This adds checks before we use them usually by calling NSStringSummaryProvider.

Differential Revision: https://reviews.llvm.org/D84272

(cherry picked from commit 6700f4b)
brad0 and others added 23 commits September 9, 2020 10:03
…t PowerPC in PPCTargetLowering

Reviewed By: nemanjai

Differential Revision: https://reviews.llvm.org/D86165

(cherry picked from commit 88b368a)
… (NFC)

Move the construction of the triple out of getArchCFlags in the
DarwinBuilder.

(cherry picked from commit b981924)
…4bdda71b610c349a1d502ba83af632ae98+2955a27abc25cd1b9d737c211c2cfe11e2a5de3e

🍒/bastille/b981924bdda71b610c349a1d502ba83af632ae98+2955a27abc25cd1b9d737c211c2cfe11e2a5de3e
…aygrounds.py

[lldb] Re-enable TestPlaygrounds.py
…t-playgrounds.py

 [lldb] Fix TestPlaygrounds.py when running on-device
…ler-warnings

[lldb] Fix latent compiler warnings
add support for python 3.8 lldb build
I checked, and that branch didn't contain any new changes (other than,
e.g. ordering of additions and whitespace changes).
…ensorflow-stage

* 'swift/tensorflow' of github.com:apple/llvm-project:
  add support for python 3.8 lldb build
Copy link

@saeta saeta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have carefully reviewed every line of this PR!

@texasmichelle texasmichelle changed the base branch from swift/tensorflow to swift/tensorflow-merge September 15, 2020 18:17
@texasmichelle texasmichelle merged commit db328f6 into swiftlang:swift/tensorflow-merge Sep 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.