Upgrade to LLVM and Clang r126079 to match the version in HEAD.

Add support to the LLVM makefile to set SVN_REV externally to make
upgrading to a specific version easier.

7 files changed, 90 insertions, 60 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 56ac12900efa..9c9138f8d5e3 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	llvm
 DISTVERSION=	2.9.r${SVN_REV}
-PORTREVISION=	2
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -60,12 +59,14 @@ MAN1=		bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 \
 
 .include <bsd.port.pre.mk>
 
+.if !defined(SVN_REV)
 .if defined(BOOTSTRAP)
 LANG=		"C"
 SVN_REV!=	svn info http://llvm.org/svn/llvm-project/ | ${GREP} Revision | cut -d' ' -f2
 .else
 .include "Makefile.svn_rev"
 .endif
+.endif
 
 .if ${ARCH} == "sparc64"
 BROKEN=		does not compile on sparc64
@@ -130,17 +131,18 @@ PLIST_FILE_LIST=	bin/bugpoint \
 			bin/llc \
 			bin/lli \
 			bin/llvm* \
-			bin/macho-dumpx \
+			bin/macho-dump \
 			bin/opt \
 			bin/tblgen \
-			lib/libBugpointPasses.so \
+			lib/LLVMHello.so \
+			lib/BugpointPasses.so \
 			lib/libCompilerDriver.a \
 			lib/libEnhancedDisassembly.so \
 			lib/libEnhancedDisassembly.a \
 			lib/libLTO.* \
 			lib/libLLVM* \
 			lib/libUnitTestMain.a \
-			lib/libprofile_rt.so
+			lib/profile_rt.so
 PLIST_DIR_LIST=		include/llvm-c \
 			include/llvm
 build-plist:
diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index de67b4ef6235..4949c1073c69 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	121368
+SVN_REV=	126079
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 9ada8c0095e9..392acd113c15 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-2.9.r121368.tar.bz2) = 23fe92c65926cd55c6cb51fc5f2376a325bedf726d4fc1fe50e79a6ec12e74f9
-SIZE (llvm-2.9.r121368.tar.bz2) = 7268189
+SHA256 (llvm-2.9.r126079.tar.bz2) = 1aaaa9617a21a6ec1cb4b35fd0a019567331a03e470b44112dac909b55a482f1
+SIZE (llvm-2.9.r126079.tar.bz2) = 7531942
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 396059dd4440..b10c01ade7c9 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -12,11 +12,12 @@ bin/llvm-ld
 bin/llvm-link
 bin/llvm-mc
 bin/llvm-nm
+bin/llvm-objdump
 bin/llvm-prof
 bin/llvm-ranlib
 bin/llvm-stub
 bin/llvmc
-bin/macho-dumpx
+bin/macho-dump
 bin/opt
 bin/tblgen
 include/llvm-c/Analysis.h
@@ -34,6 +35,7 @@ include/llvm-c/lto.h
 include/llvm/ADT/APFloat.h
 include/llvm/ADT/APInt.h
 include/llvm/ADT/APSInt.h
+include/llvm/ADT/ArrayRef.h
 include/llvm/ADT/BitVector.h
 include/llvm/ADT/DAGDeltaAlgorithm.h
 include/llvm/ADT/DeltaAlgorithm.h
@@ -50,6 +52,7 @@ include/llvm/ADT/ImmutableMap.h
 include/llvm/ADT/ImmutableSet.h
 include/llvm/ADT/InMemoryStruct.h
 include/llvm/ADT/IndexedMap.h
+include/llvm/ADT/IntEqClasses.h
 include/llvm/ADT/IntervalMap.h
 include/llvm/ADT/IntrusiveRefCntPtr.h
 include/llvm/ADT/NullablePtr.h
@@ -97,6 +100,7 @@ include/llvm/Analysis/DIBuilder.h
 include/llvm/Analysis/DOTGraphTraitsPass.h
 include/llvm/Analysis/DebugInfo.h
 include/llvm/Analysis/DomPrinter.h
+include/llvm/Analysis/DominanceFrontier.h
 include/llvm/Analysis/DominatorInternals.h
 include/llvm/Analysis/Dominators.h
 include/llvm/Analysis/FindUsedTypes.h
