Merge 2020-05-19 into tensorflow by asuhan · Pull Request #31891 · swiftlang/swift

asuhan · 2020-05-19T17:47:23Z

No description provided.

Now that the parser no longer constructs invalid TypeReprs for if-lets, printing the annotation here will always reflect what the user actually wrote. rdar://62894516

Fixes <rdar://problem/63195315>

Const-Qualify LangOptions and TypeCheckerOptions

standard library: remove use of `LLVM.h` in the compatibility

runtime: namespace SmallVectorImpl for inline namespace

[overlay] Remove unnecessary Optional unwrapping

The runtime has an embedded copy of LLVMSupport which provides `llvm::function_ref` as `__swift::__runtime::llvm::function_ref`. This forward declaration can cause the inlined namespaces to be ignored. Remove the forward declaration for the runtime.

…ad of expression

These line numbers are consumed by LLDB and stored in the Declaration object, but as far as I can tell no user-facing feature relies on this. Removing the line number can reduce the churn for incremental builds significantly, since whitespace changes in one file may trigger a recompilation of any file that uses a type declared below the whitespace change. <rdar://problem/63156560>

rdar://problem/60982638

in expression context analysis. They are simply not necessary. rdar://problem/60982638

Should fix SR-12760.

They both do essentially the same thing, with the single-file request being the single-element case of the whole-module request, with only the call to `getAllForModule` really caring about the difference.

Remove The Parser Hack For If-Let

runtime: remove forward declaration of `llvm::function_ref`

…hors [TypeChecker/Doc] NFC: Locators now refer to a generic AST node inste…

…ing a toolchain" This reverts commit a49e872. This had the intended effect, but it also means we cannot run the tests on the pakcage bots anymore, which is not desirable.

AssociatedTypeInference: Allow inference in compatible constrained extensions

asuhan · 2020-05-19T21:31:36Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-19T21:35:28Z

@swift-ci Please clean test TensorFlow.

asuhan · 2020-05-19T22:53:03Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-19T22:53:48Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-19T23:18:53Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-19T23:19:32Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-20T02:55:42Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-20T02:56:04Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-24T18:23:21Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-24T18:23:43Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-24T18:24:28Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-26T21:16:56Z

+                "llbuild": "swift-DEVELOPMENT-SNAPSHOT-2020-05-18-a",
                "swift-tools-support-core": "0.0.1",
-                "swiftpm": "swift-DEVELOPMENT-SNAPSHOT-2020-05-11-a",
+                "swiftpm": "swift-DEVELOPMENT-SNAPSHOT-2020-05-20-a",


@ematejska NB: I needed to adjust the swiftpm dependency to pick up swiftlang/swift-package-manager@3f55ea6.

Ok, got it.

