Merge pull request #325 from dcci/pessimizing

lattner · lattner · commit 866e3cfcc044 · 2015-12-07T20:17:54.000-08:00
[Sema/CSSolver] Moving a local object in return prevents copy elision.
diff --git a/lib/Sema/CSSolver.cpp b/lib/Sema/CSSolver.cpp
@@ -191,7 +191,7 @@ Solution ConstraintSystem::finalize(
     solution.OpenedExistentialTypes.insert(openedExistential);
   }
 
-  return std::move(solution);
+  return solution;
 }
 
 void ConstraintSystem::applySolution(const Solution &solution) {

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ Solution ConstraintSystem::finalize(`
`191`	`191`	`solution.OpenedExistentialTypes.insert(openedExistential);`
`192`	`192`	`}`
`193`	`193`
`194`		`- return std::move(solution);`
	`194`	`+ return solution;`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`void ConstraintSystem::applySolution(const Solution &solution) {`