Skip to content

[BitwiseCopyable] Remove bespoke diagnostic. #72856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2024
Merged

[BitwiseCopyable] Remove bespoke diagnostic. #72856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions include/swift/AST/DiagnosticsSema.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7673,8 +7673,6 @@ ERROR(non_bitwise_copyable_type_indirect_enum_element,none,
"enum with indirect case cannot conform to 'BitwiseCopyable'", ())
NOTE(note_non_bitwise_copyable_type_indirect_enum_element,none,
"indirect case is here", ())
ERROR(non_bitwise_copyable_type_noncopyable,none,
"noncopyable type cannot conform to 'BitwiseCopyable'", ())
ERROR(non_bitwise_copyable_type_cxx_nontrivial,none,
"non-trivial C++ type cannot conform to 'BitwiseCopyable'", ())
ERROR(non_bitwise_copyable_c_type_nontrivial,none,
Expand Down
7 changes: 0 additions & 7 deletions lib/Sema/TypeCheckBitwise.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,6 @@ static bool checkBitwiseCopyableInstanceStorage(NominalTypeDecl *nominal,
assert(dc->getParentModule()->getASTContext().getProtocol(
KnownProtocolKind::BitwiseCopyable));

if (dc->mapTypeIntoContext(nominal->getDeclaredInterfaceType())->isNoncopyable()) {
if (!isImplicit(check)) {
nominal->diagnose(diag::non_bitwise_copyable_type_noncopyable);
}
return true;
}

if (isa<ClassDecl>(nominal)) {
if (!isImplicit(check)) {
nominal->diagnose(diag::non_bitwise_copyable_type_class);
Expand Down
12 changes: 6 additions & 6 deletions test/Sema/bitwise_copyable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
// RUN: -enable-builtin-module \
// RUN: -debug-diagnostic-names

// XFAIL: *

//==============================================================================
//===========================DEPENDENCY-FREE TESTS=(BEGIN)===================={{
//==============================================================================
Expand Down Expand Up @@ -145,7 +143,7 @@ func passInt(_ i: Int) { take3(i) }

func passTupleIntInt(_ t: (Int, Int)) { take3(t) }

func passFWI<T : FixedWidthInteger>(_ t: T) { take3(t) }


func passFloat(_ f: Float) { take3(f) }

Expand Down Expand Up @@ -190,9 +188,11 @@ struct S_Explicit_With_2_BitwiseCopyable_Generic_Optional<T : _BitwiseCopyable>
var o2: T?
}

struct S_Explicit_Nonescapable : ~Escapable, _BitwiseCopyable {} // expected-error{{non_bitwise_copyable_type_nonescapable}}
// TODO: When the standard library is built with NonescapableTypes, this should
// be uncommented.
//struct S_Explicit_Nonescapable : ~Escapable, _BitwiseCopyable {}

struct S_Explicit_Noncopyable : ~Copyable, _BitwiseCopyable {} // expected-error{{non_bitwise_copyable_type_noncopyable}}
struct S_Explicit_Noncopyable : ~Copyable, _BitwiseCopyable {} // expected-error{{type_does_not_conform}}

struct S_Implicit_Nonescapable : ~Escapable {}

Expand Down Expand Up @@ -256,7 +256,7 @@ func passUnsafeContinuation<T : _BitwiseCopyable, U : Error & _BitwiseCopyable>(
take4(c)
}

extension UnsafeContinuation : @retroactive _BitwiseCopyable {}
extension UnsafeContinuation : @retroactive _BitwiseCopyable {} // expected-error{{conformance to 'BitwiseCopyable' must occur in the same module as generic struct 'UnsafeContinuation'}}

//==============================================================================
//========================_CONCURRENCY-DEPENDENCY TESTS=(END)=================}}
Expand Down