diff options
| -rw-r--r-- | include/clang/Lex/PreprocessingRecord.h | 11 | ||||
| -rw-r--r-- | lib/Lex/PreprocessingRecord.cpp | 4 | ||||
| -rw-r--r-- | lib/Serialization/ASTReader.cpp | 1 | ||||
| -rw-r--r-- | lib/Serialization/ASTWriter.cpp | 1 |
4 files changed, 4 insertions, 13 deletions
diff --git a/include/clang/Lex/PreprocessingRecord.h b/include/clang/Lex/PreprocessingRecord.h index bf1bb5301b..c76224d124 100644 --- a/include/clang/Lex/PreprocessingRecord.h +++ b/include/clang/Lex/PreprocessingRecord.h @@ -138,21 +138,16 @@ namespace clang { class MacroDefinition : public PreprocessingDirective { /// \brief The name of the macro being defined. const IdentifierInfo *Name; - - /// \brief The location of the macro name in the macro definition. - SourceLocation Location; public: - explicit MacroDefinition(const IdentifierInfo *Name, SourceLocation Location, - SourceRange Range) - : PreprocessingDirective(MacroDefinitionKind, Range), Name(Name), - Location(Location) { } + explicit MacroDefinition(const IdentifierInfo *Name, SourceRange Range) + : PreprocessingDirective(MacroDefinitionKind, Range), Name(Name) { } /// \brief Retrieve the name of the macro being defined. const IdentifierInfo *getName() const { return Name; } /// \brief Retrieve the location of the macro name in the definition. - SourceLocation getLocation() const { return Location; } + SourceLocation getLocation() const { return getSourceRange().getBegin(); } // Implement isa/cast/dyncast/etc. static bool classof(const PreprocessedEntity *PE) { diff --git a/lib/Lex/PreprocessingRecord.cpp b/lib/Lex/PreprocessingRecord.cpp index a4315b78d5..2368b38981 100644 --- a/lib/Lex/PreprocessingRecord.cpp +++ b/lib/Lex/PreprocessingRecord.cpp @@ -229,9 +229,7 @@ void PreprocessingRecord::MacroDefined(const Token &Id, const MacroInfo *MI) { SourceRange R(MI->getDefinitionLoc(), MI->getDefinitionEndLoc()); MacroDefinition *Def - = new (*this) MacroDefinition(Id.getIdentifierInfo(), - MI->getDefinitionLoc(), - R); + = new (*this) MacroDefinition(Id.getIdentifierInfo(), R); addPreprocessedEntity(Def); MacroDefinitions[MI] = getPPEntityID(PreprocessedEntities.size()-1, /*isLoaded=*/false); diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index 25b86876b3..392658d48e 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -1404,7 +1404,6 @@ PreprocessedEntity *ASTReader::LoadPreprocessedEntity(Module &F) { IdentifierInfo *II = getLocalIdentifier(F, Record[3]); MacroDefinition *MD = new (PPRec) MacroDefinition(II, - ReadSourceLocation(F, Record[4]), SourceRange( ReadSourceLocation(F, Record[1]), ReadSourceLocation(F, Record[2]))); diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp index 2aa1e6c4e3..f646c59ebd 100644 --- a/lib/Serialization/ASTWriter.cpp +++ b/lib/Serialization/ASTWriter.cpp @@ -1759,7 +1759,6 @@ void ASTWriter::WritePreprocessorDetail(PreprocessingRecord &PPRec) { AddSourceLocation(MD->getSourceRange().getBegin(), Record); AddSourceLocation(MD->getSourceRange().getEnd(), Record); AddIdentifierRef(MD->getName(), Record); - AddSourceLocation(MD->getLocation(), Record); Stream.EmitRecord(PPD_MACRO_DEFINITION, Record); continue; } |