diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp
index af9dc95e97c..590e19420ab 100644
--- a/utils/TableGen/DAGISelEmitter.cpp
+++ b/utils/TableGen/DAGISelEmitter.cpp
@@ -509,7 +509,7 @@ void DAGISelEmitter::ParseNodeTransforms(std::ostream &OS) {
     SDNodeXForms.insert(std::make_pair(XFormNode,
                                        std::make_pair(SDNode, Code)));
 
-    if (!Code.empty()) {
+    if (0 && !Code.empty()) {
       std::string ClassName = getSDNodeInfo(SDNode).getSDClassName();
       const char *C2 = ClassName == "SDNode" ? "N" : "inN";
 
@@ -592,6 +592,12 @@ void DAGISelEmitter::ParseAndResolvePatternFragments(std::ostream &OS) {
       OS << Code << "\n}\n";
       P->getOnlyTree()->setPredicateFn("Predicate_"+Fragments[i]->getName());
     }
+    
+    // If there is a node transformation corresponding to this, keep track of
+    // it.
+    Record *Transform = Fragments[i]->getValueAsDef("OperandTransform");
+    if (!getSDNodeTransform(Transform).second.empty())    // not noop xform?
+      P->getOnlyTree()->setTransformFn("Transform_"+Transform->getName());
   }
   
   OS << "\n\n";
diff --git a/utils/TableGen/DAGISelEmitter.h b/utils/TableGen/DAGISelEmitter.h
index d1605228679..d9668552db8 100644
--- a/utils/TableGen/DAGISelEmitter.h
+++ b/utils/TableGen/DAGISelEmitter.h
@@ -302,6 +302,11 @@ public:
     return PatternFragments.find(R)->second;
   }
   
+  const std::pair<Record*, std::string> &getSDNodeTransform(Record *R) const {
+    assert(SDNodeXForms.count(R) && "Invalid transform!");
+    return SDNodeXForms.find(R)->second;
+  }
+  
 private:
   void ParseNodeInfo();
   void ParseNodeTransforms(std::ostream &OS);