Upgrade llvm and clang to the 3.2 release.

8 files changed, 145 insertions, 83 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index 998848aa977e..d98fd12d1353 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clang
-PORTVERSION=	3.1
-PORTREVISION=	2
+PORTVERSION=	3.2
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	${LLVM_SOURCE}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 
-CONFLICTS=	clang-devel-[23]*
+CONFLICTS=	clang-devel-[23]* clang31-*
 
 CLANG_NAME=	clang-${PORTVERSION}.src
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
@@ -93,6 +92,8 @@ post-extract:
 	    ${MV} ${CLANG_NAME} clang
 
 post-patch:
+	${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \
+	    ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
 	    ${WRKSRC}/Makefile.config.in
 	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
@@ -113,10 +114,8 @@ pre-build:
 	${LN} -sf ${LOCALBASE}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/
 	cd ${WRKSRC}/utils/unittest && ${GMAKE}
 
-.if empty(PORT_OPTIONS:MDOCS)
 post-build:
 	@cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1
-.endif
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
@@ -133,12 +132,8 @@ post-install:
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js ${DATADIR}
-.if empty(PORT_OPTIONS:MDOCS)
 	@${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \
 	    ${MANPREFIX}/man/man1/
-.else
-	@${RMDIR} ${DOCSDIR}/html/img
-.endif
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${GMAKE} check)'
 regression-test: ${BUILD_COOKIE}
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 0103d94048c5..33cfb8d777f2 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.1.src.tar.gz) = ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786
-SIZE (clang-3.1.src.tar.gz) = 8158418
-SHA256 (llvm-3.1.src.tar.gz) = 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab
-SIZE (llvm-3.1.src.tar.gz) = 11077429
+SHA256 (clang-3.2.src.tar.gz) = 2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658
+SIZE (clang-3.2.src.tar.gz) = 8805311
+SHA256 (llvm-3.2.src.tar.gz) = 125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343
+SIZE (llvm-3.2.src.tar.gz) = 12275252
diff --git a/lang/clang/files/patch-include_llvm_ADT_Triple.h b/lang/clang/files/patch-include_llvm_ADT_Triple.h
new file mode 100644
index 000000000000..788c5bbd8909
--- /dev/null
+++ b/lang/clang/files/patch-include_llvm_ADT_Triple.h
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- include/llvm/ADT/Triple.h.orig
++++ include/llvm/ADT/Triple.h
+@@ -296,6 +296,11 @@
+     return isMacOSX() || getOS() == Triple::IOS;
+   }
+ 
++  /// isOSFreeBSD - Is this FreeBSD OS
++  bool isOSFreeBSD() const {
++    return getOS() == Triple::FreeBSD;
++  }
++
+   /// \brief Tests for either Cygwin or MinGW OS
+   bool isOSCygMing() const {
+     return getOS() == Triple::Cygwin || getOS() == Triple::MinGW32;
diff --git a/lang/clang/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h b/lang/clang/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h
index 7d178ab4f591..3c4b574d3057 100644
--- a/lang/clang/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h
+++ b/lang/clang/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h
@@ -3,13 +3,21 @@ $FreeBSD$
 
 --- tools/clang/include/clang/Analysis/Analyses/FormatString.h.orig
 +++ tools/clang/include/clang/Analysis/Analyses/FormatString.h
-@@ -143,6 +143,10 @@
+@@ -117,7 +117,7 @@
+       // C99 conversion specifiers.
+     cArg,
+     dArg,
+-    DArg, // Apple extension
++    DArg, // Apple and FreeBSD extension
+     iArg,
+     IntArgBeg = dArg, IntArgEnd = iArg,
+ 
+@@ -148,6 +148,9 @@
  
      // ** Printf-specific **
  
 +    // FreeBSD specific specifiers
 +    bArg,
-+    DArg,
 +
      // Objective-C specific specifiers.
      ObjCObjArg,  // '@'
diff --git a/lang/clang/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp b/lang/clang/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
index b77afbc41600..d4cfefbd9b59 100644
--- a/lang/clang/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
+++ b/lang/clang/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
@@ -3,24 +3,46 @@ $FreeBSD$
 
 --- tools/clang/lib/Analysis/PrintfFormatString.cpp.orig
 +++ tools/clang/lib/Analysis/PrintfFormatString.cpp
-@@ -192,11 +192,20 @@
+@@ -198,9 +198,10 @@
      case '@': k = ConversionSpecifier::ObjCObjArg; break;
      // Glibc specific.
      case 'm': k = ConversionSpecifier::PrintErrno; break;
-+    // FreeBSD format extensions
-+    case 'b': k = ConversionSpecifier::bArg; break; /* check for int and then char * */
-+    case 'r': k = ConversionSpecifier::xArg; break;
-+    case 'y': k = ConversionSpecifier::iArg; break;
-+    case 'D': k = ConversionSpecifier::DArg; break; /* check for u_char * pointer and a char * string */
+-    // Apple-specific
 +
++    // Apple-specific (and one FreeBSD)
+     case 'D':
+-      if (Target.getTriple().isOSDarwin())
++      if (Target.getTriple().isOSDarwin() || Target.getTriple().isOSFreeBSD())
+         k = ConversionSpecifier::DArg;
+       break;
+     case 'O':
+@@ -211,11 +212,29 @@
+       if (Target.getTriple().isOSDarwin())
+         k = ConversionSpecifier::UArg;
+       break;
++
++    // FreeBSD-specific
++    case 'b':
++      if (Target.getTriple().isOSFreeBSD())
++        k = ConversionSpecifier::bArg;
++      break;
++    case 'r':
++      if (Target.getTriple().isOSFreeBSD())
++        k = ConversionSpecifier::xArg;
++      break;
++    case 'y':
++      if (Target.getTriple().isOSFreeBSD())
++        k = ConversionSpecifier::iArg;
++      break;
    }
    PrintfConversionSpecifier CS(conversionPosition, k);
    FS.setConversionSpecifier(CS);
    if (CS.consumesDataArgument() && !FS.usesPositionalArg())
      FS.setArgIndex(argIndex++);
 +  // FreeBSD extension
