Merge pull request #20248 from fredriss/try-merge-stable-in-5.0-branch

fredriss · web-flow · commit aa74aa6baf9e · 2018-11-06T11:19:30.000-08:00
[RemoteAST] Fix typo in existential payload calculation.
diff --git a/lib/RemoteAST/RemoteAST.cpp b/lib/RemoteAST/RemoteAST.cpp
@@ -1183,7 +1183,7 @@ class RemoteASTContextConcreteImpl final : public RemoteASTContextImpl {
     if (!typeResult)
       return getFailure<std::pair<Type, RemoteAddress>>();
     return std::make_pair<Type, RemoteAddress>(std::move(typeResult),
-                                               std::move(object));
+                                               RemoteAddress(*pointerval));
   }
 
   Result<std::pair<Type, RemoteAddress>>

Original file line number	Diff line number	Diff line change
`@@ -1183,7 +1183,7 @@ class RemoteASTContextConcreteImpl final : public RemoteASTContextImpl {`
`1183`	`1183`	`if (!typeResult)`
`1184`	`1184`	`return getFailure<std::pair<Type, RemoteAddress>>();`
`1185`	`1185`	`return std::make_pair<Type, RemoteAddress>(std::move(typeResult),`
`1186`		`- std::move(object));`
	`1186`	`+ RemoteAddress(*pointerval));`
`1187`	`1187`	`}`
`1188`	`1188`
`1189`	`1189`	`Result<std::pair<Type, RemoteAddress>>`