maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Warren Hunt 2014-05-28 19:17:45 +00:00
parent 328f88add9
commit 583db1979c
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/CodeGen/CodeGenAction.cpp
View File

@ -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;
}

6
clang/test/CodeGen/main-file-name.c
View File

@ -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'