Merge pull request #805 from capnproto/fix-maybe-move-from-ref

`Maybe<T>(Maybe<T&>&&)` should do a copy, not a move.

c++/src/kj/common-test.c++

@@ -50,6 +50,15 @@ struct Immovable {
   KJ_DISALLOW_COPY(Immovable);
 };
 
+struct CopyOrMove {
+  // Type that detects the difference between copy and move.
+  CopyOrMove(int i): i(i) {}
+  CopyOrMove(CopyOrMove&& other): i(other.i) { i = -1; }
+  CopyOrMove(const CopyOrMove&) = default;
+
+  int i;
+};
+
 TEST(Common, Maybe) {
   {
     Maybe<int> m = 123;
@@ -248,6 +257,15 @@ TEST(Common, Maybe) {
     m = nullptr;
     KJ_EXPECT(m == nullptr);
   }
+
+  {
+    // Test that initializing Maybe<T> from Maybe<T&>&& does a copy, not a move.
+    CopyOrMove x(123);
+    Maybe<CopyOrMove&> m(x);
+    Maybe<CopyOrMove> m2 = kj::mv(m);
+    KJ_EXPECT(KJ_ASSERT_NONNULL(m).i == 123);
+    KJ_EXPECT(KJ_ASSERT_NONNULL(m2).i == 123);
+  }
 }
 
 TEST(Common, MaybeConstness) {

c++/src/kj/common.h

@@ -1121,6 +1121,12 @@ public:
     }
   }
   template <typename U>
+  Maybe(Maybe<U&>&& other) {
+    KJ_IF_MAYBE(val, other) {
+      ptr.emplace(*val);
+    }
+  }
+  template <typename U>
   Maybe(const Maybe<U>& other) {
     KJ_IF_MAYBE(val, other) {
       ptr.emplace(*val);