diff --git a/clang/lib/AST/Interp/ByteCodeExprGen.cpp b/clang/lib/AST/Interp/ByteCodeExprGen.cpp --- a/clang/lib/AST/Interp/ByteCodeExprGen.cpp +++ b/clang/lib/AST/Interp/ByteCodeExprGen.cpp @@ -2180,15 +2180,33 @@ template bool ByteCodeExprGen::visitExpr(const Expr *E) { ExprScope RootScope(this); - if (!visit(E)) - return false; - - if (E->getType()->isVoidType()) + // Void expressions. + if (E->getType()->isVoidType()) { + if (!visit(E)) + return false; return this->emitRetVoid(E); + } - if (std::optional T = classify(E)) + // Expressions with a primitive return type. + if (std::optional T = classify(E)) { + if (!visit(E)) + return false; return this->emitRet(*T, E); - return this->emitRetValue(E); + } + + // Expressions with a composite return type. + // For us, that means everything we don't + // have a PrimType for. + if (std::optional LocalOffset = this->allocateLocal(E)) { + if (!this->visitLocalInitializer(E, *LocalOffset)) + return false; + + if (!this->emitGetPtrLocal(*LocalOffset, E)) + return false; + return this->emitRetValue(E); + } + + return false; } /// Toplevel visitDecl(). @@ -2644,7 +2662,14 @@ return false; if (!this->emitConstUint8(0, E)) return false; - return this->emitArrayElemPtrPopUint8(E); + if (!this->emitArrayElemPtrPopUint8(E)) + return false; + + // Since our _Complex implementation does not map to a primitive type, + // we sometimes have to do the lvalue-to-rvalue conversion here manually. + if (!SubExpr->isLValue()) + return this->emitLoadPop(classifyPrim(E->getType()), E); + return true; } case UO_Imag: { // __imag x assert(!T); @@ -2652,7 +2677,14 @@ return false; if (!this->emitConstUint8(1, E)) return false; - return this->emitArrayElemPtrPopUint8(E); + if (!this->emitArrayElemPtrPopUint8(E)) + return false; + + // Since our _Complex implementation does not map to a primitive type, + // we sometimes have to do the lvalue-to-rvalue conversion here manually. + if (!SubExpr->isLValue()) + return this->emitLoadPop(classifyPrim(E->getType()), E); + return true; } case UO_Extension: return this->delegate(SubExpr); diff --git a/clang/test/AST/Interp/complex.cpp b/clang/test/AST/Interp/complex.cpp --- a/clang/test/AST/Interp/complex.cpp +++ b/clang/test/AST/Interp/complex.cpp @@ -38,6 +38,10 @@ static_assert(__imag(I2) == 0, ""); +/// Standalone complex expressions. +static_assert(__real((_Complex float){1.0, 3.0}) == 1.0, ""); + + #if 0 /// FIXME: This should work in the new interpreter. constexpr _Complex double D2 = {12};