diff options
| author | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2014-06-10 12:41:14 +0000 |
|---|---|---|
| committer | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2014-06-10 12:41:14 +0000 |
| commit | 2093e88d67a92721fe070b93dda01a6946079f2f (patch) | |
| tree | da305d9e0b689368f5af856fdb2c31c2c3c87218 | |
| parent | e1db6ac10bcdbfde9f32a9180684de5e5c6ee75b (diff) | |
| download | llvm-2093e88d67a92721fe070b93dda01a6946079f2f.tar.gz llvm-2093e88d67a92721fe070b93dda01a6946079f2f.tar.bz2 llvm-2093e88d67a92721fe070b93dda01a6946079f2f.tar.xz | |
Anonymous definitions in foreach blocks triggered a 'def already exists'
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210526 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/TableGen/TGParser.cpp | 9 | ||||
| -rw-r--r-- | test/TableGen/ForeachLoop.td | 26 |
2 files changed, 32 insertions, 3 deletions
diff --git a/lib/TableGen/TGParser.cpp b/lib/TableGen/TGParser.cpp index 2c6a46cb0b..f337c75ed5 100644 --- a/lib/TableGen/TGParser.cpp +++ b/lib/TableGen/TGParser.cpp @@ -360,8 +360,13 @@ bool TGParser::ProcessForeachDefs(Record *CurRec, SMLoc Loc, IterSet &IterVals){ } if (Records.getDef(IterRec->getNameInitAsString())) { - Error(Loc, "def already exists: " + IterRec->getNameInitAsString()); - return true; + // If this record is anonymous, it's no problem, just generate a new name + if (IterRec->isAnonymous()) + IterRec->setName(GetNewAnonymousName()); + else { + Error(Loc, "def already exists: " + IterRec->getNameInitAsString()); + return true; + } } Records.addDef(IterRec); diff --git a/test/TableGen/ForeachLoop.td b/test/TableGen/ForeachLoop.td index 4aacc74d8a..25208fae22 100644 --- a/test/TableGen/ForeachLoop.td +++ b/test/TableGen/ForeachLoop.td @@ -51,8 +51,10 @@ foreach i = [0, 1, 2, 3, 4, 5, 6, 7] in // CHECK: string Name = "R7"; // CHECK: int Index = 7; -foreach i = {0-3,9-7} in +foreach i = {0-3,9-7} in { def S#i : Register<"Q"#i, i>; + def : Register<"T"#i, i>; +} // CHECK: def S0 // CHECK: def S1 @@ -61,3 +63,25 @@ foreach i = {0-3,9-7} in // CHECK: def S7 // CHECK: def S8 // CHECK: def S9 + +// CHECK: def +// CHECK: string Name = "T0"; + +// CHECK: def +// CHECK: string Name = "T1"; + +// CHECK: def +// CHECK: string Name = "T2"; + +// CHECK: def +// CHECK: string Name = "T3"; + +// CHECK: def +// CHECK: string Name = "T9"; + +// CHECK: def +// CHECK: string Name = "T8"; + +// CHECK: def +// CHECK: string Name = "T7"; + |