Fix error handling in Options::Parse

tkrasnukha · tkrasnukha · commit f388d17d7cad · 2019-02-26T14:50:40.000Z
Moved `if (error.Fail())` to correct place to catch all faulty cases such as
"unknown or ambiguous option" which was ignored before.

llvm-svn: 354883
diff --git a/lldb/source/Interpreter/Options.cpp b/lldb/source/Interpreter/Options.cpp
@@ -1436,10 +1436,11 @@ llvm::Expected<Args> Options::Parse(const Args &args,
     } else {
       error.SetErrorStringWithFormat("invalid option with value '%i'", val);
     }
-    if (error.Fail())
-      return error.ToError();
   }
 
+  if (error.Fail())
+    return error.ToError();
+
   argv.erase(argv.begin(), argv.begin() + OptionParser::GetOptionIndex());
   return ReconstituteArgsAfterParsing(argv, args);
 }

Original file line number	Diff line number	Diff line change
`@@ -1436,10 +1436,11 @@ llvm::Expected<Args> Options::Parse(const Args &args,`
`1436`	`1436`	`} else {`
`1437`	`1437`	`error.SetErrorStringWithFormat("invalid option with value '%i'", val);`
`1438`	`1438`	`}`
`1439`		`- if (error.Fail())`
`1440`		`- return error.ToError();`
`1441`	`1439`	`}`
`1442`	`1440`
	`1441`	`+ if (error.Fail())`
	`1442`	`+ return error.ToError();`
	`1443`	`+`
`1443`	`1444`	`argv.erase(argv.begin(), argv.begin() + OptionParser::GetOptionIndex());`
`1444`	`1445`	`return ReconstituteArgsAfterParsing(argv, args);`
`1445`	`1446`	`}`