llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Mariya Podchishchaeva (Fznamznon) <details> <summary>Changes</summary> This patch makes remaining cases of #embed to emit int type since there is an agreement to do that for C. C++ is being discussed, but in general we don't want to produce different types for C and C++. --- Full diff: https://github.com/llvm/llvm-project/pull/99050.diff 3 Files Affected: - (modified) clang/lib/AST/Expr.cpp (+1-1) - (modified) clang/lib/Sema/SemaInit.cpp (+1-1) - (modified) clang/test/Preprocessor/embed_codegen.cpp (+4-4) ``````````diff diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index 6af1b5683e08b..9d5b8167d0ee6 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -2376,7 +2376,7 @@ APValue SourceLocExpr::EvaluateInContext(const ASTContext &Ctx, EmbedExpr::EmbedExpr(const ASTContext &Ctx, SourceLocation Loc, EmbedDataStorage *Data, unsigned Begin, unsigned NumOfElements) - : Expr(EmbedExprClass, Ctx.UnsignedCharTy, VK_PRValue, OK_Ordinary), + : Expr(EmbedExprClass, Ctx.IntTy, VK_PRValue, OK_Ordinary), EmbedKeywordLoc(Loc), Ctx(&Ctx), Data(Data), Begin(Begin), NumOfElements(NumOfElements) { setDependence(ExprDependence::None); diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index a27ed02fc73b8..2c963b28aeb2b 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -2007,7 +2007,7 @@ static bool canInitializeArrayWithEmbedDataString(ArrayRef<Expr *> ExprList, if (InitType->isArrayType()) { const ArrayType *InitArrayType = InitType->getAsArrayTypeUnsafe(); QualType InitElementTy = InitArrayType->getElementType(); - QualType EmbedExprElementTy = EE->getType(); + QualType EmbedExprElementTy = EE->getDataStringLiteral()->getType(); const bool TypesMatch = Context.typesAreCompatible(InitElementTy, EmbedExprElementTy) || (InitElementTy->isCharType() && EmbedExprElementTy->isCharType()); diff --git a/clang/test/Preprocessor/embed_codegen.cpp b/clang/test/Preprocessor/embed_codegen.cpp index 201bf300bc669..fdbf4f2aa400f 100644 --- a/clang/test/Preprocessor/embed_codegen.cpp +++ b/clang/test/Preprocessor/embed_codegen.cpp @@ -13,9 +13,9 @@ int ca[] = { }; // CHECK: %arrayinit.element = getelementptr inbounds i32, ptr %notca, i64 1 -// CHECK: store i8 106, ptr %arrayinit.element, align 4 +// CHECK: store i32 106, ptr %arrayinit.element, align 4 // CHECK: %arrayinit.element1 = getelementptr inbounds i32, ptr %notca, i64 2 -// CHECK: store i8 107, ptr %arrayinit.element1, align 4 +// CHECK: store i32 107, ptr %arrayinit.element1, align 4 int notca[] = { a #embed <jk.txt> prefix(,) @@ -74,9 +74,9 @@ constexpr struct T t[] = { // CHECK: %arrayinit.element7 = getelementptr inbounds %struct.T, ptr %tnonc, i64 1 // CHECK: call void @llvm.memset.p0.i64(ptr align 4 %arrayinit.element7, i8 0, i64 20, i1 false) // CHECK: %arr8 = getelementptr inbounds %struct.T, ptr %arrayinit.element7, i32 0, i32 0 -// CHECK: store i8 106, ptr %arr8, align 4 +// CHECK: store i32 106, ptr %arr8, align 4 // CHECK: %arrayinit.element9 = getelementptr inbounds i32, ptr %arr8, i64 1 -// CHECK: store i8 107, ptr %arrayinit.element9, align 4 +// CHECK: store i32 107, ptr %arrayinit.element9, align 4 struct T tnonc[] = { a, 300, 1, 2, 3 #embed <jk.txt> prefix(,) `````````` </details> https://github.com/llvm/llvm-project/pull/99050 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
