[rebranch] OptTable::ParseOneArg now returns a std::unique_ptr

bnbarham · bnbarham · commit edfe2cb4cc78 · 2021-11-13T17:04:29.000+10:00
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
@@ -1157,7 +1157,8 @@ parseArgsUntil(const llvm::opt::OptTable& Opts,
     }
 
     unsigned Prev = Index;
-    Arg *A = Opts.ParseOneArg(*Args, Index, FlagsToInclude, FlagsToExclude);
+    std::unique_ptr<Arg> A = Opts.ParseOneArg(*Args, Index, FlagsToInclude,
+                                              FlagsToExclude);
     assert(Index > Prev && "Parser failed to consume argument.");
 
     // Check for missing argument error.
@@ -1169,7 +1170,7 @@ parseArgsUntil(const llvm::opt::OptTable& Opts,
       break;
     }
 
-    Args->append(A);
+    Args->append(A.release());
 
     if (CheckUntil && A->getOption().matches(UntilOption)) {
       if (Index < End)

Original file line number	Diff line number	Diff line change
`@@ -1157,7 +1157,8 @@ parseArgsUntil(const llvm::opt::OptTable& Opts,`
`1157`	`1157`	`}`
`1158`	`1158`
`1159`	`1159`	`unsigned Prev = Index;`
`1160`		`- Arg A = Opts.ParseOneArg(Args, Index, FlagsToInclude, FlagsToExclude);`
	`1160`	`+ std::unique_ptr<Arg> A = Opts.ParseOneArg(*Args, Index, FlagsToInclude,`
	`1161`	`+ FlagsToExclude);`
`1161`	`1162`	`assert(Index > Prev && "Parser failed to consume argument.");`
`1162`	`1163`
`1163`	`1164`	`// Check for missing argument error.`
`@@ -1169,7 +1170,7 @@ parseArgsUntil(const llvm::opt::OptTable& Opts,`
`1169`	`1170`	`break;`
`1170`	`1171`	`}`
`1171`	`1172`
`1172`		`- Args->append(A);`
	`1173`	`+ Args->append(A.release());`
`1173`	`1174`
`1174`	`1175`	`if (CheckUntil && A->getOption().matches(UntilOption)) {`
`1175`	`1176`	`if (Index < End)`