Fix multiclass inheritance to limit value resolution to new defs added
by base multiclasses. Do not attempt to alter defs from previous base
multiclasses. This fixes multiple multiclass inheritance.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69974 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/TableGen/MultiClassInherit.td b/test/TableGen/MultiClassInherit.td
index 5a1fc7e..d4c4ce5 100644
--- a/test/TableGen/MultiClassInherit.td
+++ b/test/TableGen/MultiClassInherit.td
@@ -1,4 +1,4 @@
-// RUN: tblgen %s | grep {zing = 4} | count 4
+// RUN: tblgen %s | grep {zing = 4} | count 28
class C1<int A, string B> {
int bar = A;
@@ -8,25 +8,57 @@
def T : C1<4, "blah">;
-multiclass t<int a> {
- def S1 : C1<a, "foo"> {
+multiclass t1<int a1> {
+ def S1 : C1<a1, "foo"> {
int foo = 4;
let bar = 1;
}
- def S2 : C1<a, "bar">;
+ def S2 : C1<a1, "bar">;
}
-multiclass s<int a, int b> : t<a> {
- def S3 : C1<b, "moo"> {
+multiclass t2<int a2> {
+ def S3 : C1<a2, "foo"> {
+ int foo = 4;
+ let bar = 1;
+ }
+ def S4 : C1<a2, "bar">;
+}
+
+multiclass s1<int as1, int bs1> : t1<as1> {
+ def S5 : C1<bs1, "moo"> {
int moo = 3;
let bar = 1;
}
- def S4 : C1<b, "baz">;
+ def S6 : C1<bs1, "baz">;
}
-defm FOO : s<42, 24>;
+multiclass s2<int as2> : t1<as2>, t2<as2>;
+
+multiclass s3<int as3, int bs3> : t1<as3>, t2<as3> {
+ def S7 : C1<bs3, "moo"> {
+ int moo = 3;
+ let bar = 1;
+ }
+ def S8 : C1<bs3, "baz">;
+}
+
+let zing = 4 in
+defm FOO1 : s1<42, 24>;
+
+let zing = 4 in
+defm FOO2 : s2<99>;
+
+let zing = 4 in
+defm FOO3 : s3<84, 48>;
def T4 : C1<6, "foo">;
let zing = 4 in
- defm BAZ : s<3, 4>;
+ defm BAZ1 : s1<3, 4>;
+
+let zing = 4 in
+ defm BAZ2 : s2<5>;
+
+let zing = 4 in
+ defm BAZ3 : s3<6, 7>;
+