Emit bind optional fixes #15248

gottesmm · 2018-03-14T23:26:01Z

This fixes the remaining issues with bind optional by changing select_enum usage to switch_enum.

rdar://34222540

gottesmm · 2018-03-14T23:35:59Z

(doing a quick rebase)

gottesmm · 2018-03-14T23:43:23Z

@swift-ci smoke test and merge

gottesmm · 2018-03-14T23:43:33Z

@swift-ci smoke test and merge

gottesmm · 2018-03-14T23:43:39Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T05:31:16Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T05:31:18Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T05:31:33Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T21:13:16Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T21:13:20Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T21:13:24Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T21:13:27Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T21:13:29Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T21:13:33Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T21:13:51Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T22:45:46Z

... I guess I need to update the linux one separately. = /.

gottesmm · 2018-03-15T23:31:55Z

Lets try this one last time.

gottesmm · 2018-03-15T23:32:01Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T23:32:03Z

@swift-ci smoke test and merge

gottesmm · 2018-03-15T23:32:27Z

@swift-ci smoke test and merge

gottesmm · 2018-03-16T00:28:02Z

... introduced a merge conflict on my own branch sigh.

…eFullExpr as movable rvalues. This fits more with the notion of the API, that the user is being given a scope that was already setup for them and that they must decide when to pop.

….None cases. I also used it to clean up a few uses of SwitchEnumBuilder.

… dest continuation.

…reachableExit from the Switch Case Scope. This will allow me to enforce with an assert that the switch case scope is always exitted in an explicit way.

… a select_enum.

gottesmm · 2018-03-16T00:29:31Z

@swift-ci smoke test and merge

gottesmm · 2018-03-16T00:29:33Z

@swift-ci smoke test and merge

gottesmm · 2018-03-16T00:29:37Z

@swift-ci smoke test and merge

gottesmm · 2018-03-16T00:29:41Z

@swift-ci smoke test and merge

gottesmm · 2018-03-16T00:29:46Z

@swift-ci smoke test and merge

gottesmm · 2018-03-16T00:29:53Z

@swift-ci smoke test and merge

gottesmm · 2018-03-16T00:30:01Z

@swift-ci smoke test and merge

davezarzycki · 2018-03-16T20:38:15Z

Hi @gottesmm – Commit dde4f58625d2bee728667654c5a5b5ac5a826b17 broke a test on my Linux box. You can find the test output here:

http://znu.io/opaque_values_silgen.swift.out

And the output from lit here:

/home/dave/s/u/tools/swift/test/SILGen/opaque_values_silgen.swift:822:11: error: expected string not found in input
// CHECK: [[SENUM:%.*]] = select_enum [[COPY__ARG]]
          ^
<stdin>:1440:21: note: scanning from here
 %5 = copy_value %4 : $Optional<@callee_guaranteed () -> @out T> // users: %6, %8, %13
                    ^
<stdin>:1440:21: note: with variable "COPY__ARG" equal to "%5"
 %5 = copy_value %4 : $Optional<@callee_guaranteed () -> @out T> // users: %6, %8, %13
                    ^
<stdin>:1456:2: note: possible intended match here
 %13 = unchecked_enum_data %5 : $Optional<@callee_guaranteed () -> @out T>, #Optional.some!enumelt.1 // users: %14, %16, %18
 ^

gottesmm · 2018-03-16T23:42:38Z

I wonder why it didn't trigger on the bots.

davezarzycki · 2018-03-16T23:53:36Z

I'm not running the same distribution of Linux (Fedora versus Ubuntu), which could cause tiny differences.

gottesmm · 2018-03-17T00:14:26Z

@davezarzycki Can you provide more information about the OS you are using. I want to try and reproduce. What version of Fedora are you using, versions of tools/etc.

davezarzycki · 2018-03-17T00:23:18Z

Just a bit. Let me eliminate some variables first. If you really want to go down this route, you can start by installing Fedora 27: https://getfedora.org/en/workstation/download/

