commit 9461fccd05bde8458710ba367be10b6e4efe2ec7
author Jonathan D. Turner <jonathan.d.turner@gmail.com> Fri Jul 22 17:25:03 2011 +0000
committer Jonathan D. Turner <jonathan.d.turner@gmail.com> Fri Jul 22 17:25:03 2011 +0000
tree ebeee158f76bae6d0f8f5aad8da6a6c4a8e11a2c
parent 832d620b4ae0fc5fe28561b885b4cfc65cf5c9ab

Remove prepending of '$' to module names.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135775 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/ASTUnit.cpp

diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp
index 1b3e81b..e43bdb4 100644
--- a/lib/Frontend/ASTUnit.cpp
+++ b/lib/Frontend/ASTUnit.cpp
@@ -980,7 +980,7 @@
     goto error;
 
   if (OverrideMainBuffer) {
-    std::string ModName = "$" + PreambleFile;
+    std::string ModName = PreambleFile;
     TranslateStoredDiagnostics(Clang->getModuleManager(), ModName,
                                getSourceManager(), PreambleDiagnostics,
                                StoredDiagnostics);
@@ -2293,7 +2293,7 @@
   if (Act->BeginSourceFile(*Clang.get(), Clang->getFrontendOpts().Inputs[0].second,
                            Clang->getFrontendOpts().Inputs[0].first)) {
     if (OverrideMainBuffer) {
-      std::string ModName = "$" + PreambleFile;
+      std::string ModName = PreambleFile;
       TranslateStoredDiagnostics(Clang->getModuleManager(), ModName,
                                  getSourceManager(), PreambleDiagnostics,
                                  StoredDiagnostics);

lib/Serialization/ASTReader.cpp

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index ecb24e7..424d631 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -2643,8 +2643,8 @@
   else
     FirstInSource = &F;
   F.Loaders.push_back(Prev);
-  // A non-module AST file's module name is $filename.
-  Modules["$" + FileName.str()] = &F;
+
+  Modules[FileName.str()] = &F;
 
   // Set the AST file name.
   F.FileName = FileName;