Minor optimization to skip null check in generated code where it isn't
necessary.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86741 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGCXXClass.cpp b/lib/CodeGen/CGCXXClass.cpp
index 56a28fc..668139f 100644
--- a/lib/CodeGen/CGCXXClass.cpp
+++ b/lib/CodeGen/CGCXXClass.cpp
@@ -127,7 +127,14 @@
// 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 @@
}
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);