diff options
| -rw-r--r-- | lib/CodeGen/CGExprConstant.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGen/const-init.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index d7c6457ff8..e618dab33e 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -59,8 +59,9 @@ public: return EmitUnion(CGM.EmitConstantExpr(SubExpr, SubExpr->getType(), CGF), Ty); } - if (CGM.getContext().getCanonicalType(E->getSubExpr()->getType()) == - CGM.getContext().getCanonicalType(E->getType())) { + // Explicit and implicit no-op casts + QualType Ty = E->getType(), SubTy = E->getSubExpr()->getType(); + if (CGM.getContext().hasSameUnqualifiedType(Ty, SubTy)) { return Visit(E->getSubExpr()); } return 0; diff --git a/test/CodeGen/const-init.c b/test/CodeGen/const-init.c index a7220e0c29..1f9d74c7e9 100644 --- a/test/CodeGen/const-init.c +++ b/test/CodeGen/const-init.c @@ -96,4 +96,9 @@ void *g20(void) { return l0.f1; } +// PR4108 +struct g21 {int g21;}; +const struct g21 g21 = (struct g21){1}; + // RUN: true + |