diff options
| author | Warren Hunt <whunt@google.com> | 2014-05-28 19:17:45 +0000 |
|---|---|---|
| committer | Warren Hunt <whunt@google.com> | 2014-05-28 19:17:45 +0000 |
| commit | 583db1979cfc9db6d3f12f819d19e3248cda87b4 (patch) | |
| tree | 76bb225ea8880fe75e75098fa82a516469367487 | |
| parent | 328f88add9bdbcb8d5f08385a9d378dcef87933b (diff) | |
| download | bcm5719-llvm-583db1979cfc9db6d3f12f819d19e3248cda87b4.tar.gz bcm5719-llvm-583db1979cfc9db6d3f12f819d19e3248cda87b4.zip | |
Reverting 209503 - Breaks asan blacklists
I opened a discussion on cfe-commits. Ideally we've got a few things
that need to happen. CompilerRT should probably have blacklists tests.
Asan should probably not depend on that specific field.
llvm-svn: 209766
| -rw-r--r-- | clang/lib/CodeGen/CodeGenAction.cpp | 5 | ||||
| -rw-r--r-- | clang/test/CodeGen/main-file-name.c | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp index 2fe984226e1..3db1660b805 100644 --- a/clang/lib/CodeGen/CodeGenAction.cpp +++ b/clang/lib/CodeGen/CodeGenAction.cpp @@ -565,12 +565,9 @@ ASTConsumer *CodeGenAction::CreateASTConsumer(CompilerInstance &CI, LinkModuleToUse = ModuleOrErr.get(); } - StringRef MainFileName = getCompilerInstance().getCodeGenOpts().MainFileName; - if (MainFileName.empty()) - MainFileName = InFile; BEConsumer = new BackendConsumer(BA, CI.getDiagnostics(), CI.getCodeGenOpts(), CI.getTargetOpts(), CI.getLangOpts(), - CI.getFrontendOpts().ShowTimers, MainFileName, + CI.getFrontendOpts().ShowTimers, InFile, LinkModuleToUse, OS.release(), *VMContext); return BEConsumer; } diff --git a/clang/test/CodeGen/main-file-name.c b/clang/test/CodeGen/main-file-name.c deleted file mode 100644 index 83e2fe3ac23..00000000000 --- a/clang/test/CodeGen/main-file-name.c +++ /dev/null @@ -1,6 +0,0 @@ -// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s -// RUN: %clang_cc1 -emit-llvm -o - %s -main-file-name some.name | FileCheck -check-prefix NAMED %s - -// CHECK: ; ModuleID = '{{.*}}main-file-name.c' -// NAMED: ; ModuleID = 'some.name' - |