-+  if (k == ConversionSpecifier::bArg || k == ConversionSpecifier::DArg)
-+    argIndex++;
++  if (Target.getTriple().isOSFreeBSD() && (k == ConversionSpecifier::bArg ||
++    k == ConversionSpecifier::DArg))
++      argIndex++;
  
    if (k == ConversionSpecifier::InvalidSpecifier) {
      // Assume the conversion takes one argument.
diff --git a/lang/clang/files/patch-tools_clang_lib_Sema_SemaChecking.cpp b/lang/clang/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
index f57ac2281a7f..215210bed343 100644
--- a/lang/clang/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
+++ b/lang/clang/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
@@ -16,8 +16,8 @@ $FreeBSD$
 +    // format specifier.
 +    const Expr *Ex = getDataArg(argIndex);
 +    QualType type = (CS.getKind() == ConversionSpecifier::bArg) ? S.Context.IntTy : S.Context.getPointerType(S.Context.UnsignedCharTy);
-+    //const analyze_printf::ArgTypeResult &ATR = S.Context.IntTy;
-+    const analyze_printf::ArgTypeResult &ATR = type;
++    //const analyze_printf::ArgType &ATR = S.Context.IntTy;
++    const analyze_printf::ArgType &ATR = type;
 +    if (ATR.isValid() && !ATR.matchesType(S.Context, Ex->getType()))
 +      S.Diag(getLocationOfByte(CS.getStart()),
 +             diag::warn_printf_conversion_argument_type_mismatch)
@@ -28,7 +28,7 @@ $FreeBSD$
 +    // Now type check the data expression that matches the
 +    // format specifier.
 +    Ex = getDataArg(argIndex + 1);
-+    const analyze_printf::ArgTypeResult &ATR2 = ArgTypeResult::CStrTy;
++    const analyze_printf::ArgType &ATR2 = ArgType::CStrTy;
 +    if (ATR2.isValid() && !ATR2.matchesType(S.Context, Ex->getType()))
 +      S.Diag(getLocationOfByte(CS.getStart()),
 +             diag::warn_printf_conversion_argument_type_mismatch)
diff --git a/lang/clang/files/patch-tools_clang_lib_Sema_SemaDeclCXX.cpp b/lang/clang/files/patch-tools_clang_lib_Sema_SemaDeclCXX.cpp
deleted file mode 100644
index c185a0f223e3..000000000000
--- a/lang/clang/files/patch-tools_clang_lib_Sema_SemaDeclCXX.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/lib/Sema/SemaDeclCXX.cpp.orig
-+++ tools/clang/lib/Sema/SemaDeclCXX.cpp
-@@ -10795,14 +10795,23 @@
- 
- void Sema::MarkVirtualMembersReferenced(SourceLocation Loc,
-                                         const CXXRecordDecl *RD) {
--  for (CXXRecordDecl::method_iterator i = RD->method_begin(), 
--       e = RD->method_end(); i != e; ++i) {
--    CXXMethodDecl *MD = *i;
--
--    // C++ [basic.def.odr]p2:
--    //   [...] A virtual member function is used if it is not pure. [...]
--    if (MD->isVirtual() && !MD->isPure())
--      MarkFunctionReferenced(Loc, MD);
-+  // Mark all functions which will appear in RD's vtable as used.
-+  CXXFinalOverriderMap FinalOverriders;
-+  RD->getFinalOverriders(FinalOverriders);
-+  for (CXXFinalOverriderMap::const_iterator I = FinalOverriders.begin(),
-+                                            E = FinalOverriders.end();
-+       I != E; ++I) {
-+    for (OverridingMethods::const_iterator OI = I->second.begin(),
-+                                           OE = I->second.end();
-+         OI != OE; ++OI) {
-+      assert(OI->second.size() > 0 && "no final overrider");
-+      CXXMethodDecl *Overrider = OI->second.front().Method;
-+
-+      // C++ [basic.def.odr]p2:
-+      //   [...] A virtual member function is used if it is not pure. [...]
-+      if (!Overrider->isPure())
-+        MarkFunctionReferenced(Loc, Overrider);
-+    }
-   }
- 
-   // Only classes that have virtual bases need a VTT.
diff --git a/lang/clang/pkg-plist b/lang/clang/pkg-plist
index a5a622bcfe48..b2db45cce074 100644
--- a/lang/clang/pkg-plist
+++ b/lang/clang/pkg-plist
@@ -6,7 +6,10 @@ bin/clang++
 bin/clang-tblgen
 bin/scan-build
 bin/scan-view
+include/clang-c/CXCompilationDatabase.h
+include/clang-c/CXString.h
 include/clang-c/Index.h
+include/clang-c/Platform.h
 include/clang/ARCMigrate/ARCMT.h
 include/clang/ARCMigrate/ARCMTActions.h
 include/clang/ARCMigrate/FileRemapper.h
@@ -26,6 +29,18 @@ include/clang/AST/BuiltinTypes.def
 include/clang/AST/CXXInheritance.h
 include/clang/AST/CanonicalType.h
 include/clang/AST/CharUnits.h
+include/clang/AST/Comment.h
+include/clang/AST/CommentBriefParser.h
+include/clang/AST/CommentCommandInfo.inc
+include/clang/AST/CommentCommandTraits.h
+include/clang/AST/CommentDiagnostic.h
+include/clang/AST/CommentHTMLTags.inc
+include/clang/AST/CommentHTMLTagsProperties.inc
+include/clang/AST/CommentLexer.h
+include/clang/AST/CommentNodes.inc
+include/clang/AST/CommentParser.h
+include/clang/AST/CommentSema.h
+include/clang/AST/CommentVisitor.h
 include/clang/AST/Decl.h
 include/clang/AST/DeclAccessPair.h
 include/clang/AST/DeclBase.h
@@ -53,6 +68,7 @@ include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
 include/clang/AST/ParentMap.h
 include/clang/AST/PrettyPrinter.h
+include/clang/AST/RawCommentList.h
 include/clang/AST/RecordLayout.h
 include/clang/AST/RecursiveASTVisitor.h
 include/clang/AST/Redeclarable.h
@@ -76,6 +92,11 @@ include/clang/AST/TypeVisitor.h
 include/clang/AST/UnresolvedSet.h
 include/clang/AST/VTTBuilder.h
 include/clang/AST/VTableBuilder.h
+include/clang/ASTMatchers/ASTMatchFinder.h
+include/clang/ASTMatchers/ASTMatchers.h
+include/clang/ASTMatchers/ASTMatchersInternal.h
+include/clang/ASTMatchers/ASTMatchersMacros.h
+include/clang/ASTMatchers/ASTTypeTraits.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 include/clang/Analysis/Analyses/Dominators.h
 include/clang/Analysis/Analyses/FormatString.h
@@ -91,6 +112,7 @@ include/clang/Analysis/CFG.h
 include/clang/Analysis/CFGStmtMap.h
 include/clang/Analysis/CallGraph.h
 include/clang/Analysis/DomainSpecific/CocoaConventions.h
+include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 include/clang/Analysis/FlowSensitive/DataflowSolver.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/ProgramPoint.h
@@ -108,14 +130,16 @@ include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
 include/clang/Basic/BuiltinsARM.def
 include/clang/Basic/BuiltinsHexagon.def
+include/clang/Basic/BuiltinsMips.def
+include/clang/Basic/BuiltinsNVPTX.def
 include/clang/Basic/BuiltinsPPC.def
-include/clang/Basic/BuiltinsPTX.def
 include/clang/Basic/BuiltinsX86.def
 include/clang/Basic/ConvertUTF.h
 include/clang/Basic/Diagnostic.h
 include/clang/Basic/DiagnosticASTKinds.inc
 include/clang/Basic/DiagnosticAnalysisKinds.inc
 include/clang/Basic/DiagnosticCategories.h
+include/clang/Basic/DiagnosticCommentKinds.inc
 include/clang/Basic/DiagnosticCommonKinds.inc
 include/clang/Basic/DiagnosticDriverKinds.inc
 include/clang/Basic/DiagnosticFrontendKinds.inc
@@ -123,6 +147,8 @@ include/clang/Basic/DiagnosticGroups.inc
 include/clang/Basic/DiagnosticIDs.h
 include/clang/Basic/DiagnosticIndexName.inc
 include/clang/Basic/DiagnosticLexKinds.inc
+include/clang/Basic/DiagnosticOptions.def
+include/clang/Basic/DiagnosticOptions.h
 include/clang/Basic/DiagnosticParseKinds.inc
 include/clang/Basic/DiagnosticSemaKinds.inc
 include/clang/Basic/DiagnosticSerializationKinds.inc
@@ -139,6 +165,7 @@ include/clang/Basic/LangOptions.h
 include/clang/Basic/Linkage.h
 include/clang/Basic/MacroBuilder.h
 include/clang/Basic/Module.h
+include/clang/Basic/ObjCRuntime.h
 include/clang/Basic/OnDiskHashTable.h
 include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
@@ -146,6 +173,7 @@ include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/PartialDiagnostic.h
 include/clang/Basic/PrettyStackTrace.h
+include/clang/Basic/Sanitizers.def
 include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
@@ -172,12 +200,10 @@ include/clang/Driver/ArgList.h
 include/clang/Driver/CC1AsOptions.h
 include/clang/Driver/CC1AsOptions.inc
 include/clang/Driver/CC1Options.h
-include/clang/Driver/CC1Options.inc
 include/clang/Driver/Compilation.h
 include/clang/Driver/Driver.h
 include/clang/Driver/DriverDiagnostic.h
 include/clang/Driver/Job.h
-include/clang/Driver/ObjCRuntime.h
 include/clang/Driver/OptSpecifier.h
 include/clang/Driver/OptTable.h
 include/clang/Driver/Option.h
@@ -196,30 +222,26 @@ include/clang/Edit/FileOffset.h
 include/clang/Edit/Rewriters.h
 include/clang/Frontend/ASTConsumers.h
 include/clang/Frontend/ASTUnit.h
-include/clang/Frontend/Analyses.def
-include/clang/Frontend/AnalyzerOptions.h
 include/clang/Frontend/ChainedDiagnosticConsumer.h
 include/clang/Frontend/ChainedIncludesSource.h
+include/clang/Frontend/CodeGenOptions.def
 include/clang/Frontend/CodeGenOptions.h
 include/clang/Frontend/CommandLineSourceLoc.h
 include/clang/Frontend/CompilerInstance.h
 include/clang/Frontend/CompilerInvocation.h
 include/clang/Frontend/DependencyOutputOptions.h
-include/clang/Frontend/DiagnosticOptions.h
 include/clang/Frontend/DiagnosticRenderer.h
 include/clang/Frontend/FrontendAction.h
 include/clang/Frontend/FrontendActions.h
 include/clang/Frontend/FrontendDiagnostic.h
 include/clang/Frontend/FrontendOptions.h
 include/clang/Frontend/FrontendPluginRegistry.h
-include/clang/Frontend/HeaderSearchOptions.h
 include/clang/Frontend/LangStandard.h
 include/clang/Frontend/LangStandards.def
 include/clang/Frontend/LayoutOverrideSource.h
 include/clang/Frontend/LogDiagnosticPrinter.h
 include/clang/Frontend/MigratorOptions.h
 include/clang/Frontend/MultiplexConsumer.h
-include/clang/Frontend/PreprocessorOptions.h
 include/clang/Frontend/PreprocessorOutputOptions.h
 include/clang/Frontend/SerializedDiagnosticPrinter.h
 include/clang/Frontend/TextDiagnostic.h
@@ -234,6 +256,7 @@ include/clang/Lex/DirectoryLookup.h
 include/clang/Lex/ExternalPreprocessorSource.h
 include/clang/Lex/HeaderMap.h
 include/clang/Lex/HeaderSearch.h
+include/clang/Lex/HeaderSearchOptions.h
 include/clang/Lex/LexDiagnostic.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
@@ -242,12 +265,14 @@ include/clang/Lex/ModuleLoader.h
 include/clang/Lex/ModuleMap.h
 include/clang/Lex/MultipleIncludeOpt.h
 include/clang/Lex/PPCallbacks.h
+include/clang/Lex/PPMutationListener.h
 include/clang/Lex/PTHLexer.h
 include/clang/Lex/PTHManager.h
 include/clang/Lex/Pragma.h
 include/clang/Lex/PreprocessingRecord.h
 include/clang/Lex/Preprocessor.h
 include/clang/Lex/PreprocessorLexer.h
+include/clang/Lex/PreprocessorOptions.h
 include/clang/Lex/ScratchBuffer.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
@@ -256,15 +281,15 @@ include/clang/Parse/AttrLateParsed.inc
 include/clang/Parse/ParseAST.h
 include/clang/Parse/ParseDiagnostic.h
 include/clang/Parse/Parser.h
-include/clang/Rewrite/ASTConsumers.h
-include/clang/Rewrite/DeltaTree.h
-include/clang/Rewrite/FixItRewriter.h
-include/clang/Rewrite/FrontendActions.h
-include/clang/Rewrite/HTMLRewrite.h
-include/clang/Rewrite/RewriteRope.h
-include/clang/Rewrite/Rewriter.h
-include/clang/Rewrite/Rewriters.h
-include/clang/Rewrite/TokenRewriter.h
+include/clang/Rewrite/Core/DeltaTree.h
+include/clang/Rewrite/Core/HTMLRewrite.h
+include/clang/Rewrite/Core/RewriteRope.h
+include/clang/Rewrite/Core/Rewriter.h
+include/clang/Rewrite/Core/TokenRewriter.h
+include/clang/Rewrite/Frontend/ASTConsumers.h
+include/clang/Rewrite/Frontend/FixItRewriter.h
+include/clang/Rewrite/Frontend/FrontendActions.h
+include/clang/Rewrite/Frontend/Rewriters.h
 include/clang/Sema/AnalysisBasedWarnings.h
 include/clang/Sema/AttrParsedAttrKinds.inc
 include/clang/Sema/AttrParsedAttrList.inc
@@ -272,6 +297,7 @@ include/clang/Sema/AttrTemplateInstantiate.inc
 include/clang/Sema/AttributeList.h
 include/clang/Sema/CXXFieldCollector.h
 include/clang/Sema/CodeCompleteConsumer.h
+include/clang/Sema/CodeCompleteOptions.h
 include/clang/Sema/DeclSpec.h
 include/clang/Sema/DelayedDiagnostic.h
 include/clang/Sema/Designator.h
@@ -280,6 +306,7 @@ include/clang/Sema/IdentifierResolver.h
 include/clang/Sema/Initialization.h
 include/clang/Sema/LocInfoType.h
 include/clang/Sema/Lookup.h
+include/clang/Sema/MultiplexExternalSemaSource.h
 include/clang/Sema/ObjCMethodList.h
 include/clang/Sema/Overload.h
 include/clang/Sema/Ownership.h
@@ -308,8 +335,9 @@ include/clang/Serialization/ModuleManager.h
 include/clang/Serialization/SerializationDiagnostic.h
 include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
 include/clang/StaticAnalyzer/Checkers/CommonBugCategories.h
-include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
 include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+include/clang/StaticAnalyzer/Core/Analyses.def
+include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
@@ -319,19 +347,21 @@ include/clang/StaticAnalyzer/Core/CheckerManager.h
 include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
 include/clang/StaticAnalyzer/Core/CheckerRegistry.h
 include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
+include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h
 include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
+include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
+include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h
 include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
-include/clang/StaticAnalyzer/Core/PathSensitive/ObjCMessage.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h
@@ -347,8 +377,18 @@ include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
 include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
 include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
+include/clang/Tooling/ArgumentsAdjusters.h
+include/clang/Tooling/CommonOptionsParser.h
 include/clang/Tooling/CompilationDatabase.h
+include/clang/Tooling/CompilationDatabasePluginRegistry.h
+include/clang/Tooling/FileMatchTrie.h
+include/clang/Tooling/JSONCompilationDatabase.h
+include/clang/Tooling/Refactoring.h
+include/clang/Tooling/RefactoringCallbacks.h
 include/clang/Tooling/Tooling.h
+lib/clang/%%PORTVERSION%%/include/__wmmintrin_aes.h
+lib/clang/%%PORTVERSION%%/include/__wmmintrin_pclmul.h
+lib/clang/%%PORTVERSION%%/include/ammintrin.h
 lib/clang/%%PORTVERSION%%/include/arm_neon.h
 lib/clang/%%PORTVERSION%%/include/emmintrin.h
 lib/clang/%%PORTVERSION%%/include/immintrin.h
@@ -366,6 +406,7 @@ lib/libclang.a
 lib/libclang.so
 lib/libclangARCMigrate.a
 lib/libclangAST.a
+lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
 lib/libclangBasic.a
 lib/libclangCodeGen.a
@@ -375,7 +416,8 @@ lib/libclangFrontend.a
 lib/libclangFrontendTool.a
 lib/libclangLex.a
 lib/libclangParse.a
-lib/libclangRewrite.a
+lib/libclangRewriteCore.a
+lib/libclangRewriteFrontend.a
 lib/libclangSema.a
 lib/libclangSerialization.a
 lib/libclangStaticAnalyzerCheckers.a
@@ -388,13 +430,24 @@ lib/libclangTooling.a
 %%PORTDOCS%%%%DOCSDIR%%/html/AddressSanitizer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/AnalyzerRegions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/AutomaticReferenceCounting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ClangPlugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ClangTools.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DriverInternals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/HowToSetupToolingForLLVM.html
 %%PORTDOCS%%%%DOCSDIR%%/html/InternalsManual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToTheClangAST.html
+%%PORTDOCS%%%%DOCSDIR%%/html/JSONCompilationDatabase.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LanguageExtensions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LibASTMatchers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LibASTMatchersReference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LibTooling.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ObjectiveCLiterals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/PCHInternals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/PTHInternals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RAVFrontendAction.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ThreadSanitizer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Tooling.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersManual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
@@ -418,6 +471,8 @@ lib/libclangTooling.a
 @dirrm include/clang/StaticAnalyzer
 @dirrm include/clang/Serialization
 @dirrm include/clang/Sema
+@dirrm include/clang/Rewrite/Frontend
+@dirrm include/clang/Rewrite/Core
 @dirrm include/clang/Rewrite
 @dirrm include/clang/Parse
 @dirrm include/clang/Lex
@@ -434,12 +489,14 @@ lib/libclangTooling.a
 @dirrm include/clang/Analysis/DomainSpecific
 @dirrm include/clang/Analysis/Analyses
 @dirrm include/clang/Analysis
+@dirrm include/clang/ASTMatchers
 @dirrm include/clang/AST
 @dirrm include/clang/ARCMigrate
 @dirrm include/clang-c
 @dirrm include/clang
 @dirrm %%PYTHON_SITELIBDIR%%/Resources
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/clang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%