1 files changed, 11 insertions, 9 deletions
diff --git a/lib/CodeGen/CGCXXClass.cpp b/lib/CodeGen/CGCXXClass.cpp
index 56a28fc9a0..668139ffb5 100644
--- a/lib/CodeGen/CGCXXClass.cpp
+++ b/lib/CodeGen/CGCXXClass.cpp
@@ -127,7 +127,14 @@ CodeGenFunction::GetAddressCXXOfBaseClass(llvm::Value *BaseValue,
     // Just cast back.
     return Builder.CreateBitCast(BaseValue, BasePtrTy);
   }
-  
+
+  llvm::Value *Offset = 
+    GetCXXBaseClassOffset(*this, BaseValue, ClassDecl, BaseClassDecl);
+
+  // If there is no offset, simply cast the pointer and return it.
+  if (!Offset)
+    return Builder.CreateBitCast(BaseValue, BasePtrTy);
+
   llvm::BasicBlock *CastNull = 0;
   llvm::BasicBlock *CastNotNull = 0;
   llvm::BasicBlock *CastEnd = 0;
@@ -145,15 +152,10 @@ CodeGenFunction::GetAddressCXXOfBaseClass(llvm::Value *BaseValue,
   }
   
   const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(VMContext);
-
-  llvm::Value *Offset = 
-    GetCXXBaseClassOffset(*this, BaseValue, ClassDecl, BaseClassDecl);
   
-  if (Offset) {
-    // Apply the offset.
-    BaseValue = Builder.CreateBitCast(BaseValue, Int8PtrTy);
-    BaseValue = Builder.CreateGEP(BaseValue, Offset, "add.ptr");
-  }
+  // Apply the offset.
+  BaseValue = Builder.CreateBitCast(BaseValue, Int8PtrTy);
+  BaseValue = Builder.CreateGEP(BaseValue, Offset, "add.ptr");
   
   // Cast back.
   BaseValue = Builder.CreateBitCast(BaseValue, BasePtrTy);