gn build: (manually) merge r371834, take 2

llvm-svn: 371851

utils/gn/secondary/clang/lib/AST/BUILD.gn

@@ -1,7 +1,16 @@
+import("//clang/utils/TableGen/clang_tablegen.gni")
+
+clang_tablegen("Opcodes") {
+  visibility = [ ":AST" ]
+  args = [ "-gen-clang-opcodes" ]
+  td_file = "Interp/Opcodes.td"
+}
+
 static_library("AST") {
   output_name = "clangAST"
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
+    ":Opcodes",
     "//clang/include/clang/AST:AttrImpl",
     "//clang/include/clang/AST:AttrNodeTraverse",
     "//clang/include/clang/AST:AttrTextNodeDump",
@@ -10,7 +19,6 @@ static_library("AST") {
     "//clang/include/clang/AST:CommentHTMLTags",
     "//clang/include/clang/AST:CommentHTMLTagsProperties",
     "//clang/include/clang/AST:DeclNodes",
-    "//clang/lib/AST/Interp",
     "//clang/lib/Basic",
     "//clang/lib/Lex",
     "//llvm/lib/BinaryFormat",
@@ -65,6 +73,27 @@ static_library("AST") {
     "ExternalASTSource.cpp",
     "FormatString.cpp",
     "InheritViz.cpp",
+    "Interp/Block.cpp",
+    "Interp/ByteCodeEmitter.cpp",
+    "Interp/ByteCodeExprGen.cpp",
+    "Interp/ByteCodeGenError.cpp",
+    "Interp/ByteCodeStmtGen.cpp",
+    "Interp/Context.cpp",
+    "Interp/Descriptor.cpp",
+    "Interp/Disasm.cpp",
+    "Interp/EvalEmitter.cpp",
+    "Interp/Frame.cpp",
+    "Interp/Function.cpp",
+    "Interp/Interp.cpp",
+    "Interp/InterpFrame.cpp",
+    "Interp/InterpStack.cpp",
+    "Interp/InterpState.cpp",
+    "Interp/Pointer.cpp",
+    "Interp/PrimType.cpp",
+    "Interp/Program.cpp",
+    "Interp/Record.cpp",
+    "Interp/Source.cpp",
+    "Interp/State.cpp",
     "ItaniumCXXABI.cpp",
     "ItaniumMangle.cpp",
     "JSONNodeDumper.cpp",

utils/gn/secondary/clang/lib/AST/Interp/BUILD.gn

@@ -1,39 +0,0 @@
-import("//clang/utils/TableGen/clang_tablegen.gni")
-
-clang_tablegen("Opcodes") {
-  args = [ "-gen-clang-opcodes" ]
-  td_file = "Opcodes.td"
-}
-
-static_library("Interp") {
-  output_name = "clangInterp"
-  configs += [ "//llvm/utils/gn/build:clang_code" ]
-  deps = [
-    "//clang/lib/AST/Interp:Opcodes",
-    "//clang/lib/Basic",
-    "//llvm/lib/Support",
-  ]
-  sources = [
-    "Block.cpp",
-    "ByteCodeEmitter.cpp",
-    "ByteCodeExprGen.cpp",
-    "ByteCodeGenError.cpp",
-    "ByteCodeStmtGen.cpp",
-    "Context.cpp",
-    "Descriptor.cpp",
-    "Disasm.cpp",
-    "EvalEmitter.cpp",
-    "Frame.cpp",
-    "Function.cpp",
-    "Interp.cpp",
-    "InterpFrame.cpp",
-    "InterpStack.cpp",
-    "InterpState.cpp",
-    "Pointer.cpp",
-    "Program.cpp",
-    "Record.cpp",
-    "Source.cpp",
-    "State.cpp",
-    "Type.cpp",
-  ]
-}

utils/gn/secondary/clang/utils/TableGen/BUILD.gn

@@ -11,10 +11,10 @@ executable("clang-tblgen") {
     "ClangCommentHTMLTagsEmitter.cpp",
     "ClangDataCollectorsEmitter.cpp",
     "ClangDiagnosticsEmitter.cpp",
+    "ClangOpcodesEmitter.cpp",
     "ClangOpenCLBuiltinEmitter.cpp",
     "ClangOptionDocEmitter.cpp",
     "ClangSACheckersEmitter.cpp",
-    "ClangOpcodesEmitter.cpp",
     "NeonEmitter.cpp",
     "TableGen.cpp",
   ]