@@ -52,8 +52,7 @@ llvm::Value *CodeGenFunction::EmitObjCStringLiteral(const ObjCStringLiteral *E)
52
52
{
53
53
llvm::Constant *C =
54
54
CGM.getObjCRuntime ().GenerateConstantString (E->getString ()).getPointer ();
55
- // FIXME: This bitcast should just be made an invariant on the Runtime.
56
- return llvm::ConstantExpr::getBitCast (C, ConvertType (E->getType ()));
55
+ return C;
57
56
}
58
57
59
58
// / EmitObjCBoxedExpr - This routine generates code to call
@@ -3710,7 +3709,7 @@ CodeGenFunction::GenerateObjCAtomicSetterCopyHelperFunction(
3710
3709
CharUnits Alignment = C.getTypeAlignInChars (Ty);
3711
3710
llvm::Constant *Fn = getNonTrivialCStructMoveAssignmentOperator (
3712
3711
CGM, Alignment, Alignment, Ty.isVolatileQualified (), Ty);
3713
- return llvm::ConstantExpr::getBitCast (Fn, VoidPtrTy) ;
3712
+ return Fn ;
3714
3713
}
3715
3714
3716
3715
if (!getLangOpts ().CPlusPlus ||
@@ -3790,7 +3789,7 @@ CodeGenFunction::GenerateObjCAtomicSetterCopyHelperFunction(
3790
3789
EmitStmt (TheCall);
3791
3790
3792
3791
FinishFunction ();
3793
- HelperFn = llvm::ConstantExpr::getBitCast (Fn, VoidPtrTy) ;
3792
+ HelperFn = Fn ;
3794
3793
CGM.setAtomicSetterHelperFnMap (Ty, HelperFn);
3795
3794
return HelperFn;
3796
3795
}
@@ -3808,7 +3807,7 @@ llvm::Constant *CodeGenFunction::GenerateObjCAtomicGetterCopyHelperFunction(
3808
3807
CharUnits Alignment = C.getTypeAlignInChars (Ty);
3809
3808
llvm::Constant *Fn = getNonTrivialCStructCopyConstructor (
3810
3809
CGM, Alignment, Alignment, Ty.isVolatileQualified (), Ty);
3811
- return llvm::ConstantExpr::getBitCast (Fn, VoidPtrTy) ;
3810
+ return Fn ;
3812
3811
}
3813
3812
3814
3813
if (!getLangOpts ().CPlusPlus ||
@@ -3909,7 +3908,7 @@ llvm::Constant *CodeGenFunction::GenerateObjCAtomicGetterCopyHelperFunction(
3909
3908
AggValueSlot::IsNotAliased, AggValueSlot::DoesNotOverlap));
3910
3909
3911
3910
FinishFunction ();
3912
- HelperFn = llvm::ConstantExpr::getBitCast (Fn, VoidPtrTy) ;
3911
+ HelperFn = Fn ;
3913
3912
CGM.setAtomicGetterHelperFnMap (Ty, HelperFn);
3914
3913
return HelperFn;
3915
3914
}
0 commit comments