asuhan · 2020-05-26T21:18:11Z

        },
        "yams": {
-            "remote": { "id": "jpsim/Yams" }
+            "remote": { "id": "asuhan/Yams" }


@ematejska Required until jpsim/Yams#260 (or a better version of it) is merged and released.

Got it. This seems like the right decision for now to me.

asuhan · 2020-05-26T21:19:40Z

@ematejska PTAL, only two snags in utils/update_checkout/update-checkout-config.json, rest of the merge is pristine tensorflow-stage from our merge bot.

asuhan · 2020-05-26T21:20:01Z

@swift-ci Please clean test TensorFlow

asuhan · 2020-05-26T21:21:15Z

@swift-ci Please clean test TensorFlow

ematejska

Seems like the right tradeoff to me to use the forked yams for now.

ematejska · 2020-05-26T23:30:23Z

        },
        "yams": {
-            "remote": { "id": "jpsim/Yams" }
+            "remote": { "id": "asuhan/Yams" }


Got it. This seems like the right decision for now to me.

CodaFi and others added 30 commits May 13, 2020 12:34

Remove an Unnecessary Workaround

ea2084e

Now that the parser no longer constructs invalid TypeReprs for if-lets, printing the annotation here will always reflect what the user actually wrote. rdar://62894516

Merge pull request #31758 from akyrtzi/parser-lib-terminfo

8c0e493

Merge remote-tracking branch 'github/master' into HEAD

8d626d1

Remove stray backtick in doc comment.

7108978

Fixes <rdar://problem/63195315>

Merge pull request #31690 from hamishknight/guilt-by-association

f90e030

Merge remote-tracking branch 'github/master' into HEAD

48a02cf

Merge pull request #31721 from CodaFi/const-of-proportionality

d82880a

Const-Qualify LangOptions and TypeCheckerOptions

Merge pull request #31757 from compnerd/forwards-is-backwards

adad8ec

standard library: remove use of `LLVM.h` in the compatibility

Merge pull request #31759 from compnerd/shared-inline-spaces

f7df8e7

runtime: namespace SmallVectorImpl for inline namespace

Merge pull request #31687 from ApolloZhu/patch-1

d8f5b20

[overlay] Remove unnecessary Optional unwrapping

[TypeChecker/Doc] NFC: Locators now refer to a generic AST node inste…

b1ee283

…ad of expression

Merge remote-tracking branch 'github/master' into HEAD

0de59d2

Merge remote-tracking branch 'github/master' into HEAD

a97417d

clang-format IRGenDebugInfo.

633f9e1

[CodeCompletion] Handle "KeyPath as function" thunk in SanitizeExpr

32bd377

rdar://problem/60982638

[CodeCompletion] Avoid re-typechcking pre-checked expressions

3337d7b

in expression context analysis. They are simply not necessary. rdar://problem/60982638

Make the lazy assignment of an assoociated type/wtable atomic.

6200df1

Should fix SR-12760.

[SILGen] Assert the SourceFile has been type-checked

9a940a7

[SILGen] Merge the two SILGen requests

a3660f2

They both do essentially the same thing, with the single-file request being the single-element case of the whole-module request, with only the call to `getAllForModule` really caring about the difference.

Merge pull request #31760 from CodaFi/patternak

ea516bc

Remove The Parser Hack For If-Let

Merge remote-tracking branch 'github/master' into HEAD

8d088be

Merge pull request #31769 from compnerd/referencing-undefined

4298dc5

runtime: remove forward declaration of `llvm::function_ref`

Merge remote-tracking branch 'github/master' into HEAD

6cbc2e9

Merge pull request #31771 from xedin/adjust-typechecker-doc-about-anc…

9f591c9

…hors [TypeChecker/Doc] NFC: Locators now refer to a generic AST node inste…

Merge remote-tracking branch 'github/master' into HEAD

f952e81

Revert "[presets] Do not copy Swift resource dir into LLDB when build…

d46eb47

…ing a toolchain" This reverts commit a49e872. This had the intended effect, but it also means we cannot run the tests on the pakcage bots anymore, which is not desirable.

Merge pull request #30712 from AnthonyLatsis/constrained-inference

c3d93d2

AssociatedTypeInference: Allow inference in compatible constrained extensions

Merge remote-tracking branch 'github/master' into HEAD

6947c6a

asuhan force-pushed the tensorflow-merge branch from 9a65ab0 to c609fc9 Compare May 19, 2020 21:30

asuhan force-pushed the tensorflow-merge branch from 6f12c59 to 76e2592 Compare May 19, 2020 23:18

asuhan force-pushed the tensorflow-merge branch 3 times, most recently from 988e4a5 to c609fc9 Compare May 22, 2020 04:35

update-checkout-config.json: adjust for tensorflow merge

8f0f0f5

asuhan force-pushed the tensorflow-merge branch from 428229b to 10b3972 Compare May 24, 2020 17:33

Use fork of yams

7148362

asuhan force-pushed the tensorflow-merge branch from 10b3972 to 7148362 Compare May 26, 2020 21:14

asuhan requested a review from ematejska May 26, 2020 21:15

asuhan commented May 26, 2020

View reviewed changes

ematejska approved these changes May 26, 2020

View reviewed changes

asuhan mentioned this pull request May 26, 2020

Fix Yams dependency tensorflow/swift#469

Open

asuhan merged commit e0e31e8 into tensorflow May 27, 2020

asuhan deleted the tensorflow-merge branch May 27, 2020 05:44

Conversation

asuhan commented May 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asuhan commented May 19, 2020

Uh oh!

asuhan commented May 19, 2020

Uh oh!

asuhan commented May 19, 2020

Uh oh!

asuhan commented May 19, 2020

Uh oh!

asuhan commented May 19, 2020

Uh oh!

asuhan commented May 19, 2020

Uh oh!

asuhan commented May 20, 2020

Uh oh!

asuhan commented May 20, 2020

Uh oh!

asuhan commented May 24, 2020

Uh oh!

asuhan commented May 24, 2020

Uh oh!

asuhan commented May 24, 2020

Uh oh!

asuhan May 26, 2020

Choose a reason for hiding this comment

Uh oh!

ematejska May 26, 2020

Choose a reason for hiding this comment

Uh oh!

asuhan May 26, 2020

Choose a reason for hiding this comment

Uh oh!

ematejska May 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

asuhan commented May 26, 2020

Uh oh!

asuhan commented May 26, 2020

Uh oh!

asuhan commented May 26, 2020

Uh oh!

ematejska left a comment

Choose a reason for hiding this comment

Uh oh!

ematejska May 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

asuhan commented May 19, 2020 •

edited

Loading

ematejska May 26, 2020 •

edited

Loading

ematejska May 26, 2020 •

edited

Loading