<div dir="ltr">This commit breaks functionality because asan uses the ModuleID when checking blacklists.  We're going to need to fix it and/or revert it.<div><br></div><div>-Warren</div></div><div class="gmail_extra"><br>
<br><div class="gmail_quote">On Fri, May 23, 2014 at 12:34 AM, Robert Lytton <span dir="ltr"><<a href="mailto:robert@xmos.com" target="_blank">robert@xmos.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: rlytton<br>
Date: Fri May 23 02:34:08 2014<br>
New Revision: 209503<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=209503&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=209503&view=rev</a><br>
Log:<br>
Fix '-main-file-name <name>' so that it is used for the ModuleID.<br>
<br>
Summary:<br>
Previously, you could not specify the original file name when passing a preprocessed file into the compiler<br>
Now you can use 'clang -Xclang -main-file-name -Xclang <original file name> ...'<br>
Or 'clang -cc1 -main-file-name <original file name> ...'<br>
<br>
Added:<br>
    cfe/trunk/test/CodeGen/main-file-name.c<br>
Modified:<br>
    cfe/trunk/lib/CodeGen/CodeGenAction.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenAction.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenAction.cpp?rev=209503&r1=209502&r2=209503&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenAction.cpp?rev=209503&r1=209502&r2=209503&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenAction.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenAction.cpp Fri May 23 02:34:08 2014<br>
@@ -551,9 +551,12 @@ ASTConsumer *CodeGenAction::CreateASTCon<br>
     LinkModuleToUse = ModuleOrErr.get();<br>
   }<br>
<br>
+  StringRef MainFileName = getCompilerInstance().getCodeGenOpts().MainFileName;<br>
+  if (MainFileName.empty())<br>
+    MainFileName = InFile;<br>
   BEConsumer = new BackendConsumer(BA, CI.getDiagnostics(), CI.getCodeGenOpts(),<br>
                                    CI.getTargetOpts(), CI.getLangOpts(),<br>
-                                   CI.getFrontendOpts().ShowTimers, InFile,<br>
+                                   CI.getFrontendOpts().ShowTimers, MainFileName,<br>
                                    LinkModuleToUse, OS.release(), *VMContext);<br>
   return BEConsumer;<br>
 }<br>
<br>
Added: cfe/trunk/test/CodeGen/main-file-name.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/main-file-name.c?rev=209503&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/main-file-name.c?rev=209503&view=auto</a><br>

==============================================================================<br>
--- cfe/trunk/test/CodeGen/main-file-name.c (added)<br>
+++ cfe/trunk/test/CodeGen/main-file-name.c Fri May 23 02:34:08 2014<br>
@@ -0,0 +1,6 @@<br>
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s<br>
+// RUN: %clang_cc1 -emit-llvm -o - %s -main-file-name <a href="http://some.name" target="_blank">some.name</a> | FileCheck -check-prefix NAMED %s<br>
+<br>
+// CHECK: ; ModuleID = '{{.*}}main-file-name.c'<br>
+// NAMED: ; ModuleID = '<a href="http://some.name" target="_blank">some.name</a>'<br>
+<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>