Then sudo dnf update to install updates, and sudo dnf install clang lldb lld libcxx libcxx-devel cmake ninja-build libuuid libuuid-devel libicu libicu-devel to get ensure that various LLVM goodies and dependencies are installed. You can use dnf search to find packages that you need that aren't installed.

davezarzycki · 2018-03-17T01:05:19Z

Ugh. My first few guesses were wrong. I think this is one of those rare build-script versus unified build bugs. Please hold off while I dig further.

davezarzycki · 2018-03-17T01:49:38Z

Okay, apparently the opaque_values_silgen.swift test assumes -DSWIFT_STDLIB_ENABLE_RESILIENCE=TRUE. Is -DSWIFT_STDLIB_ENABLE_RESILIENCE=FALSE no longer supported?

davezarzycki · 2018-03-17T02:06:07Z

In either case, sorry for the noise @gottesmm!

gottesmm · 2018-03-17T16:11:43Z

@davezarzycki No worries! = )

gottesmm force-pushed the emit_bind_optional_fixes branch from fd0515b to 15e1a4f Compare March 14, 2018 23:27

gottesmm force-pushed the emit_bind_optional_fixes branch from 15e1a4f to 439ee4e Compare March 14, 2018 23:43

gottesmm force-pushed the emit_bind_optional_fixes branch from 439ee4e to e3dc1e7 Compare March 15, 2018 05:31

gottesmm force-pushed the emit_bind_optional_fixes branch from e3dc1e7 to 9ee55a4 Compare March 15, 2018 21:13

gottesmm force-pushed the emit_bind_optional_fixes branch from 9ee55a4 to c6e651f Compare March 15, 2018 23:31

gottesmm added 5 commits March 15, 2018 17:28

[silgen] Make NormalCaseHandler and DefaultCaseHandler take SwitchCas…

6b2ca79

…eFullExpr as movable rvalues. This fits more with the notion of the API, that the user is being given a scope that was already setup for them and that they must decide when to pop.

[silgen] Add helper methods to SwitchEnumBuilder for creating .Some, …

aa9b278

….None cases. I also used it to clean up a few uses of SwitchEnumBuilder.

[+0-all-args] Teach SwitchEnumBuilder how to handle cases with a jump…

797fe60

… dest continuation.

[+0-all-args] When emitting for each statements, make sure to call un…

a92f617

…reachableExit from the Switch Case Scope. This will allow me to enforce with an assert that the switch case scope is always exitted in an explicit way.

[+0-all-args] Change emitBindOptional to use a switch_enum instead of…

dde4f58

… a select_enum.

gottesmm force-pushed the emit_bind_optional_fixes branch from c6e651f to dde4f58 Compare March 16, 2018 00:29

swift-ci merged commit 6df106e into swiftlang:master Mar 16, 2018

gottesmm deleted the emit_bind_optional_fixes branch March 16, 2018 01:16

davezarzycki mentioned this pull request Mar 17, 2018

[CMake] Unbreak unified builds #15318

Closed

Emit bind optional fixes #15248

Emit bind optional fixes #15248

Uh oh!

Conversation

gottesmm commented Mar 14, 2018

Uh oh!

gottesmm commented Mar 14, 2018

Uh oh!

gottesmm commented Mar 14, 2018

Uh oh!

gottesmm commented Mar 14, 2018

Uh oh!

gottesmm commented Mar 14, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 15, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

davezarzycki commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 16, 2018

Uh oh!

davezarzycki commented Mar 16, 2018

Uh oh!

gottesmm commented Mar 17, 2018

Uh oh!

davezarzycki commented Mar 17, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

davezarzycki commented Mar 17, 2018

Uh oh!

davezarzycki commented Mar 17, 2018

Uh oh!

davezarzycki commented Mar 17, 2018

Uh oh!

gottesmm commented Mar 17, 2018

Uh oh!

Uh oh!

davezarzycki commented Mar 17, 2018 •

edited

Loading