diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -1523,6 +1523,10 @@ } Value *ScalarExprEmitter::EmitNullValue(QualType Ty) { + // [expr.type.conv]: if the type is cv void and the initializer is () or {}, + // the expression is a prvalue of type void that performs no initialization. + if (Ty->isVoidType()) + return nullptr; return CGF.EmitFromMemory(CGF.CGM.EmitNullConstant(Ty), Ty); } diff --git a/clang/test/CodeGenCXX/value-init.cpp b/clang/test/CodeGenCXX/value-init.cpp --- a/clang/test/CodeGenCXX/value-init.cpp +++ b/clang/test/CodeGenCXX/value-init.cpp @@ -338,4 +338,15 @@ struct optional : optional_data_dtor_base, optional_assign_base {}; optional f(optional a) { return {optional(a)}; } } + +namespace PR48889 { + // Just make sure we don't hit an assertion, the IR is otherwise unchanged. + constexpr void f() {} + void paren_list(bool b) { + return b ? f() : void(); + } + void braced_list(bool b) { + return b ? f() : void{}; + } +} #endif