diff --git a/lib/TableGen/TGParser.cpp b/lib/TableGen/TGParser.cpp
index b6e207f7a74..12ae237c452 100644
--- a/lib/TableGen/TGParser.cpp
+++ b/lib/TableGen/TGParser.cpp
@@ -944,9 +944,7 @@ Init *TGParser::ParseOperation(Record *CurRec, RecTy *ItemType) {
 
     // If we are doing !listconcat, we should know the type by now
     if (OpTok == tgtok::XListConcat) {
-      if (VarInit *Arg0 = dyn_cast<VarInit>(InitList[0]))
-        Type = Arg0->getType();
-      else if (ListInit *Arg0 = dyn_cast<ListInit>(InitList[0]))
+      if (TypedInit *Arg0 = dyn_cast<TypedInit>(InitList[0]))
         Type = Arg0->getType();
       else {
         InitList[0]->print(errs());
diff --git a/test/TableGen/listconcat.td b/test/TableGen/listconcat.td
index 870e649d41d..26dce17e92d 100644
--- a/test/TableGen/listconcat.td
+++ b/test/TableGen/listconcat.td
@@ -1,18 +1,32 @@
 // RUN: llvm-tblgen %s | FileCheck %s
 
+// CHECK: class X<list<int> X:a = ?, list<int> X:b = ?, list<int> X:c = ?> {
+// CHECK:   list<int> x = !listconcat(!listconcat(X:a, X:b), !listconcat(X:b, X:c));
+// CHECK: }
+
 // CHECK: class Y<list<string> Y:S = ?> {
 // CHECK:   list<string> T1 = !listconcat(Y:S, ["foo"]);
 // CHECK:   list<string> T2 = !listconcat(Y:S, !listconcat(["foo"], !listconcat(Y:S, ["bar", "baz"])));
 // CHECK: }
 
+// CHECK: def DX {
+// CHECK:   list<int> x = [0, 1, 1, 2]
+// CHECK: }
+
 // CHECK: def Z {
 // CHECK:   list<string> T1 = ["fu", "foo"];
 // CHECK:   list<string> T2 = ["fu", "foo", "fu", "bar", "baz"];
 // CHECK: }
 
+class X<list<int> a, list<int> b, list<int> c> {
+    list<int> x = !listconcat(!listconcat(a, b), !listconcat(b, c));
+}
+
 class Y<list<string> S> {
   list<string> T1 = !listconcat(S, ["foo"]);
   list<string> T2 = !listconcat(S, ["foo"], S, ["bar", "baz"]);
 }
 
+def DX : X<[0], [1], [2]>;
+
 def Z : Y<["fu"]>;