[llvm] r371851 - gn build: (manually) merge r371834, take 2

[Nico Weber via llvm-commits]

Author: nico
Date: Fri Sep 13 06:07:54 2019
New Revision: 371851

URL: http://llvm.org/viewvc/llvm-project?rev=371851&view=rev
Log:
gn build: (manually) merge r371834, take 2

Removed:
    llvm/trunk/utils/gn/secondary/clang/lib/AST/Interp/
Modified:
    llvm/trunk/utils/gn/secondary/clang/lib/AST/BUILD.gn
    llvm/trunk/utils/gn/secondary/clang/utils/TableGen/BUILD.gn

Modified: llvm/trunk/utils/gn/secondary/clang/lib/AST/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang/lib/AST/BUILD.gn?rev=371851&r1=371850&r2=371851&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang/lib/AST/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/clang/lib/AST/BUILD.gn Fri Sep 13 06:07:54 2019
@@ -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",

Modified: llvm/trunk/utils/gn/secondary/clang/utils/TableGen/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang/utils/TableGen/BUILD.gn?rev=371851&r1=371850&r2=371851&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang/utils/TableGen/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/clang/utils/TableGen/BUILD.gn Fri Sep 13 06:07:54 2019
@@ -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",
   ]