assert on self move assignment

Test Plan: ran tests in dbg Reviewed By: tudorb@fb.com FB internal diff: D696964
facebook · Mar 19, 2013 · 2a80dba · 2a80dba
1 parent ce80e19
commit 2a80dba
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/folly/FBString.h b/folly/FBString.h
@@ -1042,8 +1042,8 @@ class basic_fbstring {
   ~basic_fbstring() {
   }
 
-  basic_fbstring& operator=(const basic_fbstring & lhs) {
-    if (&lhs == this) {
+  basic_fbstring& operator=(const basic_fbstring& lhs) {
+    if (FBSTRING_UNLIKELY(&lhs == this)) {
       return *this;
     }
     auto const oldSize = size();
@@ -1066,6 +1066,8 @@ class basic_fbstring {
 
   // Move assignment
   basic_fbstring& operator=(basic_fbstring&& goner) {
+    // Self move assignment is illegal, see 17.6.4.9 for the explanation
+    assert(&goner != this);
     // No need of this anymore
     this->~basic_fbstring();
     // Move the goner into this