Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clang/docs/ReleaseNotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,7 @@ Crash and bug fixes
containing a single colon. (#GH167905)
- Fixed a crash when parsing malformed #pragma clang loop vectorize_width(4,8,16)
by diagnosing invalid comma-separated argument lists. (#GH166325)
- Fixed a crash when explicitly casting a scalar to an atomic complex. (#GH114885)

Improvements
^^^^^^^^^^^^
Expand Down
15 changes: 8 additions & 7 deletions clang/lib/CodeGen/CGExprComplex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,16 @@ class ComplexExprEmitter
// here.
if (E->changesVolatileQualification())
return EmitLoadOfLValue(E);
return EmitCast(E->getCastKind(), E->getSubExpr(), E->getType());
return EmitCast(E->getCastKind(), E->getSubExpr(),
E->getType().getAtomicUnqualifiedType());
}
ComplexPairTy VisitCastExpr(CastExpr *E) {
if (const auto *ECE = dyn_cast<ExplicitCastExpr>(E))
CGF.CGM.EmitExplicitCastExprType(ECE, &CGF);
if (E->changesVolatileQualification())
return EmitLoadOfLValue(E);
return EmitCast(E->getCastKind(), E->getSubExpr(), E->getType());
return EmitCast(E->getCastKind(), E->getSubExpr(),
E->getType().getAtomicUnqualifiedType());
}
ComplexPairTy VisitCallExpr(const CallExpr *E);
ComplexPairTy VisitStmtExpr(const StmtExpr *E);
Expand Down Expand Up @@ -630,7 +632,8 @@ ComplexPairTy ComplexExprEmitter::EmitCast(CastKind CK, Expr *Op,
case CK_FloatingRealToComplex:
case CK_IntegralRealToComplex: {
CodeGenFunction::CGFPOptionsRAII FPOptsRAII(CGF, Op);
return EmitScalarToComplexCast(CGF.EmitScalarExpr(Op), Op->getType(),
return EmitScalarToComplexCast(CGF.EmitScalarExpr(Op),
Op->getType().getAtomicUnqualifiedType(),
DestTy, Op->getExprLoc());
}

Expand Down Expand Up @@ -1220,9 +1223,7 @@ EmitCompoundAssignLValue(const CompoundAssignOperator *E,
RValue &Val) {
TestAndClearIgnoreReal();
TestAndClearIgnoreImag();
QualType LHSTy = E->getLHS()->getType();
if (const AtomicType *AT = LHSTy->getAs<AtomicType>())
LHSTy = AT->getValueType();
QualType LHSTy = E->getLHS()->getType().getAtomicUnqualifiedType();

BinOpInfo OpInfo;
OpInfo.FPFeatures = E->getFPFeaturesInEffect(CGF.getLangOpts());
Expand All @@ -1240,7 +1241,7 @@ EmitCompoundAssignLValue(const CompoundAssignOperator *E,
E->getComputationResultType(), IsComplexDivisor);
if (PromotionTypeCR.isNull())
PromotionTypeCR = E->getComputationResultType();
OpInfo.Ty = PromotionTypeCR;
OpInfo.Ty = PromotionTypeCR.getAtomicUnqualifiedType();
QualType ComplexElementTy =
OpInfo.Ty->castAs<ComplexType>()->getElementType();
QualType PromotionTypeRHS =
Expand Down
15 changes: 15 additions & 0 deletions clang/test/CodeGen/complex.c
Original file line number Diff line number Diff line change
Expand Up @@ -593,3 +593,18 @@ void imag_on_scalar_with_type_promotion() {
_Float16 _Complex a;
_Float16 b = __real__(__imag__ a);
}

// CHECK-LABEL: define dso_local void @explicit_cast_scalar_to_atomic_complex(
// CHECK-SAME: ) #[[ATTR0]] {
// CHECK-NEXT: [[ENTRY:.*:]]
// CHECK-NEXT: [[A:%.*]] = alloca { float, float }, align 8
// CHECK-NEXT: [[A_REALP:%.*]] = getelementptr inbounds nuw { float, float }, ptr [[A]], i32 0, i32 0
// CHECK-NEXT: [[A_IMAGP:%.*]] = getelementptr inbounds nuw { float, float }, ptr [[A]], i32 0, i32 1
// CHECK-NEXT: store float 2.000000e+00, ptr [[A_REALP]], align 8
// CHECK-NEXT: store float 0.000000e+00, ptr [[A_IMAGP]], align 4
// CHECK-NEXT: ret void
//
void explicit_cast_scalar_to_atomic_complex() {
_Atomic _Complex float a = (_Atomic _Complex float)2.0f;
}