@@ -119,6 +123,8 @@ include/llvm/Analysis/MemoryBuiltins.h
 include/llvm/Analysis/MemoryDependenceAnalysis.h
 include/llvm/Analysis/PHITransAddr.h
 include/llvm/Analysis/Passes.h
+include/llvm/Analysis/PathNumbering.h
+include/llvm/Analysis/PathProfileInfo.h
 include/llvm/Analysis/PostDominators.h
 include/llvm/Analysis/ProfileInfo.h
 include/llvm/Analysis/ProfileInfoLoader.h
@@ -157,6 +163,7 @@ include/llvm/CodeGen/AsmPrinter.h
 include/llvm/CodeGen/BinaryObject.h
 include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallingConvLower.h
+include/llvm/CodeGen/EdgeBundles.h
 include/llvm/CodeGen/FastISel.h
 include/llvm/CodeGen/FunctionLoweringInfo.h
 include/llvm/CodeGen/GCMetadata.h
@@ -188,6 +195,7 @@ include/llvm/CodeGen/MachineInstrBuilder.h
 include/llvm/CodeGen/MachineJumpTableInfo.h
 include/llvm/CodeGen/MachineLocation.h
 include/llvm/CodeGen/MachineLoopInfo.h
+include/llvm/CodeGen/MachineLoopRanges.h
 include/llvm/CodeGen/MachineMemOperand.h
 include/llvm/CodeGen/MachineModuleInfo.h
 include/llvm/CodeGen/MachineModuleInfoImpls.h
@@ -285,14 +293,16 @@ include/llvm/MC/MCContext.h
 include/llvm/MC/MCDirectives.h
 include/llvm/MC/MCDisassembler.h
 include/llvm/MC/MCDwarf.h
+include/llvm/MC/MCELFObjectWriter.h
 include/llvm/MC/MCELFSymbolFlags.h
 include/llvm/MC/MCExpr.h
 include/llvm/MC/MCFixup.h
+include/llvm/MC/MCFixupKindInfo.h
 include/llvm/MC/MCInst.h
 include/llvm/MC/MCInstPrinter.h
 include/llvm/MC/MCLabel.h
 include/llvm/MC/MCMachOSymbolFlags.h
-include/llvm/MC/MCObjectFormat.h
+include/llvm/MC/MCMachObjectWriter.h
 include/llvm/MC/MCObjectStreamer.h
 include/llvm/MC/MCObjectWriter.h
 include/llvm/MC/MCParser/AsmCond.h
@@ -375,6 +385,7 @@ include/llvm/Support/NoFolder.h
 include/llvm/Support/OutputBuffer.h
 include/llvm/Support/PassNameParser.h
 include/llvm/Support/Path.h
+include/llvm/Support/PathV1.h
 include/llvm/Support/PathV2.h
 include/llvm/Support/PatternMatch.h
 include/llvm/Support/PluginLoader.h
@@ -393,7 +404,6 @@ include/llvm/Support/SMLoc.h
 include/llvm/Support/Signals.h
 include/llvm/Support/Solaris.h
 include/llvm/Support/SourceMgr.h
-include/llvm/Support/StableBasicBlockNumbering.h
 include/llvm/Support/StandardPasses.h
 include/llvm/Support/StringPool.h
 include/llvm/Support/SwapByteOrder.h
@@ -417,18 +427,20 @@ include/llvm/Target/Mangler.h
 include/llvm/Target/SubtargetFeature.h
 include/llvm/Target/Target.td
 include/llvm/Target/TargetAsmBackend.h
+include/llvm/Target/TargetAsmInfo.h
 include/llvm/Target/TargetAsmLexer.h
 include/llvm/Target/TargetAsmParser.h
 include/llvm/Target/TargetCallingConv.h
 include/llvm/Target/TargetCallingConv.td
 include/llvm/Target/TargetData.h
 include/llvm/Target/TargetELFWriterInfo.h
-include/llvm/Target/TargetFrameInfo.h
+include/llvm/Target/TargetFrameLowering.h
 include/llvm/Target/TargetInstrDesc.h
 include/llvm/Target/TargetInstrInfo.h
 include/llvm/Target/TargetInstrItineraries.h
 include/llvm/Target/TargetIntrinsicInfo.h
 include/llvm/Target/TargetJITInfo.h
