diff --git a/utils/TableGen/InstrInfoEmitter.cpp b/utils/TableGen/InstrInfoEmitter.cpp
index fbaf37fe02e..53c15a5f367 100644
--- a/utils/TableGen/InstrInfoEmitter.cpp
+++ b/utils/TableGen/InstrInfoEmitter.cpp
@@ -136,8 +136,7 @@ void InstrInfoEmitter::run(std::ostream &OS) {
       OS << "static const TargetOperandInfo OperandInfo" << N << "[] = { ";
       for (unsigned i = 0, e = OperandInfo.size(); i != e; ++i) {
         if (Record *RC = OperandInfo[i]) {
-          // FIXME: BAD: REQUIRES RUNTIME INIT
-          OS << "{ " << getQualifiedName(RC) << "RegisterClass }, ";
+          OS << "{ &" << getQualifiedName(RC) << "RegClass }, ";
         } else {
           OS << "{ 0 }, ";
         }