diff --git a/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/lib/CodeGen/SelectionDAG/TargetLowering.cpp
index 7436c1747ad..7433a79f9f4 100644
--- a/lib/CodeGen/SelectionDAG/TargetLowering.cpp
+++ b/lib/CodeGen/SelectionDAG/TargetLowering.cpp
@@ -1852,7 +1852,10 @@ TargetLowering::getConstraintType(const std::string &Constraint) const {
       return C_Other;
     }
   }
-  // TODO: Handle registers.
+  
+  if (Constraint.size() > 1 && Constraint[0] == '{' && 
+      Constraint[Constraint.size()-1] == '}')
+    return C_Register;
   return C_Unknown;
 }