Skip to content

Commit e67cc5e

Browse files
committed
---
yaml --- r: 326527 b: refs/heads/tensorflow c: 428bbe1 h: refs/heads/master i: 326525: 9d1959c 326523: bf379a4 326519: bff6cd2 326511: c8d8e46 326495: b6e8eb6 326463: a321eef 326399: 7607adc
1 parent 961c884 commit e67cc5e

File tree

333 files changed

+2900
-7593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+2900
-7593
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
816816
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
817817
refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
818818
"refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
819-
refs/heads/tensorflow: 7db162e9964eb65ab9708122b02d5b19081a4b2c
819+
refs/heads/tensorflow: 428bbe1060dc245e2135cbec5d5d00d895612f2a
820820
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
821821
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
822822
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL MSVC)
450450
endif()
451451

452452
if(CMAKE_SYSTEM_NAME STREQUAL Darwin OR
453-
EXISTS "${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}")
453+
EXISTS ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})
454454
set(SWIFT_BUILD_SYNTAXPARSERLIB_default TRUE)
455455
set(SWIFT_BUILD_SOURCEKIT_default TRUE)
456456
else()

branches/tensorflow/docs/DebuggingTheCompiler.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ diagnostic engine to assert on the first error/warning:
8686
These allow one to dump a stack trace of where the diagnostic is being emitted
8787
(if run without a debugger) or drop into the debugger if a debugger is attached.
8888

89-
Finding Diagnostic Names
90-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
91-
92-
Some diagnostics rely heavily on format string arguments, so it can be difficult
93-
to find their implementation by searching for parts of the emitted message in
94-
the codebase. To print the corresponding diagnostic name at the end of each
95-
emitted message, use the ``-Xfrontend -debug-diagnostic-names`` argument.
96-
9789
Debugging the Type Checker
9890
--------------------------
9991

branches/tensorflow/docs/SIL.rst

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2342,8 +2342,8 @@ assign_by_wrapper
23422342
assign_by_wrapper %0 : $S to %1 : $*T, init %2 : $F, set %3 : $G
23432343
// $S can be a value or address type
23442344
// $T must be the type of a property wrapper.
2345-
// $F must be a function type, taking $S as a single argument (or multiple arguments in case of a tuple) and returning $T
2346-
// $G must be a function type, taking $S as a single argument (or multiple arguments in case of a tuple) and without a return value
2345+
// $F must be a function type, taking $S as a single argument and returning $T
2346+
// $G must be a function type, taking $S as a single argument and with not return value
23472347

23482348
Similar to the ``assign`` instruction, but the assignment is done via a
23492349
delegate.
@@ -3484,14 +3484,13 @@ has an escaping function type (not ``[on_stack]``) the closure context will be
34843484
allocated with retain count 1 and initialized to contain the values ``%1``,
34853485
``%2``, etc. The closed-over values will not be retained; that must be done
34863486
separately before the ``partial_apply``. The closure does however take ownership
3487-
of the partially applied arguments (except for ``@inout_aliasable`` parameters);
3488-
when the closure reference count reaches zero, the contained values will be
3489-
destroyed. If the ``partial_apply`` has a ``@noescape`` function type
3490-
(``partial_apply [on_stack]``) the closure context is allocated on the stack and
3491-
initialized to contain the closed-over values. The closed-over values are not
3492-
retained, lifetime of the closed-over values must be managed separately. The
3493-
lifetime of the stack context of a ``partial_apply [on_stack]`` must be
3494-
terminated with a ``dealloc_stack``.
3487+
of the partially applied arguments; when the closure reference count reaches
3488+
zero, the contained values will be destroyed. If the ``partial_apply`` has a
3489+
``@noescape`` function type (``partial_apply [on_stack]``) the closure context
3490+
is allocated on the stack and initialized to contain the closed-over values. The
3491+
closed-over values are not retained, lifetime of the closed-over values must be
3492+
managed separately. The lifetime of the stack context of a ``partial_apply
3493+
[on_stack]`` must be terminated with a ``dealloc_stack``.
34953494

34963495
If the callee is generic, all of its generic parameters must be bound by the
34973496
given substitution list. The arguments are given with these generic
@@ -3500,11 +3499,6 @@ type with the given substitutions applied. The generic parameters themselves
35003499
cannot be partially applied; all of them must be bound. The result is always
35013500
a concrete function.
35023501

3503-
If an address argument has ``@inout_aliasable`` convention, the closure
3504-
obtained from ``partial_apply`` will not own its underlying value.
3505-
The ``@inout_aliasable`` parameter convention is used when a ``@noescape``
3506-
closure captures an ``inout`` argument.
3507-
35083502
TODO: The instruction, when applied to a generic function,
35093503
currently implicitly performs abstraction difference transformations enabled
35103504
by the given substitutions, such as promoting address-only arguments and returns

branches/tensorflow/include/swift/AST/ASTContext.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,10 @@ class ASTContext final {
829829
/// \param IDC The context whose member decls should be lazily parsed.
830830
void parseMembers(IterableDeclContext *IDC);
831831

832+
/// Use the lazy parsers associated with the context to check whether the decl
833+
/// context has been parsed.
834+
bool hasUnparsedMembers(const IterableDeclContext *IDC) const;
835+
832836
/// Get the lazy function data for the given generic context.
833837
///
834838
/// \param lazyLoader If non-null, the lazy loader to use when creating the

0 commit comments

Comments
 (0)