Tag Clang 3.6 release branch.clang_3.6

3 files changed, 9 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f57644..1c4c61f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,8 +134,8 @@ target_link_libraries(include-what-you-use
   LLVMInstCombine
   LLVMTransformUtils
   LLVMipa
-  LLVMTarget # Analysis, MC, Core, Support
-  LLVMAnalysis # Core, Support
+  LLVMAnalysis
+  LLVMTarget
   LLVMOption # Support
   LLVMMCDisassembler # MC, Support
   LLVMMCParser # MC, Support
diff --git a/iwyu_preprocessor.cc b/iwyu_preprocessor.cc
index 14e73f4..e781292 100644
--- a/iwyu_preprocessor.cc
+++ b/iwyu_preprocessor.cc
@@ -34,7 +34,6 @@
 
 using clang::FileEntry;
 using clang::FileID;
-using clang::MacroDefinition;
 using clang::MacroDirective;
 using clang::MacroInfo;
 using clang::Preprocessor;
@@ -545,11 +544,11 @@ void IwyuPreprocessorInfo::AddDirectInclude(
 // FOO, and 'directive' containing more information about FOO's
 // definition.
 void IwyuPreprocessorInfo::MacroExpands(const Token& macro_use_token,
-                                        const MacroDefinition& definition,
+                                        const MacroDirective* directive,
                                         SourceRange range,
                                         const clang::MacroArgs* /*args*/) {
   const FileEntry* macro_file = GetFileEntry(macro_use_token);
-  const MacroInfo* macro_def = definition.getMacroInfo();
+  const MacroInfo* macro_def = directive->getMacroInfo();
   if (ShouldPrintSymbolFromFile(macro_file)) {
     errs() << "[ Use macro   ] "
            << PrintableLoc(macro_use_token.getLocation())
@@ -611,7 +610,7 @@ void IwyuPreprocessorInfo::Elif(SourceLocation loc,
 
 void IwyuPreprocessorInfo::Ifdef(SourceLocation loc,
                                  const Token& id,
-                                 const MacroDefinition& /*definition*/) {
+                                 const MacroDirective* /*directive*/) {
   ERRSYM(GetFileEntry(id.getLocation()))
       << "[ #ifdef      ] " << PrintableLoc(id.getLocation())
       << ": " << GetName(id) << "\n";
@@ -620,7 +619,7 @@ void IwyuPreprocessorInfo::Ifdef(SourceLocation loc,
 
 void IwyuPreprocessorInfo::Ifndef(SourceLocation loc,
                                   const Token& id,
-                                  const MacroDefinition& /*definition*/) {
+                                  const MacroDirective* /*directive*/) {
   ERRSYM(GetFileEntry(id.getLocation()))
       << "[ #ifndef     ] " << PrintableLoc(id.getLocation())
       << ": " << GetName(id) << "\n";
diff --git a/iwyu_preprocessor.h b/iwyu_preprocessor.h
index 16be423..f3f4a97 100644
--- a/iwyu_preprocessor.h
+++ b/iwyu_preprocessor.h
@@ -168,7 +168,7 @@ class IwyuPreprocessorInfo : public clang::PPCallbacks,
  protected:
   // Preprocessor event handlers called by Clang.
   virtual void MacroExpands(const clang::Token& id,
-                            const clang::MacroDefinition& definition,
+                            const clang::MacroDirective* directive,
                             clang::SourceRange range,
                             const clang::MacroArgs* args) IWYU_OVERRIDE;
   virtual void MacroDefined(
@@ -186,10 +186,10 @@ class IwyuPreprocessorInfo : public clang::PPCallbacks,
                     clang::SourceLocation if_loc) IWYU_OVERRIDE;
   virtual void Ifdef(clang::SourceLocation loc,
                      const clang::Token& id,
-                     const clang::MacroDefinition& definition) IWYU_OVERRIDE;
+                     const clang::MacroDirective* directive) IWYU_OVERRIDE;
   virtual void Ifndef(clang::SourceLocation loc,
                       const clang::Token& id,
-                      const clang::MacroDefinition& definition) IWYU_OVERRIDE;
+                      const clang::MacroDirective* directive) IWYU_OVERRIDE;
   // Not needed for iwyu:
   // virtual void Else();
   // virtual void Endif();