C++ Levitation, Levitation Driver: Fixed llvm#34: added use of clang driver for instantiation stage.

Author: Stepan Dyatkovskiy

clang/lib/Levitation/Driver/Driver.cpp

@@ -385,10 +385,9 @@ class Commands {
         bool verbose,
         bool dryRun
     ) {
-      auto Cmd = getBase(BinDir, PrecompiledPreamble, verbose, dryRun);
+      auto Cmd = getClangXXCommand(BinDir, verbose, dryRun);
       Cmd
-      .addArg("-flevitation-build-decl")
-      .addArg("-emit-pch");
+      .addArg("-cppl-inst-decl");
       return Cmd;
     }
 
@@ -398,10 +397,9 @@ class Commands {
         bool verbose,
         bool dryRun
     ) {
-      auto Cmd = getBase(BinDir, PrecompiledPreamble, verbose, dryRun);
+      auto Cmd = getClangXXCommand(BinDir, verbose, dryRun);
       Cmd
-      .addArg("-flevitation-build-object")
-      .addArg("-emit-obj");
+      .addArg("-cppl-compile");
       return Cmd;
     }
     static CommandInfo getCompileSrc(
@@ -450,6 +448,12 @@ class Commands {
       return *this;
     }
 
+    CommandInfo& addKVArgEqIfNotEmpty(StringRef Arg, StringRef Value) {
+      if (Value.size())
+        addKVArgEq(Arg, Value);
+      return *this;
+    }
+
     template <typename ValuesT>
     CommandInfo& addArgs(const ValuesT& Values) {
       for (const auto &Value : Values) {
@@ -636,7 +640,8 @@ class Commands {
     auto ExecutionStatus = CommandInfo::getInstDecl(
         BinDir, PrecompiledPreamble, Verbose, DryRun
     )
-    .addKVArgsEq("-levitation-dependency", Deps)
+    .addKVArgEqIfNotEmpty("-cppl-include-preamble", PrecompiledPreamble)
+    .addKVArgsEq("-cppl-include-dependency", Deps)
     .addArgs(ExtraArgs)
     .addArg(InputObject)
     .addKVArgSpace("-o", OutDeclASTFile)
@@ -665,7 +670,8 @@ class Commands {
     auto ExecutionStatus = CommandInfo::getInstObj(
         BinDir, PrecompiledPreamble, Verbose, DryRun
     )
-    .addKVArgsEq("-levitation-dependency", Deps)
+    .addKVArgEqIfNotEmpty("-cppl-include-preamble", PrecompiledPreamble)
+    .addKVArgsEq("-cppl-include-dependency", Deps)
     .addArgs(ExtraArgs)
     .addArg(InputObject)
     .addKVArgSpace("-o", OutObjFile)
@@ -721,7 +727,7 @@ class Commands {
     auto ExecutionStatus = CommandInfo::getCompileSrc(
         BinDir, PrecompiledPreamble, Verbose, DryRun
     )
-    .addKVArgsEq("-levitation-dependency", Deps)
+    .addKVArgsEq("-cppl-include-dependency", Deps)
     .addArgs(ExtraParseArgs)
     .addArgs(ExtraCodeGenArgs)
     .addArg(InputObject)