Commit 11443f2

committed

[move-only] Avoid loc from func decl.

It's always the first line of the function, so try to do better.

1 parent eaf4560 commit 11443f2Copy full SHA for 11443f2

File tree

2 files changed

+15

-8

lines changed

lib/SILOptimizer/Mandatory
- MoveOnlyDiagnostics.cpp
test/SILOptimizer
- discard_checking.swift

2 files changed

+15

-8

lines changed

`‎lib/SILOptimizer/Mandatory/MoveOnlyDiagnostics.cpp‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`#include "MoveOnlyDiagnostics.h"`
`16`	`16`
	`17`	`+#include "swift/AST/Decl.h"`
`17`	`18`	`#include "swift/AST/DiagnosticsSIL.h"`
`18`	`19`	`#include "swift/AST/Stmt.h"`
`19`	`20`	`#include "swift/Basic/Defer.h"`
`@@ -226,6 +227,12 @@ void DiagnosticEmitter::emitMissingConsumeInDiscardingContext(`
`226`	`227`	`return true;`
`227`	`228`
`228`	`229`	`case SILLocation::RegularKind: {`
	`230`	`+ Decl *decl = loc.getAsASTNode<Decl>();`
	`231`	`+ if (decl && isa<AbstractFunctionDecl>(decl)) {`
	`232`	`+ // Having the function itself as a location results in a location at the`
	`233`	`+ // first line of the function. Find another location.`
	`234`	`+ return false;`
	`235`	`+ }`
`229`	`236`	`Stmt *stmt = loc.getAsASTNode<Stmt>();`
`230`	`237`	`if (!stmt)`
`231`	`238`	`return true; // For non-statements, assume it is exiting the func.`

`‎test/SILOptimizer/discard_checking.swift‎`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ struct Basics: ~Copyable {`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`- consuming func test8_stillMissingAConsume1(_ c: Color) throws { // expected-error {{must consume 'self' before exiting method that discards self}}`
	`168`	`+ consuming func test8_stillMissingAConsume1(_ c: Color) throws {`
`169`	`169`	`if case .red = c {`
`170`	`170`	`discard self // expected-note {{discarded self here}}`
`171`	`171`	`return`
`@@ -174,7 +174,7 @@ struct Basics: ~Copyable {`
`174`	`174`	`_ = consume self`
`175`	`175`	`fatalError("hi")`
`176`	`176`	`}`
`177`		`- }`
	`177`	`+ } // expected-error {{must consume 'self' before exiting method that discards self}}`
`178`	`178`
`179`	`179`	`consuming func test8_stillMissingAConsume2(_ c: Color) throws {`
`180`	`180`	`if case .red = c {`
`@@ -251,7 +251,7 @@ struct Basics: ~Copyable {`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
`254`		`- consuming func test11(_ c: Color) { // expected-error {{must consume 'self' before exiting method that discards self}}`
	`254`	`+ consuming func test11(_ c: Color) {`
`255`	`255`	`guard case .red = c else {`
`256`	`256`	`discard self // expected-note {{discarded self here}}`
`257`	`257`	`return`
`@@ -264,7 +264,7 @@ struct Basics: ~Copyable {`
`264`	`264`	`let x = self`
`265`	`265`	`self = x`
`266`	`266`	`mutator()`
`267`		`- }`
	`267`	`+ } // expected-error {{must consume 'self' before exiting method that discards self}}`
`268`	`268`
`269`	`269`	`consuming func test11_fixed(_ c: Color) {`
`270`	`270`	`guard case .red = c else {`
`@@ -328,13 +328,13 @@ struct Basics: ~Copyable {`
`328`	`328`	`_ = consume self`
`329`	`329`	`}`
`330`	`330`
`331`		`- consuming func test13(_ c: Color) async { // expected-error {{must consume 'self' before exiting method that discards self}}`
	`331`	`+ consuming func test13(_ c: Color) async {`
`332`	`332`	`guard case .red = c else {`
`333`	`333`	`discard self // expected-note {{discarded self here}}`
`334`	`334`	`return`
`335`	`335`	`}`
`336`	`336`	`await asyncer()`
`337`		`- }`
	`337`	`+ } // expected-error {{must consume 'self' before exiting method that discards self}}`
`338`	`338`
`339`	`339`	`consuming func test13_fixed(_ c: Color) async {`
`340`	`340`	`guard case .red = c else {`
`@@ -345,7 +345,7 @@ struct Basics: ~Copyable {`
`345`	`345`	`_ = consume self`
`346`	`346`	`}`
`347`	`347`
`348`		`- consuming func test14(_ c: Color) async { // expected-error {{must consume 'self' before exiting method that discards self}}`
	`348`	`+ consuming func test14(_ c: Color) async {`
`349`	`349`	`guard case .red = c else {`
`350`	`350`	`discard self // expected-note {{discarded self here}}`
`351`	`351`	`return`
`@@ -354,7 +354,7 @@ struct Basics: ~Copyable {`
`354`	`354`	`cont.resume()`
`355`	`355`	`}`
`356`	`356`	`print("back!")`
`357`		`- }`
	`357`	`+ } // expected-error {{must consume 'self' before exiting method that discards self}}`
`358`	`358`
`359`	`359`	`consuming func test14_fixed(_ c: Color) async {`
`360`	`360`	`guard case .red = c else {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 11443f2

File tree

2 files changed

2 files changed

`‎lib/SILOptimizer/Mandatory/MoveOnlyDiagnostics.cpp‎`

`‎test/SILOptimizer/discard_checking.swift‎`

0 commit comments