+include/llvm/Target/TargetLibraryInfo.h
 include/llvm/Target/TargetLowering.h
 include/llvm/Target/TargetLoweringObjectFile.h
 include/llvm/Target/TargetMachine.h
@@ -444,7 +456,6 @@ include/llvm/Target/TargetSubtarget.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/InlinerPass.h
 include/llvm/Transforms/Instrumentation.h
-include/llvm/Transforms/RSProfiling.h
 include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/AddrModeMatcher.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
@@ -465,7 +476,8 @@ include/llvm/Use.h
 include/llvm/User.h
 include/llvm/Value.h
 include/llvm/ValueSymbolTable.h
-lib/libBugpointPasses.so
+lib/BugpointPasses.so
+lib/LLVMHello.so
 lib/libCompilerDriver.a
 lib/libEnhancedDisassembly.a
 lib/libEnhancedDisassembly.so
@@ -493,7 +505,6 @@ lib/libLLVMCore.a
 lib/libLLVMCppBackend.a
 lib/libLLVMCppBackendInfo.a
 lib/libLLVMExecutionEngine.a
-lib/libLLVMHello.so
 lib/libLLVMInstCombine.a
 lib/libLLVMInstrumentation.a
 lib/libLLVMInterpreter.a
@@ -533,6 +544,7 @@ lib/libLLVMX86AsmPrinter.a
 lib/libLLVMX86CodeGen.a
 lib/libLLVMX86Disassembler.a
 lib/libLLVMX86Info.a
+lib/libLLVMX86Utils.a
 lib/libLLVMXCoreCodeGen.a
 lib/libLLVMXCoreInfo.a
 lib/libLLVMipa.a
@@ -540,7 +552,7 @@ lib/libLLVMipo.a
 lib/libLTO.a
 lib/libLTO.so
 lib/libUnitTestMain.a
-lib/libprofile_rt.so
+lib/profile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html
 %%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.html
@@ -629,6 +641,7 @@ lib/libprofile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl5.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl6.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ps/FileCheck.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/bugpoint.ps
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 0439f2c2a440..236aaf364041 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -104,7 +104,8 @@ post-patch:
 	    ${WRKSRC}/tools/clang/tools/scan-view/scan-view
 
 pre-build:
-	${LN} -s ${LOCALBASE}/include/llvm/Intrinsics.gen ${WRKSRC}/include/llvm/
+	${LN} -sf ${LOCALBASE}/include/llvm/Intrinsics.gen ${WRKSRC}/include/llvm/
+	cd ${WRKSRC}/utils/unittest/googletest && ${GMAKE}
 
 .if defined(NOPORTDOCS)
 post-build:
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index a386f3559520..a223a1ccf4c7 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-2.9.r121368.tar.bz2) = 1593384e1eb915a1ea06c63a9c44c90056ccf8ca517024acc3953dbe597bbfe3
-SIZE (clang-2.9.r121368.tar.bz2) = 4912313
-SHA256 (llvm-2.9.r121368.tar.bz2) = 23fe92c65926cd55c6cb51fc5f2376a325bedf726d4fc1fe50e79a6ec12e74f9
-SIZE (llvm-2.9.r121368.tar.bz2) = 7268189
+SHA256 (clang-2.9.r126079.tar.bz2) = 04ab39549db1ba06d4460393d207320cca02d344002c47ff21b386333b8f8682
+SIZE (clang-2.9.r126079.tar.bz2) = 5139275
+SHA256 (llvm-2.9.r126079.tar.bz2) = 1aaaa9617a21a6ec1cb4b35fd0a019567331a03e470b44112dac909b55a482f1
+SIZE (llvm-2.9.r126079.tar.bz2) = 7531942
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 7257dc305413..6eccc06e68bf 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -38,6 +38,7 @@ include/clang/AST/Expr.h
 include/clang/AST/ExprCXX.h
 include/clang/AST/ExprObjC.h
 include/clang/AST/ExternalASTSource.h
+include/clang/AST/Mangle.h
 include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
 include/clang/AST/ParentMap.h
