Apply changes to migrate to CLANG-160673-20120724.

Change-Id: I00d23ac9b893c62dca281ec771eeb5f911854bae
diff --git a/clang-tblgen-rules.mk b/clang-tblgen-rules.mk
index 179bfa3..b68a846 100644
--- a/clang-tblgen-rules.mk
+++ b/clang-tblgen-rules.mk
@@ -89,6 +89,15 @@
 	$(call transform-host-clang-td-to-out,clang-sa-checkers)
 endif
 
+ifneq ($(findstring CommentNodes.inc,$(TBLGEN_TABLES)),)
+LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/CommentNodes.inc
+$(intermediates)/include/clang/AST/CommentNodes.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/include/clang/AST/CommentNodes.inc: \
+  $(CLANG_ROOT_PATH)/include/clang/Basic/CommentNodes.td \
+  $(CLANG_TBLGEN)
+	$(call transform-host-clang-td-to-out,clang-comment-nodes)
+endif
+
 ifneq ($(filter Diagnostic%Kinds.inc,$(TBLGEN_TABLES)),)
 LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/include/clang/Basic/,$(filter Diagnostic%Kinds.inc,$(TBLGEN_TABLES)))
 $(intermediates)/include/clang/Basic/Diagnostic%Kinds.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
@@ -137,14 +146,7 @@
 ifneq ($(findstring Options.inc,$(TBLGEN_TABLES)),)
 LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/Driver/Options.inc
 $(intermediates)/include/clang/Driver/Options.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
-$(intermediates)/include/clang/Driver/Options.inc: $(CLANG_ROOT_PATH)/include/clang/Driver/Options.td $(CLANG_ROOT_PATH)/include/clang/Driver/OptParser.td $(CLANG_TBLGEN)
-	$(call transform-host-clang-td-to-out,opt-parser-defs)
-endif
-
-ifneq ($(findstring CC1Options.inc,$(TBLGEN_TABLES)),)
-LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/Driver/CC1Options.inc
-$(intermediates)/include/clang/Driver/CC1Options.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
-$(intermediates)/include/clang/Driver/CC1Options.inc: $(CLANG_ROOT_PATH)/include/clang/Driver/CC1Options.td $(CLANG_ROOT_PATH)/include/clang/Driver/OptParser.td $(CLANG_TBLGEN)
+$(intermediates)/include/clang/Driver/Options.inc: $(CLANG_ROOT_PATH)/include/clang/Driver/Options.td $(CLANG_ROOT_PATH)/include/clang/Driver/OptParser.td $(CLANG_TBLGEN) $(CLANG_ROOT_PATH)/include/clang/Driver/CC1Options.td
 	$(call transform-host-clang-td-to-out,opt-parser-defs)
 endif
 
diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index d199462..6ae5b64 100644
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -312,7 +312,7 @@
 }
 
 def Kernel : Attr {
-  let Spellings = ["kernel"];
+  let Spellings = [GNU<"kernel">];
 }
 
 def Deprecated : InheritableAttr {
diff --git a/lib/ARCMigrate/Android.mk b/lib/ARCMigrate/Android.mk
index 657a975..c79b963 100644
--- a/lib/ARCMigrate/Android.mk
+++ b/lib/ARCMigrate/Android.mk
@@ -9,6 +9,7 @@
   Attrs.inc \
   AttrList.inc \
   AttrParsedAttrList.inc    \
+  CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
   DiagnosticGroups.inc \
diff --git a/lib/AST/Android.mk b/lib/AST/Android.mk
index 6e52ada..685c652 100644
--- a/lib/AST/Android.mk
+++ b/lib/AST/Android.mk
@@ -9,8 +9,10 @@
 	AttrImpl.inc	\
 	AttrList.inc	\
 	Attrs.inc	\
+	CommentNodes.inc \
 	DeclNodes.inc	\
 	DiagnosticASTKinds.inc	\
+	DiagnosticCommentKinds.inc \
 	DiagnosticCommonKinds.inc	\
 	DiagnosticSemaKinds.inc	\
 	StmtNodes.inc
@@ -22,6 +24,12 @@
 	ASTDiagnostic.cpp	\
 	ASTImporter.cpp	\
 	AttrImpl.cpp	\
+	Comment.cpp \
+	CommentBriefParser.cpp \
+	CommentDumper.cpp \
+	CommentLexer.cpp \
+	CommentParser.cpp \
+	CommentSema.cpp \
 	CXXInheritance.cpp	\
 	Decl.cpp	\
 	DeclarationName.cpp	\
@@ -50,6 +58,7 @@
 	ParentMap.cpp	\
 	RecordLayout.cpp	\
 	RecordLayoutBuilder.cpp	\
+	RawCommentList.cpp \
 	SelectorLocationsKind.cpp \
 	Stmt.cpp	\
 	StmtDumper.cpp	\
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index f5e3779..fdf7a4e 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -8,6 +8,7 @@
 TBLGEN_TABLES := \
   AttrList.inc \
   Attrs.inc \
+  CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
   DiagnosticAnalysisKinds.inc \
diff --git a/lib/Basic/Android.mk b/lib/Basic/Android.mk
index 14ab8c1..8e50d9c 100644
--- a/lib/Basic/Android.mk
+++ b/lib/Basic/Android.mk
@@ -8,6 +8,7 @@
 TBLGEN_TABLES := \
   DiagnosticASTKinds.inc \
   DiagnosticAnalysisKinds.inc \
+  DiagnosticCommentKinds.inc \
   DiagnosticCommonKinds.inc \
   DiagnosticDriverKinds.inc \
   DiagnosticFrontendKinds.inc \
@@ -22,6 +23,7 @@
 clang_basic_SRC_FILES := \
   Builtins.cpp \
   ConvertUTF.c \
+  ConvertUTFWrapper.cpp \
   Diagnostic.cpp \
   DiagnosticIDs.cpp \
   FileManager.cpp \
@@ -29,6 +31,7 @@
   IdentifierTable.cpp \
   LangOptions.cpp \
   Module.cpp \
+  ObjCRuntime.cpp \
   SourceLocation.cpp \
   SourceManager.cpp \
   TargetInfo.cpp \
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index bf35b68..57cba76 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -3,6 +3,7 @@
 clang_codegen_TBLGEN_TABLES := \
   AttrList.inc \
   Attrs.inc \
+  CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
   DiagnosticFrontendKinds.inc \
diff --git a/lib/Driver/Android.mk b/lib/Driver/Android.mk
index e2c8181..7a3ec43 100644
--- a/lib/Driver/Android.mk
+++ b/lib/Driver/Android.mk
@@ -16,7 +16,6 @@
   Action.cpp \
   Arg.cpp \
   ArgList.cpp \
-  CC1Options.cpp \
   CC1AsOptions.cpp \
   Compilation.cpp \
   Driver.cpp \
diff --git a/lib/Edit/Android.mk b/lib/Edit/Android.mk
index 3975b86..765fdb5 100644
--- a/lib/Edit/Android.mk
+++ b/lib/Edit/Android.mk
@@ -14,6 +14,7 @@
 TBLGEN_TABLES := \
   Attrs.inc \
   AttrList.inc \
+  CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
   StmtNodes.inc
diff --git a/lib/Frontend/Android.mk b/lib/Frontend/Android.mk
index 63a726f..c5ce90e 100644
--- a/lib/Frontend/Android.mk
+++ b/lib/Frontend/Android.mk
@@ -10,6 +10,7 @@
   Attrs.inc \
   AttrParsedAttrList.inc \
   CC1Options.inc \
+  CommentNodes.inc \
   DiagnosticASTKinds.inc \
   DiagnosticCommonKinds.inc \
   DiagnosticDriverKinds.inc \
diff --git a/lib/Parse/Android.mk b/lib/Parse/Android.mk
index aac6500..e8fa743 100644
--- a/lib/Parse/Android.mk
+++ b/lib/Parse/Android.mk
@@ -10,6 +10,7 @@
 	AttrLateParsed.inc  \
 	AttrParsedAttrList.inc  \
 	Attrs.inc  \
+	CommentNodes.inc \
 	DeclNodes.inc  \
 	DiagnosticParseKinds.inc  \
         DiagnosticCommonKinds.inc  \
diff --git a/lib/Rewrite/Android.mk b/lib/Rewrite/Android.mk
index 5a7eec9..8f96b14 100644
--- a/lib/Rewrite/Android.mk
+++ b/lib/Rewrite/Android.mk
@@ -13,6 +13,7 @@
   AttrList.inc \
   Attrs.inc \
   AttrParsedAttrList.inc \
+  CommentNodes.inc \
   DiagnosticCommonKinds.inc \
   DiagnosticFrontendKinds.inc \
   DeclNodes.inc \
@@ -24,6 +25,7 @@
   FrontendActions.cpp \
   HTMLPrint.cpp \
   HTMLRewrite.cpp \
+  InclusionRewriter.cpp \
   RewriteMacros.cpp \
   RewriteModernObjC.cpp \
   RewriteObjC.cpp \
diff --git a/lib/Sema/Android.mk b/lib/Sema/Android.mk
index dadc4e8..b835c4f 100644
--- a/lib/Sema/Android.mk
+++ b/lib/Sema/Android.mk
@@ -11,10 +11,12 @@
 	AttrParsedAttrKinds.inc    \
 	AttrParsedAttrList.inc    \
 	AttrTemplateInstantiate.inc	\
+	CommentNodes.inc \
 	DeclNodes.inc	\
 	DiagnosticASTKinds.inc	\
 	DiagnosticSemaKinds.inc	\
 	DiagnosticParseKinds.inc	\
+	DiagnosticCommentKinds.inc \
 	DiagnosticCommonKinds.inc	\
 	StmtNodes.inc	\
 	arm_neon.inc
diff --git a/lib/Serialization/Android.mk b/lib/Serialization/Android.mk
index 1df628c..01656d9 100644
--- a/lib/Serialization/Android.mk
+++ b/lib/Serialization/Android.mk
@@ -15,6 +15,7 @@
   AttrPCHRead.inc \
   AttrPCHWrite.inc \
   Attrs.inc \
+  CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
   DiagnosticFrontendKinds.inc \
diff --git a/lib/StaticAnalyzer/Checkers/Android.mk b/lib/StaticAnalyzer/Checkers/Android.mk
index b5e4d2c..789f74a 100644
--- a/lib/StaticAnalyzer/Checkers/Android.mk
+++ b/lib/StaticAnalyzer/Checkers/Android.mk
@@ -6,6 +6,7 @@
   AttrParsedAttrList.inc \
   Attrs.inc \
   Checkers.inc \
+  CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
   StmtNodes.inc
@@ -36,6 +37,7 @@
   DebugCheckers.cpp \
   DereferenceChecker.cpp \
   DivZeroChecker.cpp \
+  ExprInspectionChecker.cpp \
   FixedAddressChecker.cpp \
   GenericTaintChecker.cpp \
   IdempotentOperationChecker.cpp \
@@ -64,6 +66,7 @@
   StackAddrEscapeChecker.cpp \
   StreamChecker.cpp \
   TaintTesterChecker.cpp \
+  TraversalChecker.cpp \
   UndefBranchChecker.cpp \
   UndefCapturedBlockVarChecker.cpp \
   UndefResultChecker.cpp \
diff --git a/lib/StaticAnalyzer/Core/Android.mk b/lib/StaticAnalyzer/Core/Android.mk
index 51c8083..487842f 100644
--- a/lib/StaticAnalyzer/Core/Android.mk
+++ b/lib/StaticAnalyzer/Core/Android.mk
@@ -3,17 +3,20 @@
 clang_static_analyzer_core_TBLGEN_TABLES := \
   AttrList.inc \
   Attrs.inc \
+  CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
   StmtNodes.inc
 
 clang_static_analyzer_core_SRC_FILES := \
   AnalysisManager.cpp \
+  APSIntType.cpp \
   BasicConstraintManager.cpp \
   BasicValueFactory.cpp \
   BlockCounter.cpp \
   BugReporter.cpp \
   BugReporterVisitors.cpp \
+  Calls.cpp \
   Checker.cpp \
   CheckerContext.cpp \
   CheckerHelpers.cpp \
@@ -30,7 +33,6 @@
   FunctionSummary.cpp \
   HTMLDiagnostics.cpp \
   MemRegion.cpp \
-  ObjCMessage.cpp \
   PathDiagnostic.cpp \
   PlistDiagnostics.cpp \
   ProgramState.cpp \
diff --git a/lib/StaticAnalyzer/Frontend/Android.mk b/lib/StaticAnalyzer/Frontend/Android.mk
index 89f010f..e7c6664 100644
--- a/lib/StaticAnalyzer/Frontend/Android.mk
+++ b/lib/StaticAnalyzer/Frontend/Android.mk
@@ -6,6 +6,7 @@
 clang_static_analyzer_frontend_TBLGEN_TABLES := \
   AttrList.inc \
   Attrs.inc \
+  CommentNodes.inc \
   DeclNodes.inc \
   DiagnosticCommonKinds.inc \
   DiagnosticFrontendKinds.inc \