diff --git a/utils/TableGen/CodeGenRegisters.h b/utils/TableGen/CodeGenRegisters.h
index 7a51001cd10..ba89190325d 100644
--- a/utils/TableGen/CodeGenRegisters.h
+++ b/utils/TableGen/CodeGenRegisters.h
@@ -24,8 +24,9 @@ namespace llvm {
   struct CodeGenRegister {
     Record *TheDef;
     const std::string &getName() const;
+    unsigned DeclaredSpillSize, DeclaredSpillAlignment;
     
-    CodeGenRegister(Record *R) : TheDef(R) {}
+    CodeGenRegister(Record *R);
   };
 
 
diff --git a/utils/TableGen/CodeGenTarget.cpp b/utils/TableGen/CodeGenTarget.cpp
index e0d251f74f0..c495519e58d 100644
--- a/utils/TableGen/CodeGenTarget.cpp
+++ b/utils/TableGen/CodeGenTarget.cpp
@@ -112,6 +112,11 @@ void CodeGenTarget::ReadRegisters() const {
   Registers.assign(Regs.begin(), Regs.end());
 }
 
+CodeGenRegister::CodeGenRegister(Record *R) : TheDef(R) {
+  DeclaredSpillSize = R->getValueAsInt("SpillSize");
+  DeclaredSpillAlignment = R->getValueAsInt("SpillAlignment");
+}
+
 const std::string &CodeGenRegister::getName() const {
   return TheDef->getName();
 }