Merge pull request swiftlang#61269 from zoecarver/plus-equals

[cxx-interop] Add plus-equal, minus-equal, star-equal, slash-equal operators.

Author: zoecarver

lib/ClangImporter/ImportName.cpp

@@ -1858,6 +1858,10 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
     case clang::OverloadedOperatorKind::OO_Minus:
     case clang::OverloadedOperatorKind::OO_Star:
     case clang::OverloadedOperatorKind::OO_Slash:
+    case clang::OverloadedOperatorKind::OO_PlusEqual:
+    case clang::OverloadedOperatorKind::OO_MinusEqual:
+    case clang::OverloadedOperatorKind::OO_StarEqual:
+    case clang::OverloadedOperatorKind::OO_SlashEqual:
     case clang::OverloadedOperatorKind::OO_Percent:
     case clang::OverloadedOperatorKind::OO_Caret:
     case clang::OverloadedOperatorKind::OO_Amp:

test/Interop/Cxx/operators/Inputs/member-inline.h

@@ -7,6 +7,11 @@ struct LoadableIntWrapper {
     return LoadableIntWrapper{.value = value - rhs.value};
   }
 
+  LoadableIntWrapper operator+=(LoadableIntWrapper rhs) {
+    value += rhs.value;
+    return *this;
+  }
+
   int operator()() {
     return value;
   }
@@ -31,6 +36,11 @@ struct LoadableIntWrapper {
   friend LoadableIntWrapper operator-(const LoadableIntWrapper& obj) {
     return LoadableIntWrapper{.value = -obj.value};
   }
+
+  friend LoadableIntWrapper operator-=(LoadableIntWrapper& lhs, const LoadableIntWrapper& rhs) {
+    lhs.value -= rhs.value;
+    return lhs;
+  }
 };
 
 struct LoadableBoolWrapper {

test/Interop/Cxx/operators/Inputs/non-member-inline.h

@@ -65,6 +65,16 @@ inline bool operator>=(LoadableIntWrapper lhs, LoadableIntWrapper rhs) {
   return lhs.value != rhs.value;
 }
 
+inline LoadableIntWrapper operator/=(LoadableIntWrapper &lhs, LoadableIntWrapper rhs) {
+  lhs.value /= rhs.value;
+  return lhs;
+}
+
+inline LoadableIntWrapper operator*=(LoadableIntWrapper &lhs, LoadableIntWrapper rhs) {
+  lhs.value *= rhs.value;
+  return lhs;
+}
+
 struct LoadableBoolWrapper {
   bool value;
 };

test/Interop/Cxx/operators/member-inline.swift

@@ -38,6 +38,26 @@ OperatorsTestSuite.test("LoadableIntWrapper.equal (inline)") {
   expectTrue(result)
 }
 
+OperatorsTestSuite.test("LoadableIntWrapper.plusEqual (inline)") {
+  var lhs = LoadableIntWrapper(value: 42)
+  let rhs = LoadableIntWrapper(value: 42)
+
+  let result = 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
+
+  expectEqual(lhs.value, 0)
+  expectEqual(result.value, 0)
+}
+
 OperatorsTestSuite.test("LoadableIntWrapper.unaryMinus (inline)") {
   let lhs = LoadableIntWrapper(value: 42)
   let inverseLhs = -lhs;

test/Interop/Cxx/operators/non-member-inline.swift

@@ -151,6 +151,26 @@ OperatorsTestSuite.test("greater equal (>=)") {
   expectEqual(true, result)
 }
 
+OperatorsTestSuite.test("slash equal (/=)") {
+  var lhs = LoadableIntWrapper(value: 8)
+  let rhs = LoadableIntWrapper(value: 2)
+
+  let result = 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
+
+  expectEqual(lhs.value, 16)
+  expectEqual(result.value, 16)
+}
+
 OperatorsTestSuite.test("amp amp (&&)") {
   let lhs = LoadableBoolWrapper(value: true)
   let rhs = LoadableBoolWrapper(value: false)