Merge pull request swiftlang#32 from aciidb0mb3r/accept-vector-args-clang-tool

[BuildSystem] Accept array of arguments in clang tool

Author: ddunbar

lib/BuildSystem/BuildSystem.cpp

@@ -1200,15 +1200,18 @@ class ShellTool : public Tool {
 
 class ClangShellCommand : public ExternalCommand {
   /// The compiler command to invoke.
-  std::string args;
+  std::vector<std::string> args;
 
   /// The path to the dependency output file, if used.
   std::string depsPath;
 
   virtual uint64_t getSignature() override {
-    uint64_t result = ExternalCommand::getSignature();
-    result ^= basic::hashString(args);
-    return result;
+    using llvm::hash_combine;
+    llvm::hash_code code = ExternalCommand::getSignature();
+    for (const auto& arg: args) {
+      code = hash_combine(code, arg);
+    }
+    return size_t(code);
   }
 
   bool processDiscoveredDependencies(BuildSystemCommandInterface& bsci,
@@ -1267,13 +1270,24 @@ class ClangShellCommand : public ExternalCommand {
   }
 
   virtual void getVerboseDescription(SmallVectorImpl<char> &result) override {
-    llvm::raw_svector_ostream(result) << args;
+    llvm::raw_svector_ostream os(result);
+    bool first = true;
+    for (const auto& arg: args) {
+      if (!first) os << " ";
+      first = false;
+      basic::appendShellEscapedString(os, arg);
+    }
   }
 
   virtual bool configureAttribute(const ConfigureContext& ctx, StringRef name,
                                   StringRef value) override {
     if (name == "args") {
-      args = value;
+      // When provided as a scalar string, we default to executing using the
+      // shell.
+      args.clear();
+      args.push_back("/bin/sh");
+      args.push_back("-c");
+      args.push_back(value);
     } else if (name == "deps") {
       depsPath = value;
     } else {
@@ -1284,7 +1298,13 @@ class ClangShellCommand : public ExternalCommand {
   }
   virtual bool configureAttribute(const ConfigureContext& ctx, StringRef name,
                                   ArrayRef<StringRef> values) override {
-    return ExternalCommand::configureAttribute(ctx, name, values);
+    if (name == "args") {
+      args = std::vector<std::string>(values.begin(), values.end());
+    } else {
+        return ExternalCommand::configureAttribute(ctx, name, values);
+    }
+
+    return true;
   }
   virtual bool configureAttribute(
       const ConfigureContext& ctx, StringRef name,
@@ -1295,8 +1315,13 @@ class ClangShellCommand : public ExternalCommand {
   virtual bool executeExternalCommand(BuildSystemCommandInterface& bsci,
                                       Task* task,
                                       QueueJobContext* context) override {
+    std::vector<StringRef> commandLine;
+    for (const auto& arg: args) {
+      commandLine.push_back(arg);
+    }
+
     // Execute the command.
-    if (!bsci.getExecutionQueue().executeShellCommand(context, args)) {
+    if (!bsci.getExecutionQueue().executeProcess(context, commandLine)) {
       // If the command failed, there is no need to gather dependencies.
       return false;
     }

tests/BuildSystem/Parser/basic.llbuild

@@ -65,7 +65,7 @@ nodes:
 # CHECK: command('link-hello')
 # CHECK:  -- 'tool': 'link'
 # CHECK:  -- 'description': 'LINK'
-# CHECK:  -- 'inputs': ['hello.o']
+# CHECK:  -- 'inputs': ['hello.o', 'bye.o']
 # CHECK:  -- 'outputs': ['hello']
 # CHECK:  -- -- loaded command('link-hello')
 # CHECK: command('cc-hello.o')
@@ -76,11 +76,18 @@ nodes:
 # CHECK:  -- 'extra-map': {
 # CHECK:  --   'key': 'value'
 # CHECK:  -- }
+# CHECK: tool('clang')
+# CHECK: command('bye.o')
+# CHECK:   -- 'tool': 'clang')
+# CHECK:   -- 'inputs': ['bye.c']
+# CHECK:   -- 'outputs': ['bye.o']
+# CHECK:   -- 'args': ['-O0', '-g']
+# CHECK:   -- -- loaded command('bye.o')
 commands:
   link-hello:
     tool: link
     description: LINK
-    inputs: ["hello.o"]
+    inputs: ["hello.o", "bye.o"]
     outputs: ["hello"]
   cc-hello.o:
     tool: cc
@@ -89,3 +96,8 @@ commands:
     args: ["-O0"]
     extra-map:
       key: value
+  bye.o:
+    tool: clang
+    inputs: ["bye.c"]
+    outputs: ["bye.o"]
+    args: ["-O0", "-g"]