Skip to content

[cxx-interop] Drop return values of +=, -=, *=, /= #61543

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
Oct 13, 2022
Merged

[cxx-interop] Drop return values of +=, -=, *=, /= #61543

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
9 changes: 9 additions & 0 deletions lib/ClangImporter/ImportType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2084,6 +2084,15 @@ ImportedType ClangImporter::Implementation::importFunctionReturnType(
clangDecl->hasAttr<clang::CFReturnsRetainedAttr>() ||
clangDecl->hasAttr<clang::CFReturnsNotRetainedAttr>());

// C++ operators +=, -=, *=, /= may return a reference to self. This is not
// idiomatic in Swift, let's drop these return values.
clang::OverloadedOperatorKind op = clangDecl->getOverloadedOperator();
if (op == clang::OverloadedOperatorKind::OO_PlusEqual ||
op == clang::OverloadedOperatorKind::OO_MinusEqual ||
op == clang::OverloadedOperatorKind::OO_StarEqual ||
op == clang::OverloadedOperatorKind::OO_SlashEqual)
return {SwiftContext.getVoidType(), false};

// Fix up optionality.
OptionalTypeKind OptionalityOfReturn;
if (clangDecl->hasAttr<clang::ReturnsNonNullAttr>()) {
Expand Down
1 change: 1 addition & 0 deletions test/Interop/Cxx/operators/member-inline-module-interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// CHECK: struct LoadableIntWrapper {
// CHECK: func successor() -> LoadableIntWrapper
// CHECK: static func - (lhs: inout LoadableIntWrapper, rhs: LoadableIntWrapper) -> LoadableIntWrapper
// CHECK: static func += (lhs: inout LoadableIntWrapper, rhs: LoadableIntWrapper)
// CHECK: mutating func callAsFunction() -> Int32
// CHECK: mutating func callAsFunction(_ x: Int32) -> Int32
// CHECK: mutating func callAsFunction(_ x: Int32, _ y: Int32) -> Int32
Expand Down
1 change: 1 addition & 0 deletions test/Interop/Cxx/operators/member-inline-typechecker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var lhs = LoadableIntWrapper(value: 42)
let rhs = LoadableIntWrapper(value: 23)

let resultPlus = lhs - rhs
lhs += rhs
let resultCall0 = lhs()
let resultCall1 = lhs(1)
let resultCall2 = lhs(1, 2)
Expand Down
8 changes: 2 additions & 6 deletions test/Interop/Cxx/operators/member-inline.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
//
// REQUIRES: executable_test
// TODO: Fix CxxShim for Windows.
// XFAIL: OS=windows-msvc

import MemberInline
import StdlibUnittest
Expand Down Expand Up @@ -42,20 +40,18 @@ OperatorsTestSuite.test("LoadableIntWrapper.plusEqual (inline)") {
var lhs = LoadableIntWrapper(value: 42)
let rhs = LoadableIntWrapper(value: 42)

let result = lhs += rhs
lhs += rhs

expectEqual(lhs.value, 84)
expectEqual(result.value, 84)
}

OperatorsTestSuite.test("LoadableIntWrapper.minusEqual (inline)") {
var lhs = LoadableIntWrapper(value: 42)
let rhs = LoadableIntWrapper(value: 42)

let result = lhs -= rhs
lhs -= rhs

expectEqual(lhs.value, 0)
expectEqual(result.value, 0)
}

OperatorsTestSuite.test("LoadableIntWrapper.unaryMinus (inline)") {
Expand Down
3 changes: 3 additions & 0 deletions test/Interop/Cxx/operators/non-member-inline-typechecker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ let resultExclaimEqual = lhs != rhs
let resultLessEqual = lhs <= rhs
let resultGreaterEqual = lhs >= rhs

var lhsMutable = LoadableIntWrapper(value: 42)
lhsMutable /= rhs

public func ==(ptr: UnsafePointer<UInt8>, count: Int) -> Bool {
let lhs = UnsafeBufferPointer<UInt8>(start: ptr, count: count)
let rhs = UnsafeBufferPointer<UInt8>(start: ptr, count: count)
Expand Down
6 changes: 2 additions & 4 deletions test/Interop/Cxx/operators/non-member-inline.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,20 +155,18 @@ OperatorsTestSuite.test("slash equal (/=)") {
var lhs = LoadableIntWrapper(value: 8)
let rhs = LoadableIntWrapper(value: 2)

let result = lhs /= rhs
lhs /= rhs

expectEqual(lhs.value, 4)
expectEqual(result.value, 4)
}

OperatorsTestSuite.test("star equal (*=)") {
var lhs = LoadableIntWrapper(value: 8)
let rhs = LoadableIntWrapper(value: 2)

let result = lhs *= rhs
lhs *= rhs

expectEqual(lhs.value, 16)
expectEqual(result.value, 16)
}

OperatorsTestSuite.test("amp amp (&&)") {
Expand Down