Skip to content

Commit 730d313

Browse files
committed
[CGObjC] Remove no-op ptr-to-ptr bitcasts (NFC)
Opaque ptr cleanup effort (NFC)
1 parent e7c6147 commit 730d313

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

clang/lib/CodeGen/CGObjC.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ llvm::Value *CodeGenFunction::EmitObjCStringLiteral(const ObjCStringLiteral *E)
5252
{
5353
llvm::Constant *C =
5454
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;
5756
}
5857

5958
/// EmitObjCBoxedExpr - This routine generates code to call
@@ -3710,7 +3709,7 @@ CodeGenFunction::GenerateObjCAtomicSetterCopyHelperFunction(
37103709
CharUnits Alignment = C.getTypeAlignInChars(Ty);
37113710
llvm::Constant *Fn = getNonTrivialCStructMoveAssignmentOperator(
37123711
CGM, Alignment, Alignment, Ty.isVolatileQualified(), Ty);
3713-
return llvm::ConstantExpr::getBitCast(Fn, VoidPtrTy);
3712+
return Fn;
37143713
}
37153714

37163715
if (!getLangOpts().CPlusPlus ||
@@ -3790,7 +3789,7 @@ CodeGenFunction::GenerateObjCAtomicSetterCopyHelperFunction(
37903789
EmitStmt(TheCall);
37913790

37923791
FinishFunction();
3793-
HelperFn = llvm::ConstantExpr::getBitCast(Fn, VoidPtrTy);
3792+
HelperFn = Fn;
37943793
CGM.setAtomicSetterHelperFnMap(Ty, HelperFn);
37953794
return HelperFn;
37963795
}
@@ -3808,7 +3807,7 @@ llvm::Constant *CodeGenFunction::GenerateObjCAtomicGetterCopyHelperFunction(
38083807
CharUnits Alignment = C.getTypeAlignInChars(Ty);
38093808
llvm::Constant *Fn = getNonTrivialCStructCopyConstructor(
38103809
CGM, Alignment, Alignment, Ty.isVolatileQualified(), Ty);
3811-
return llvm::ConstantExpr::getBitCast(Fn, VoidPtrTy);
3810+
return Fn;
38123811
}
38133812

38143813
if (!getLangOpts().CPlusPlus ||
@@ -3909,7 +3908,7 @@ llvm::Constant *CodeGenFunction::GenerateObjCAtomicGetterCopyHelperFunction(
39093908
AggValueSlot::IsNotAliased, AggValueSlot::DoesNotOverlap));
39103909

39113910
FinishFunction();
3912-
HelperFn = llvm::ConstantExpr::getBitCast(Fn, VoidPtrTy);
3911+
HelperFn = Fn;
39133912
CGM.setAtomicGetterHelperFnMap(Ty, HelperFn);
39143913
return HelperFn;
39153914
}

0 commit comments

Comments
 (0)