@@ -72,10 +73,12 @@ include/clang/Analysis/Analyses/LiveVariables.h
 include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 include/clang/Analysis/Analyses/ReachableCode.h
 include/clang/Analysis/Analyses/UninitializedValues.h
+include/clang/Analysis/Analyses/UninitializedValuesV2.h
 include/clang/Analysis/AnalysisContext.h
 include/clang/Analysis/AnalysisDiagnostic.h
 include/clang/Analysis/CFG.h
 include/clang/Analysis/CFGStmtMap.h
+include/clang/Analysis/DomainSpecific/CocoaConventions.h
 include/clang/Analysis/FlowSensitive/DataflowSolver.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/ProgramPoint.h
@@ -85,6 +88,7 @@ include/clang/Analysis/Support/SaveAndRestore.h
 include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h
 include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
 include/clang/Analysis/Visitors/CFGStmtVisitor.h
+include/clang/Basic/ABI.h
 include/clang/Basic/AttrKinds.h
 include/clang/Basic/AttrList.inc
 include/clang/Basic/Builtins.def
@@ -112,6 +116,7 @@ include/clang/Basic/LangOptions.h
 include/clang/Basic/Linkage.h
 include/clang/Basic/MacroBuilder.h
 include/clang/Basic/OnDiskHashTable.h
+include/clang/Basic/OpenCLExtensions.def
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/PartialDiagnostic.h
@@ -143,43 +148,10 @@ include/clang/Basic/Version.h
 include/clang/Basic/Version.inc
 include/clang/Basic/Visibility.h
 include/clang/Basic/arm_neon.inc
-include/clang/Checker/AnalysisConsumer.h
-include/clang/Checker/BugReporter/BugReporter.h
-include/clang/Checker/BugReporter/BugType.h
-include/clang/Checker/BugReporter/PathDiagnostic.h
-include/clang/Checker/Checkers/DereferenceChecker.h
-include/clang/Checker/Checkers/LocalCheckers.h
-include/clang/Checker/DomainSpecific/CocoaConventions.h
-include/clang/Checker/FrontendActions.h
-include/clang/Checker/ManagerRegistry.h
-include/clang/Checker/PathDiagnosticClients.h
-include/clang/Checker/PathSensitive/AnalysisManager.h
-include/clang/Checker/PathSensitive/BasicValueFactory.h
-include/clang/Checker/PathSensitive/Checker.h
-include/clang/Checker/PathSensitive/CheckerHelpers.h
-include/clang/Checker/PathSensitive/CheckerVisitor.def
-include/clang/Checker/PathSensitive/CheckerVisitor.h
-include/clang/Checker/PathSensitive/ConstraintManager.h
-include/clang/Checker/PathSensitive/Environment.h
-include/clang/Checker/PathSensitive/ExplodedGraph.h
-include/clang/Checker/PathSensitive/GRBlockCounter.h
-include/clang/Checker/PathSensitive/GRCoreEngine.h
-include/clang/Checker/PathSensitive/GRExprEngine.h
-include/clang/Checker/PathSensitive/GRExprEngineBuilders.h
-include/clang/Checker/PathSensitive/GRState.h
-include/clang/Checker/PathSensitive/GRStateTrait.h
-include/clang/Checker/PathSensitive/GRSubEngine.h
-include/clang/Checker/PathSensitive/GRTransferFuncs.h
-include/clang/Checker/PathSensitive/GRWorkList.h
-include/clang/Checker/PathSensitive/MemRegion.h
-include/clang/Checker/PathSensitive/SValBuilder.h
-include/clang/Checker/PathSensitive/SVals.h
-include/clang/Checker/PathSensitive/Store.h
-include/clang/Checker/PathSensitive/SummaryManager.h
-include/clang/Checker/PathSensitive/SymbolManager.h
 include/clang/CodeGen/BackendUtil.h
 include/clang/CodeGen/CodeGenAction.h
 include/clang/CodeGen/ModuleBuilder.h
+include/clang/Config/config.h.cmake
 include/clang/Driver/Action.h
 include/clang/Driver/Arg.h
 include/clang/Driver/ArgList.h
