Skip to content

Commit b923fff

Browse files
authored
Merge pull request swiftlang#40398 from gottesmm/pr-f8911884eb578d2bdb9cc040ac868b7a93f6049d
2 parents b553a92 + b22d68a commit b923fff

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

include/swift/AST/DiagnosticsSIL.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,8 +741,8 @@ NOTE(sil_movekillscopyablevalue_use_here, none,
741741
NOTE(sil_movekillscopyablevalue_value_consumed_in_loop, none,
742742
"cyclic move here. move will occur multiple times in the loop", ())
743743
ERROR(sil_movekillscopyablevalue_move_applied_to_unsupported_move, none,
744-
"_move applied to value that the compiler does not know how to check. "
745-
"Please file a bug or an enhancement request!", ())
744+
"_move applied to value that the compiler does not supporting checking.",
745+
())
746746

747747
#define UNDEFINE_DIAGNOSTIC_MACROS
748748
#include "DefineDiagnosticMacros.h"

test/SILOptimizer/move_operator_kills_copyable_values.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,24 +234,24 @@ public class KlassPair {
234234
// TODO: Emit a better error here! We should state that we are applying _move to
235235
// a class field and that is illegal.
236236
public func performMoveOnOneEltOfKlassPair(_ p: KlassPair) {
237-
let _ = _move(p.x) // expected-error {{_move applied to value that the compiler does not know how to check. Please file a bug or an enhancement request!}}
237+
let _ = _move(p.x) // expected-error {{_move applied to value that the compiler does not supporting checking.}}
238238
nonConsumingUse(p.y)
239239
}
240240

241241
let myLetGlobal = Klass()
242242
var myVarGlobal = Klass()
243243

244244
public func performMoveOnVarGlobalError() {
245-
let _ = _move(myVarGlobal) // expected-error {{_move applied to value that the compiler does not know how to check. Please file a bug or an enhancement request!}}
245+
let _ = _move(myVarGlobal) // expected-error {{_move applied to value that the compiler does not supporting checking.}}
246246
}
247247

248248
// TODO: Support vars
249249
public func performMoveOnVarError() {
250250
var k = myVarGlobal
251-
let _ = _move(k) // expected-error {{_move applied to value that the compiler does not know how to check. Please file a bug or an enhancement request!}}
251+
let _ = _move(k) // expected-error {{_move applied to value that the compiler does not supporting checking.}}
252252
k = myVarGlobal
253253
}
254254

255255
public func performMoveOnLetGlobalError() {
256-
let _ = _move(myVarGlobal) // expected-error {{_move applied to value that the compiler does not know how to check. Please file a bug or an enhancement request!}}
256+
let _ = _move(myVarGlobal) // expected-error {{_move applied to value that the compiler does not supporting checking.}}
257257
}

0 commit comments

Comments
 (0)