diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 8ffa0dd..001c344 100644
--- a/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -140,6 +140,9 @@
 
   unsigned getTypeAlignment(const llvm::Type *Ty) const;
 
+  /// getCGRecordLayout - Return the CGRecordLayout for the given record.
+  const CGRecordLayout &getCGRecordLayout(const CXXRecordDecl *RD);
+
   /// CheckZeroInitializable - Check if the given type contains a pointer
   /// to data member.
   void CheckZeroInitializable(QualType T);
@@ -687,6 +690,15 @@
   return Types.getTargetData().getABITypeAlignment(Ty);
 }
 
+const CGRecordLayout &
+CGRecordLayoutBuilder::getCGRecordLayout(const CXXRecordDecl *RD) {
+  // FIXME: It would be better if there was a way to explicitly compute the
+  // record layout instead of converting to a type.
+  Types.ConvertTagDeclType(RD);
+
+  return Types.getCGRecordLayout(RD);
+}
+
 void CGRecordLayoutBuilder::CheckZeroInitializable(QualType T) {
   // This record already contains a member pointer.
   if (!IsZeroInitializable)
@@ -712,12 +724,7 @@
   if (!IsZeroInitializable)
     return;
 
-  // FIXME: It would be better if there was a way to explicitly compute the
-  // record layout instead of converting to a type.
-  Types.ConvertTagDeclType(RD);
-  
-  const CGRecordLayout &Layout = Types.getCGRecordLayout(RD);
-  
+  const CGRecordLayout &Layout = getCGRecordLayout(RD);
   if (!Layout.isZeroInitializable())
     IsZeroInitializable = false;
 }