From f0db2c761bfb2e7148d026235ca9799c3041dea3 Mon Sep 17 00:00:00 2001
From: Evgeny Mankov <evgeny.mankov@gmail.com>
Date: Mon, 13 Jan 2020 18:49:28 +0300
Subject: [PATCH] [HIPIFY][fix] Add "--" separator in-place if needed

---
 hipify-clang/src/main.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/hipify-clang/src/main.cpp b/hipify-clang/src/main.cpp
index fe798091c4..c75c24b066 100644
--- a/hipify-clang/src/main.cpp
+++ b/hipify-clang/src/main.cpp
@@ -158,16 +158,6 @@ void appendArgumentsAdjusters(ct::RefactoringTool &Tool, const std::string &sSou
   Tool.appendArgumentsAdjuster(ct::getClangSyntaxOnlyAdjuster());
 }
 
-void addSeparatorIfNeeded(int& argc, const char** argv) {
-  std::vector<const char*> new_argv(argv, argv + argc);
-  if (std::find(new_argv.begin(), new_argv.end(), std::string("--")) == new_argv.end()) {
-    new_argv.push_back("--");
-    new_argv.push_back(nullptr);
-    argv = new_argv.data();
-    argc++;
-  }
-}
-
 bool generatePython() {
   bool bToRoc = TranslateToRoc;
   TranslateToRoc = true;
@@ -177,7 +167,13 @@ bool generatePython() {
 }
 
 int main(int argc, const char **argv) {
-  addSeparatorIfNeeded(argc, argv);
+  std::vector<const char*> new_argv(argv, argv + argc);
+  if (std::find(new_argv.begin(), new_argv.end(), std::string("--")) == new_argv.end()) {
+    new_argv.push_back("--");
+    new_argv.push_back(nullptr);
+    argv = new_argv.data();
+    argc++;
+  }
   llcompat::PrintStackTraceOnErrorSignal();
   ct::CommonOptionsParser OptionsParser(argc, argv, ToolTemplateCategory, llvm::cl::ZeroOrMore);
   if (!llcompat::CheckCompatibility()) {