[PATCH] D44111: TableGen: Allow ? in lists

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL327493: TableGen: Allow ? in lists (authored by nha, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D44111?vs=137059&id=138321#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D44111

Files:
  llvm/trunk/docs/TableGen/LangIntro.rst
  llvm/trunk/lib/TableGen/TGParser.cpp
  llvm/trunk/test/TableGen/dag-functional.td


Index: llvm/trunk/docs/TableGen/LangIntro.rst
===================================================================
--- llvm/trunk/docs/TableGen/LangIntro.rst
+++ llvm/trunk/docs/TableGen/LangIntro.rst
@@ -178,10 +178,10 @@
     Due to limitations of the type system, 'children' must be a list of items
     of a common type. In practice, this means that they should either have the
     same type or be records with a common superclass. Mixing dag and non-dag
-    items is not possible.
+    items is not possible. However, '?' can be used.
 
-    Example: !dag(op, [a1, a2], ["name1", "name2"]) results in
-    (op a1:$name1, a2:$name2).
+    Example: !dag(op, [a1, a2, ?], ["name1", "name2", "name3"]) results in
+    (op a1:$name1, a2:$name2, ?:$name3).
 
 ``!listconcat(a, b, ...)``
     A list value that is the result of concatenating the 'a' and 'b' lists.
Index: llvm/trunk/test/TableGen/dag-functional.td
===================================================================
--- llvm/trunk/test/TableGen/dag-functional.td
+++ llvm/trunk/test/TableGen/dag-functional.td
@@ -8,7 +8,7 @@
 // CHECK: }
 
 // CHECK: def A1 {
-// CHECK:   dag ret = (ops 1:$a, 2:$b);
+// CHECK:   dag ret = (ops ?:$a, 1:$b, 2);
 // CHECK: }
 
 // CHECK: def A2 {
@@ -70,7 +70,7 @@
 }
 
 def A0 : Aint<[], []>;
-def A1 : Aint<[1, 2], ["a", "b"]>;
+def A1 : Aint<[?, 1, 2], ["a", "b", ?]>;
 
 def A2 : Adag<[(ops $name), (ops 1), (ops "foo")], ["a", "b", "c"]>;
 
Index: llvm/trunk/lib/TableGen/TGParser.cpp
===================================================================
--- llvm/trunk/lib/TableGen/TGParser.cpp
+++ llvm/trunk/lib/TableGen/TGParser.cpp
@@ -1676,18 +1676,16 @@
     RecTy *EltTy = nullptr;
     for (Init *V : Vals) {
       TypedInit *TArg = dyn_cast<TypedInit>(V);
-      if (!TArg) {
-        TokError("Untyped list element");
-        return nullptr;
-      }
-      if (EltTy) {
-        EltTy = resolveTypes(EltTy, TArg->getType());
-        if (!EltTy) {
-          TokError("Incompatible types in list elements");
-          return nullptr;
+      if (TArg) {
+        if (EltTy) {
+          EltTy = resolveTypes(EltTy, TArg->getType());
+          if (!EltTy) {
+            TokError("Incompatible types in list elements");
+            return nullptr;
+          }
+        } else {
+          EltTy = TArg->getType();
         }
-      } else {
-        EltTy = TArg->getType();
       }
     }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D44111.138321.patch
Type: text/x-patch
Size: 2412 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180314/77293f41/attachment.bin>