gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the clang PP diff.

Browse Source
This commit is contained in:
Vassil Vassilev 2013-12-06 12:08:34 +01:00 committed by sftnight
parent 19dcbb39fa
commit 8247202478
1 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
patches/clang-Preprocessor-removeMacro.diff
View File

@ -1,6 +1,6 @@
diff --git a/interpreter/llvm/src/tools/clang/include/clang/Lex/Preprocessor.h b/interpreter/llvm/src/tools/clang/include/clang/Lex/Preprocessor.h
index 2cef1f7..7ac4d99 100644
--- .tools/clang/include/clang/Lex/Preprocessor.h
index 2cef1f7..503c81d 100644
--- ./tools/clang/include/clang/Lex/Preprocessor.h
+++ ./tools/clang/include/clang/Lex/Preprocessor.h
@@ -425,6 +425,7 @@ public:
/// \param Target Information about the target.
@ -18,7 +18,7 @@ index 2cef1f7..7ac4d99 100644
+ /// \brief Remove a IdentifierInfo and MacroDirective from the history.
+ /// Given an IdentifierInfo and a MacroDirective we can remove them from
+ /// the macros vector.
+ void removeMacro(IdentifierInfo *II, const MacroDirective *MD);
+ void removeMacro(IdentifierInfo *II, MacroDirective *MD);
+
/// \brief Set a MacroDirective that was loaded from a PCH file.
void setLoadedMacroDirective(IdentifierInfo *II, MacroDirective *MD);
@ -29,66 +29,79 @@ index 2cef1f7..7ac4d99 100644
+ /// Print a Macro to an ostream used for ClangInternalState
+ /// Same as dump, but without orinting source location.
+ void printMacro(const MacroInfo &MI, raw_ostream &OS) const;
+ void printMacros(raw_ostream &OS) const;
+
/// AdvanceToTokenCharacter - Given a location that specifies the start of a
/// token, return a new location that specifies a character within the token.
SourceLocation AdvanceToTokenCharacter(SourceLocation TokStart,
diff --git a/interpreter/llvm/src/tools/clang/lib/Lex/PPMacroExpansion.cpp b/interpreter/llvm/src/tools/clang/lib/Lex/PPMacroExpansion.cpp
index 865a89e..e8bf45a 100644
--- ./tools/clang/lib/Lex/PPMacroExpansion.cpp
+++ ./tools/clang/lib/Lex/PPMacroExpansion.cpp
@@ -55,6 +55,23 @@ void Preprocessor::appendMacroDirective(IdentifierInfo *II, MacroDirective *MD){
II->setChangedSinceDeserialization();
}
+void Preprocessor::removeMacro(IdentifierInfo *II, MacroDirective *MD) {
+ assert(II && MD);
+ Macros.erase(II);
+ if (MacroDirective* prevMD = MD->getPrevious()) {
+ // Avoid assertion in appendMacroDirective.
+ MacroDirective* prevPrevMD = prevMD->getPrevious();
+ prevMD->setPrevious(0);
+ appendMacroDirective(II, prevMD);
+ prevMD->setPrevious(prevPrevMD);
+ }
+ // Release the MacroInfo allocated space so it can be reused.
+ if (MacroInfo* MI = MD->getMacroInfo()) {
+ ReleaseMacroInfo(MI);
+ }
+}
+
+
void Preprocessor::setLoadedMacroDirective(IdentifierInfo *II,
MacroDirective *MD) {
assert(II && MD);
diff --git a/interpreter/llvm/src/tools/clang/lib/Lex/Preprocessor.cpp b/interpreter/llvm/src/tools/clang/lib/Lex/Preprocessor.cpp
index 81e6f36..bb8962e 100644
index 81e6f36..657c267 100644
--- ./tools/clang/lib/Lex/Preprocessor.cpp
+++ ./tools/clang/lib/Lex/Preprocessor.cpp
@@ -226,6 +226,33 @@ void Preprocessor::DumpMacro(const MacroInfo &MI) const {
@@ -226,6 +226,38 @@ void Preprocessor::DumpMacro(const MacroInfo &MI) const {
llvm::errs() << "\n";
}
+void Preprocessor::printMacro(const MacroInfo &MI, raw_ostream &OS) const {
+ OS << "MACRO: ";
+ for (unsigned i = 0, e = MI.getNumTokens(); i != e; ++i) {
+ const Token &Tok = MI.getReplacementToken(i);
+ OS << tok::getTokenName(Tok.getKind()) << " '"
+ << getSpelling(Tok) << "'";
+ OS << "\t";
+ if (Tok.isAtStartOfLine())
+ OS << " [StartOfLine]";
+ if (Tok.hasLeadingSpace())
+ OS << " [LeadingSpace]";
+ if (Tok.isExpandDisabled())
+ OS << " [ExpandDisabled]";
+ if (Tok.needsCleaning()) {
+ const char *Start = SourceMgr.getCharacterData(Tok.getLocation());
+ OS << " [UnClean='" << StringRef(Start, Tok.getLength())
+ << "']";
+void Preprocessor::printMacros(raw_ostream &OS) const {
+ for (macro_iterator I = macro_begin(), E = macro_end(); I != E; ++I) {
+ OS << "<MD: " << I->second << ">";
+ OS << I->first->getName() << " ";
+ OS << "(Tokens:)";
+ MacroInfo* MI = I->second->getMacroInfo();
+ for (unsigned i = 0, e = MI->getNumTokens(); i != e; ++i) {
+ const Token &Tok = MI->getReplacementToken(i);
+ OS << tok::getTokenName(Tok.getKind()) << " '"
+ << getSpelling(Tok) << "'";
+ OS << "\t";
+ if (Tok.isAtStartOfLine())
+ OS << " [StartOfLine]";
+ if (Tok.hasLeadingSpace())
+ OS << " [LeadingSpace]";
+ if (Tok.isExpandDisabled())
+ OS << " [ExpandDisabled]";
+ if (Tok.needsCleaning()) {
+ const char *Start = SourceMgr.getCharacterData(Tok.getLocation());
+ OS << " [UnClean='" << StringRef(Start, Tok.getLength())
+ << "']";
+ }
+ //Do not print location it uses the SourceManager dump to llvm::errs.
+ OS << "\tLoc=<";
+ Tok.getLocation().print(OS, SourceMgr);
+ OS << ">";
+ OS << " ";
+ }
+ //Do not print location it uses the SourceManager dump to llvm::errs.
+ OS << "\tLoc=<";
+ Tok.getLocation().print(OS, SourceMgr);
+ OS << ">";
+ OS<< " ";
+ OS << "\n";
+ }
+ OS << "\n";
+}
+
void Preprocessor::PrintStats() {
llvm::errs() << "\n*** Preprocessor Stats:\n";
llvm::errs() << NumDirectives << " directives found:\n";
@@ -448,6 +475,19 @@ Module *Preprocessor::getCurrentModule() {
return getHeaderSearchInfo().lookupModule(getLangOpts().CurrentModule);
}
+void Preprocessor::removeMacro(IdentifierInfo *II, const MacroDirective *MD) {
+ assert(II && MD);
+ assert(!MD->getPrevious() && "Already attached to a MacroDirective history.");
+
+ //Release the MacroInfo allocated space so it can be reused.
+ const MacroInfo* MI = MD->getMacroInfo();
+ if (MI) {
+ ReleaseMacroInfo(const_cast<MacroInfo*>(MI));
+ }
+
+ Macros.erase(II);
+}
+
//===----------------------------------------------------------------------===//
// Preprocessor Initialization Methods
//===----------------------------------------------------------------------===//