diff options
| author | Robert Lytton <robert@xmos.com> | 2014-05-23 07:34:08 +0000 |
|---|---|---|
| committer | Robert Lytton <robert@xmos.com> | 2014-05-23 07:34:08 +0000 |
| commit | 57dd5cf441351531d26d7255a778430904c5288d (patch) | |
| tree | cadc8e8db6663f87366c0c32030e1029f41cbd7d | |
| parent | 683b7e087475ffb47312a48a75f5f0dc8e2ec560 (diff) | |
| download | bcm5719-llvm-57dd5cf441351531d26d7255a778430904c5288d.tar.gz bcm5719-llvm-57dd5cf441351531d26d7255a778430904c5288d.zip | |
Fix '-main-file-name <name>' so that it is used for the ModuleID.
Summary:
Previously, you could not specify the original file name when passing a preprocessed file into the compiler
Now you can use 'clang -Xclang -main-file-name -Xclang <original file name> ...'
Or 'clang -cc1 -main-file-name <original file name> ...'
llvm-svn: 209503
| -rw-r--r-- | clang/lib/CodeGen/CodeGenAction.cpp | 5 | ||||
| -rw-r--r-- | clang/test/CodeGen/main-file-name.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp index 2d08c22c51d..5c0b6a9fd8e 100644 --- a/clang/lib/CodeGen/CodeGenAction.cpp +++ b/clang/lib/CodeGen/CodeGenAction.cpp @@ -551,9 +551,12 @@ 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, InFile, + CI.getFrontendOpts().ShowTimers, MainFileName, LinkModuleToUse, OS.release(), *VMContext); return BEConsumer; } diff --git a/clang/test/CodeGen/main-file-name.c b/clang/test/CodeGen/main-file-name.c new file mode 100644 index 00000000000..83e2fe3ac23 --- /dev/null +++ b/clang/test/CodeGen/main-file-name.c @@ -0,0 +1,6 @@ +// 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' + |