@@ -229,6 +201,7 @@ include/clang/Frontend/FrontendPluginRegistry.h
 include/clang/Frontend/HeaderSearchOptions.h
 include/clang/Frontend/LangStandard.h
 include/clang/Frontend/LangStandards.def
+include/clang/Frontend/MultiplexConsumer.h
 include/clang/Frontend/PreprocessorOptions.h
 include/clang/Frontend/PreprocessorOutputOptions.h
 include/clang/Frontend/StmtXML.def
@@ -319,6 +292,42 @@ include/clang/Serialization/AttrPCHRead.inc
 include/clang/Serialization/AttrPCHWrite.inc
 include/clang/Serialization/Release+Asserts/AttrPCHRead.inc.tmp
 include/clang/Serialization/Release+Asserts/AttrPCHWrite.inc.tmp
+include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
+include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
+include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
+include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
+include/clang/StaticAnalyzer/Core/CheckerManager.h
+include/clang/StaticAnalyzer/Core/CheckerProvider.h
+include/clang/StaticAnalyzer/Core/CheckerV2.h
+include/clang/StaticAnalyzer/Core/PathDiagnosticClients.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/Checker.h
+include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
+include/clang/StaticAnalyzer/Core/PathSensitive/CheckerVisitor.def
+include/clang/StaticAnalyzer/Core/PathSensitive/CheckerVisitor.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.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/ExprEngineBuilders.h
+include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h
+include/clang/StaticAnalyzer/Core/PathSensitive/GRStateTrait.h
+include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ObjCMessage.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
+include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/TransferFuncs.h
+include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
+include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
+include/clang/StaticAnalyzer/Frontend/FrontendActions.h
 lib/clang/2.9/include/arm_neon.h
 lib/clang/2.9/include/emmintrin.h
 lib/clang/2.9/include/immintrin.h
@@ -335,7 +344,6 @@ lib/libclang.so
 lib/libclangAST.a
 lib/libclangAnalysis.a
 lib/libclangBasic.a
-lib/libclangChecker.a
 lib/libclangCodeGen.a
 lib/libclangDriver.a
 lib/libclangFrontend.a
@@ -346,6 +354,9 @@ lib/libclangParse.a
 lib/libclangRewrite.a
 lib/libclangSema.a
 lib/libclangSerialization.a
+lib/libclangStaticAnalyzerCheckers.a
+lib/libclangStaticAnalyzerCore.a
+lib/libclangStaticAnalyzerFrontend.a
 %%DATADIR%%/scanview.css
 %%DATADIR%%/sorttable.js
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
@@ -371,6 +382,12 @@ lib/libclangSerialization.a
 @dirrm lib/clang/2.9/include
 @dirrm lib/clang/2.9
 @dirrm lib/clang
+@dirrm include/clang/StaticAnalyzer/Frontend
+@dirrm include/clang/StaticAnalyzer/Core/PathSensitive
+@dirrm include/clang/StaticAnalyzer/Core/BugReporter
+@dirrm include/clang/StaticAnalyzer/Core
+@dirrm include/clang/StaticAnalyzer/Checkers
+@dirrm include/clang/StaticAnalyzer
 @dirrm include/clang/Serialization/Release+Asserts
 @dirrm include/clang/Serialization
 @dirrm include/clang/Sema
@@ -383,17 +400,14 @@ lib/libclangSerialization.a
 @dirrm include/clang/Frontend
 @dirrm include/clang/Driver/Release+Asserts
 @dirrm include/clang/Driver
+@dirrm include/clang/Config
 @dirrm include/clang/CodeGen
-@dirrm include/clang/Checker/PathSensitive
-@dirrm include/clang/Checker/DomainSpecific
-@dirrm include/clang/Checker/Checkers
-@dirrm include/clang/Checker/BugReporter
-@dirrm include/clang/Checker
 @dirrm include/clang/Basic/Release+Asserts
 @dirrm include/clang/Basic
 @dirrm include/clang/Analysis/Visitors
 @dirrm include/clang/Analysis/Support
 @dirrm include/clang/Analysis/FlowSensitive
+@dirrm include/clang/Analysis/DomainSpecific
 @dirrm include/clang/Analysis/Analyses
 @dirrm include/clang/Analysis
 @dirrm include/clang/AST/Release+Asserts