[llvm-commits] [llvm] r152232 - in /llvm/trunk: lib/TableGen/Record.cpp test/TableGen/TwoLevelName.td

[Jakob Stoklund Olesen]

Author: stoklund
Date: Wed Mar  7 10:39:35 2012
New Revision: 152232

URL: http://llvm.org/viewvc/llvm-project?rev=152232&view=rev
Log:
Fix infinite loop in nested multiclasses.

Patch by Michael Liao!

Added:
    llvm/trunk/test/TableGen/TwoLevelName.td
Modified:
    llvm/trunk/lib/TableGen/Record.cpp

Modified: llvm/trunk/lib/TableGen/Record.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/Record.cpp?rev=152232&r1=152231&r2=152232&view=diff
==============================================================================
--- llvm/trunk/lib/TableGen/Record.cpp (original)
+++ llvm/trunk/lib/TableGen/Record.cpp Wed Mar  7 10:39:35 2012
@@ -1726,12 +1726,6 @@
   }  // Otherwise this isn't yet registered.
   Name = NewName;
   checkName();
-  // Since the Init for the name was changed, see if we can resolve
-  // any of it using members of the Record.
-  Init *ComputedName = Name->resolveReferences(*this, 0);
-  if (ComputedName != Name) {
-    setName(ComputedName);
-  }
   // DO NOT resolve record values to the name at this point because
   // there might be default values for arguments of this def.  Those
   // arguments might not have been resolved yet so we don't want to
@@ -1754,6 +1748,8 @@
 /// references.
 void Record::resolveReferencesTo(const RecordVal *RV) {
   for (unsigned i = 0, e = Values.size(); i != e; ++i) {
+    if (RV == &Values[i]) // Skip resolve the same field as the given one
+      continue;
     if (Init *V = Values[i].getValue())
       Values[i].setValue(V->resolveReferences(*this, RV));
   }

Added: llvm/trunk/test/TableGen/TwoLevelName.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/TwoLevelName.td?rev=152232&view=auto
==============================================================================
--- llvm/trunk/test/TableGen/TwoLevelName.td (added)
+++ llvm/trunk/test/TableGen/TwoLevelName.td Wed Mar  7 10:39:35 2012
@@ -0,0 +1,46 @@
+// RUN: llvm-tblgen %s | FileCheck %s
+// XFAIL: vg_leak
+
+class Type<string name, int length, int width> {
+  string Name = name;
+  int Length = length;
+  int Width = width;
+}
+
+multiclass OT1<string ss, int l, int w> {
+  def _#NAME# : Type<ss, l, w>;
+}
+multiclass OT2<string ss, int w> {
+  defm  v1#NAME# : OT1<!strconcat( "v1", ss),  1, w>;
+  defm  v2#NAME# : OT1<!strconcat( "v2", ss),  2, w>;
+  defm  v3#NAME# : OT1<!strconcat( "v3", ss),  3, w>;
+  defm  v4#NAME# : OT1<!strconcat( "v4", ss),  4, w>;
+  defm  v8#NAME# : OT1<!strconcat( "v8", ss),  8, w>;
+  defm v16#NAME# : OT1<!strconcat("v16", ss), 16, w>;
+}
+
+defm i8 : OT2<"i8", 8>;
+
+// CHECK: _v16i8
+// CHECK: Length = 16
+// CHECK: Width = 8
+
+// CHECK: _v1i8
+// CHECK: Length = 1
+// CHECK: Width = 8
+
+// CHECK: _v2i8
+// CHECK: Length = 2
+// CHECK: Width = 8
+
+// CHECK: _v3i8
+// CHECK: Length = 3
+// CHECK: Width = 8
+
+// CHECK: _v4i8
+// CHECK: Length = 4
+// CHECK: Width = 8
+
+// CHECK: _v8i8
+// CHECK: Length = 8
+// CHECK: Width = 8