Revert "[dsymutil] MSVC does generate move constructors, but it should accept to default them"

fredriss · fredriss · commit 497ca634e1a3 · 2015-03-05T05:29:05.000Z
This reverts commit r231350. It turns out MSVC doesn't generate implicit move constructors and also doesn't accept to default them... See for example http://lab.llvm.org:8011/builders/lldb-x86-windows-msvc/builds/2786 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231351 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp
@@ -65,7 +65,10 @@ class CompileUnit {
   }
 
   // Workaround MSVC not supporting implicit move ops
-  CompileUnit(CompileUnit &&RHS) = default;
+  CompileUnit(CompileUnit &&RHS)
+      : OrigUnit(RHS.OrigUnit), Info(std::move(RHS.Info)),
+        CUDie(std::move(RHS.CUDie)), StartOffset(RHS.StartOffset),
+        NextUnitOffset(RHS.NextUnitOffset) {}
 
   DWARFUnit &getOrigUnit() const { return OrigUnit; }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,10 @@ class CompileUnit {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// Workaround MSVC not supporting implicit move ops`
`68`		`- CompileUnit(CompileUnit &&RHS) = default;`
	`68`	`+ CompileUnit(CompileUnit &&RHS)`
	`69`	`+ : OrigUnit(RHS.OrigUnit), Info(std::move(RHS.Info)),`
	`70`	`+ CUDie(std::move(RHS.CUDie)), StartOffset(RHS.StartOffset),`
	`71`	`+ NextUnitOffset(RHS.NextUnitOffset) {}`
`69`	`72`
`70`	`73`	`DWARFUnit &getOrigUnit() const { return OrigUnit; }`
`71`	`74`