aboutsummaryrefslogtreecommitdiff
path: root/lib/Driver/Driver.cpp
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-08-02 02:38:06 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-08-02 02:38:06 +0000
commit58e12fd6df3b692a8385d1c1b9644ba98e86e64d (patch)
tree2d7b925a3cb46ccd7ee4718cdc066c2cb1bd89af /lib/Driver/Driver.cpp
parentc19a12dc3d441bec62eed55e312b76c12d6d9022 (diff)
Driver: Never try to use piped inputs.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110008 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Driver.cpp')
-rw-r--r--lib/Driver/Driver.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 9086ff9a9b..077c05ba16 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -1061,7 +1061,6 @@ void Driver::BuildJobsForAction(Compilation &C,
const Tool &T = SelectToolForJob(C, TC, JA, Inputs);
// Only use pipes when there is exactly one input.
- bool TryToUsePipeInput = Inputs->size() == 1 && T.acceptsPipedInput();
InputInfoList InputInfos;
for (ActionList::const_iterator it = Inputs->begin(), ie = Inputs->end();
it != ie; ++it) {
@@ -1074,7 +1073,7 @@ void Driver::BuildJobsForAction(Compilation &C,
SubJobAtTopLevel = true;
InputInfo II;
- BuildJobsForAction(C, *it, TC, BoundArch, TryToUsePipeInput,
+ BuildJobsForAction(C, *it, TC, BoundArch, false,
SubJobAtTopLevel, LinkingOutput, II);
InputInfos.push_back(II);
}
@@ -1094,11 +1093,7 @@ void Driver::BuildJobsForAction(Compilation &C,
// Figure out where to put the job (pipes).
Job *Dest = &C.getJobs();
- if (InputInfos[0].isPipe()) {
- assert(TryToUsePipeInput && "Unrequested pipe!");
- assert(InputInfos.size() == 1 && "Unexpected pipe with multiple inputs.");
- Dest = &InputInfos[0].getPipe();
- }
+ assert(!InputInfos[0].isPipe() && "Unrequested pipe!");
// Always use the first input as the base input.
const char *BaseInput = InputInfos[0].getBaseInput();