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

Remove prepending of '$' to module names. 

llvm-svn: 135775
This commit is contained in:
Jonathan D. Turner 2011-07-22 17:25:03 +00:00
parent 6ab85f9e25
commit 2214acd86e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Frontend/ASTUnit.cpp
View File

@ -980,7 +980,7 @@ bool ASTUnit::Parse(llvm::MemoryBuffer *OverrideMainBuffer) {
goto error; goto error;
if (OverrideMainBuffer) { if (OverrideMainBuffer) {
std::string ModName = "$" + PreambleFile; std::string ModName = PreambleFile;
TranslateStoredDiagnostics(Clang->getModuleManager(), ModName, TranslateStoredDiagnostics(Clang->getModuleManager(), ModName,
getSourceManager(), PreambleDiagnostics, getSourceManager(), PreambleDiagnostics,
StoredDiagnostics); StoredDiagnostics);
@ -2293,7 +2293,7 @@ void ASTUnit::CodeComplete(llvm::StringRef File, unsigned Line, unsigned Column,
if (Act->BeginSourceFile(*Clang.get(), Clang->getFrontendOpts().Inputs[0].second, if (Act->BeginSourceFile(*Clang.get(), Clang->getFrontendOpts().Inputs[0].second,
Clang->getFrontendOpts().Inputs[0].first)) { Clang->getFrontendOpts().Inputs[0].first)) {
if (OverrideMainBuffer) { if (OverrideMainBuffer) {
std::string ModName = "$" + PreambleFile; std::string ModName = PreambleFile;
TranslateStoredDiagnostics(Clang->getModuleManager(), ModName, TranslateStoredDiagnostics(Clang->getModuleManager(), ModName,
getSourceManager(), PreambleDiagnostics, getSourceManager(), PreambleDiagnostics,
StoredDiagnostics); StoredDiagnostics);

4
clang/lib/Serialization/ASTReader.cpp
View File

@ -2643,8 +2643,8 @@ ASTReader::ASTReadResult ASTReader::ReadASTCore(llvm::StringRef FileName,
else else
FirstInSource = &F; FirstInSource = &F;
F.Loaders.push_back(Prev); 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. // Set the AST file name.
F.FileName = FileName; F.FileName = FileName;