summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Beaumont-Gay <matthewbg@google.com>2011-11-14 23:24:52 +0000
committerMatt Beaumont-Gay <matthewbg@google.com>2011-11-14 23:24:52 +0000
commit8e9aae5999c64f99fa6ba2a20bf6a6ebaf09262c (patch)
treebf06bbf06bf5a5ddb79d8098f1457b9d97e8ecd0
parent750de7a39956ca6d7fa419d808a09700f17d49b3 (diff)
downloadbcm5719-llvm-8e9aae5999c64f99fa6ba2a20bf6a6ebaf09262c.tar.gz
bcm5719-llvm-8e9aae5999c64f99fa6ba2a20bf6a6ebaf09262c.zip
Don't track depfiles as result files which need to be cleaned up on failure.
This is a partial revert of r143846. While cleaning up after a crash is probably a good idea, we were also deleting .d files if the compilation failed due to invalid input, which is not the desired behavior. The test is XFAIL'd until the cleanup code can be reworked to do the right thing. llvm-svn: 144590
-rw-r--r--clang/lib/Driver/Tools.cpp2
-rw-r--r--clang/test/Driver/crash-cleanup.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 9faac7174ac..6a85fc00b3a 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -225,13 +225,11 @@ void Clang::AddPreprocessingOptions(Compilation &C,
DepFile = Output.getFilename();
} else if (Arg *MF = Args.getLastArg(options::OPT_MF)) {
DepFile = MF->getValue(Args);
- C.addResultFile(DepFile);
} else if (A->getOption().matches(options::OPT_M) ||
A->getOption().matches(options::OPT_MM)) {
DepFile = "-";
} else {
DepFile = darwin::CC1::getDependencyFileName(Args, Inputs);
- C.addResultFile(DepFile);
}
CmdArgs.push_back("-dependency-file");
CmdArgs.push_back(DepFile);
diff --git a/clang/test/Driver/crash-cleanup.c b/clang/test/Driver/crash-cleanup.c
index 218fcc64c7d..b994bd85a30 100644
--- a/clang/test/Driver/crash-cleanup.c
+++ b/clang/test/Driver/crash-cleanup.c
@@ -4,6 +4,6 @@
// REQUIRES: shell
// REQUIRES: crash-recovery
-// XFAIL: darwin
+// XFAIL: *
#pragma clang __debug crash
OpenPOWER on IntegriCloud