paulsemel updated this revision to Diff 138687.
paulsemel added a comment.
Added some tests (unit tests for almost every types) and some other tests with
tricky cases.
More tests are coming soon.
Repository:
rC Clang
https://reviews.llvm.org/D44093
Files:
include/clang/Basic/Builtins.def
lib/CodeGen/CGBuiltin.cpp
lib/Sema/SemaChecking.cpp
test/CodeGen/dump-struct-builtin.c
Index: test/CodeGen/dump-struct-builtin.c
===================================================================
--- /dev/null
+++ test/CodeGen/dump-struct-builtin.c
@@ -0,0 +1,270 @@
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
+
+#include "Inputs/stdio.h"
+
+void unit1()
+{
+ struct U1A {
+ short a;
+ };
+
+ struct U1A a = {
+ .a = 12,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U1A, %struct.U1A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i16, i16* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i16 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit2()
+{
+ struct U2A {
+ unsigned short a;
+ };
+
+ struct U2A a = {
+ .a = 12,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U2A, %struct.U2A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i16, i16* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i16 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit3()
+{
+ struct U3A {
+ int a;
+ };
+
+ struct U3A a = {
+ .a = 12,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U3A, %struct.U3A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i32, i32* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i32 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit4()
+{
+ struct U4A {
+ unsigned int a;
+ };
+
+ struct U4A a = {
+ .a = 12,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U4A, %struct.U4A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i32, i32* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i32 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit5()
+{
+ struct U5A {
+ long a;
+ };
+
+ struct U5A a = {
+ .a = 12,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U5A, %struct.U5A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i64, i64* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i64 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit6()
+{
+ struct U6A {
+ unsigned long a;
+ };
+
+ struct U6A a = {
+ .a = 12,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U6A, %struct.U6A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i64, i64* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i64 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit7()
+{
+ struct U7A {
+ long long a;
+ };
+
+ struct U7A a = {
+ .a = 12,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U7A, %struct.U7A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i64, i64* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i64 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit8()
+{
+ struct U8A {
+ long long a;
+ };
+
+ struct U8A a = {
+ .a = 12,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U8A, %struct.U8A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i64, i64* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i64 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit9()
+{
+ struct U9A {
+ char a;
+ };
+
+ struct U9A a = {
+ .a = 'a',
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U9A, %struct.U9A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i8, i8* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i8 [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit10()
+{
+ struct U10A {
+ char *a;
+ };
+
+ struct U10A a = {
+ .a = "LSE",
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U10A, %struct.U10A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i8*, i8** [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i8* [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void unit11()
+{
+ struct U11A {
+ void *a;
+ };
+
+ struct U11A a = {
+ .a = (void *)0x12345678,
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.U11A, %struct.U11A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i8*, i8** [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i8* [[LOAD1]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void test1()
+{
+ struct T1A {
+ int a;
+ char *b;
+ };
+
+ struct T1A a = {
+ .a = 12,
+ .b = "LSE"
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.T1A, %struct.T1A* %a, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i32, i32* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i32 [[LOAD1]])
+ // CHECK: [[RES2:%[0-9]+]] = getelementptr inbounds %struct.T1A, %struct.T1A* %a, i32 0, i32 1
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD2:%[0-9]+]] = load i8*, i8** [[RES2]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i8* [[LOAD2]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&a, &printf);
+}
+
+void test2()
+{
+ struct T2A {
+ int a;
+ };
+
+ struct T2B {
+ int b;
+ struct T2A a;
+ };
+
+ struct T2B b = {
+ .b = 24,
+ .a = {
+ .a = 12
+ }
+ };
+
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES1:%[0-9]+]] = getelementptr inbounds %struct.T2B, %struct.T2B* %b, i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD1:%[0-9]+]] = load i32, i32* [[RES1]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i32 [[LOAD1]])
+ // CHECK: [[NESTED_STRUCT:%[0-9]+]] = getelementptr inbounds %struct.T2B, %struct.T2B* %b, i32 0, i32 1
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[RES2:%[0-9]+]] = getelementptr inbounds %struct.T2A, %struct.T2A* [[NESTED_STRUCT]], i32 0, i32 0
+ // CHECK: call i32 (i8*, ...) @printf(
+ // CHECK: [[LOAD2:%[0-9]+]] = load i32, i32* [[RES2]],
+ // CHECK: call i32 (i8*, ...) @printf({{.*}}, i32 [[LOAD2]])
+ // CHECK: call i32 (i8*, ...) @printf(
+ __builtin_dump_struct(&b, &printf);
+}
Index: lib/Sema/SemaChecking.cpp
===================================================================
--- lib/Sema/SemaChecking.cpp
+++ lib/Sema/SemaChecking.cpp
@@ -1110,6 +1110,65 @@
// so ensure that they are declared.
DeclareGlobalNewDelete();
break;
+ case Builtin::BI__builtin_dump_struct: {
+ // We first want to ensure we are called with 2 arguments
+ if (checkArgCount(*this, TheCall, 2))
+ return ExprError();
+ // Ensure that the first argument is of type 'struct XX *'
+ const Expr *PtrArg = TheCall->getArg(0)->IgnoreParenImpCasts();
+ const QualType PtrArgType = PtrArg->getType();
+ if (!PtrArgType->isPointerType()) {
+ this->Diag(PtrArg->getLocStart(), diag::err_typecheck_convert_incompatible)
+ << PtrArgType << "\'structure pointer type\'"
+ << 1 << 0 << 3 << 1
+ << PtrArgType << "\'structure pointer type\'";
+ return ExprError();
+ }
+
+ const RecordType *RT = PtrArgType->getPointeeType()->getAs<RecordType>();
+ if (!RT) {
+ this->Diag(PtrArg->getLocStart(), diag::err_typecheck_convert_incompatible)
+ << PtrArgType << "\'structure pointer type\'"
+ << 1 << 0 << 3 << 1
+ << PtrArgType << "\'structure pointer type\'";
+ return ExprError();
+ }
+ // Ensure that the second argument is of type 'FunctionType'
+ const Expr *FnPtrArg = TheCall->getArg(1)->IgnoreImpCasts();
+ const QualType FnPtrArgType = FnPtrArg->getType();
+ if (!FnPtrArgType->isPointerType()) {
+ this->Diag(FnPtrArg->getLocStart(), diag::err_typecheck_convert_incompatible)
+ << FnPtrArgType << "\'int (*)(const char *, ...)\'"
+ << 1 << 0 << 3 << 2
+ << FnPtrArgType << "\'int (*)(const char *, ...)\'";
+ return ExprError();
+ }
+
+ const FunctionType *FuncType =
+ FnPtrArgType->getPointeeType()->getAs<FunctionType>();
+
+ if (!FuncType) {
+ this->Diag(FnPtrArg->getLocStart(), diag::err_typecheck_convert_incompatible)
+ << FnPtrArgType << "\'int (*)(const char *, ...)\'"
+ << 1 << 0 << 3 << 2
+ << FnPtrArgType << "\'int (*)(const char *, ...)\'";
+ return ExprError();
+ }
+
+ if (const FunctionProtoType *FT = dyn_cast<FunctionProtoType>(FuncType)) {
+ if (!FT->isVariadic() ||
+ FT->getReturnType() != Context.IntTy) {
+ this->Diag(FnPtrArg->getLocStart(), diag::err_typecheck_convert_incompatible)
+ << FnPtrArgType<< "\'int (*)(const char *, ...)\'"
+ << 1 << 0 << 3 << 2
+ << FnPtrArgType << "\'int (*)(const char *, ...)\'";
+ return ExprError();
+ }
+ }
+
+ TheCall->setType(Context.IntTy);
+ break;
+ }
// check secure string manipulation functions where overflows
// are detectable at compile time
Index: lib/CodeGen/CGBuiltin.cpp
===================================================================
--- lib/CodeGen/CGBuiltin.cpp
+++ lib/CodeGen/CGBuiltin.cpp
@@ -14,6 +14,7 @@
#include "CGCXXABI.h"
#include "CGObjCRuntime.h"
#include "CGOpenCLRuntime.h"
+#include "CGRecordLayout.h"
#include "CodeGenFunction.h"
#include "CodeGenModule.h"
#include "ConstantEmitter.h"
@@ -930,6 +931,90 @@
return RValue::get(Overflow);
}
+static llvm::Value *dumpRecord(CodeGenFunction &CGF, QualType RType,
+ Value*& RecordPtr, CharUnits Align,
+ Value *Func, int Lvl)
+{
+ const RecordType *RT = RType->getAs<RecordType>();
+ ASTContext& Context = CGF.getContext();
+ RecordDecl *RD = RT->getDecl()->getDefinition();
+ ASTContext& Ctx = RD->getASTContext();
+ const ASTRecordLayout &RL = Ctx.getASTRecordLayout(RD);
+ std::string Pad = std::string(Lvl * 4, ' ');
+
+ Value *GString = CGF.Builder.CreateGlobalStringPtr(RType.getAsString()
+ + " {\n");
+ Value *Res = CGF.Builder.CreateCall(Func, {GString});
+
+ static llvm::DenseMap<QualType, const char *> Types;
+ if (Types.empty()) {
+ Types[Context.CharTy] = "%c";
+ Types[Context.BoolTy] = "%d";
+ Types[Context.IntTy] = "%d";
+ Types[Context.UnsignedIntTy] = "%u";
+ Types[Context.LongTy] = "%ld";
+ Types[Context.UnsignedLongTy] = "%lu";
+ Types[Context.LongLongTy] = "%lld";
+ Types[Context.UnsignedLongLongTy] = "%llu";
+ Types[Context.ShortTy] = "%hd";
+ Types[Context.UnsignedShortTy] = "%hu";
+ Types[Context.VoidPtrTy] = "%p";
+ Types[Context.FloatTy] = "%f";
+ Types[Context.DoubleTy] = "%f";
+ Types[Context.LongDoubleTy] = "%Lf";
+ Types[Context.getPointerType(Context.CharTy)] = "%s";
+ }
+
+ for (const auto *FD : RD->fields()) {
+ uint64_t Off = RL.getFieldOffset(FD->getFieldIndex());
+ Off = Ctx.toCharUnitsFromBits(Off).getQuantity();
+
+ Value *FieldPtr = RecordPtr;
+ FieldPtr = CGF.Builder.CreateStructGEP(CGF.ConvertType(RType), FieldPtr,
+ RD->isUnion() ? 0 : FD->getFieldIndex());
+
+ GString = CGF.Builder.CreateGlobalStringPtr(llvm::Twine(Pad)
+ .concat(FD->getType()
+ .getAsString())
+ .concat(llvm::Twine(' '))
+ .concat(FD->getNameAsString())
+ .concat(" : ")
+ .str());
+ Value *TmpRes = CGF.Builder.CreateCall(Func, {GString});
+ Res = CGF.Builder.CreateAdd(Res, TmpRes);
+
+ QualType CanonicalType =
+ FD->getType().getUnqualifiedType().getCanonicalType();
+
+ // We check whether we are in a recursive type
+ if (CanonicalType->isRecordType()) {
+ Value *TmpRes = dumpRecord(CGF, CanonicalType, FieldPtr,
+ Align, Func, Lvl + 1);
+ Res = CGF.Builder.CreateAdd(TmpRes, Res);
+ continue;
+ }
+
+ // We try to determine the best format to print the current field
+ llvm::Twine Format = Types.find(CanonicalType) == Types.end() ?
+ Types[Context.VoidPtrTy] : Types[CanonicalType];
+
+ Address FieldAddress = Address(FieldPtr, Align);
+ FieldPtr = CGF.Builder.CreateLoad(FieldAddress);
+
+ // FIXME Need to handle bitfield here
+ GString = CGF.Builder.CreateGlobalStringPtr(Format
+ .concat(llvm::Twine('\n'))
+ .str());
+ TmpRes = CGF.Builder.CreateCall(Func, {GString, FieldPtr});
+ Res = CGF.Builder.CreateAdd(Res, TmpRes);
+ }
+
+ GString = CGF.Builder.CreateGlobalStringPtr(Pad + "}\n");
+ Value *TmpRes = CGF.Builder.CreateCall(Func, {GString});
+ Res = CGF.Builder.CreateAdd(Res, TmpRes);
+ return Res;
+}
+
RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
unsigned BuiltinID, const CallExpr *E,
ReturnValueSlot ReturnValue) {
@@ -1196,6 +1281,18 @@
return RValue::get(ComplexVal.first);
}
+ case Builtin::BI__builtin_dump_struct: {
+ Value *Func = EmitScalarExpr(E->getArg(1)->IgnoreImpCasts());
+ CharUnits Arg0Align = EmitPointerWithAlignment(E->getArg(0)).getAlignment();
+
+ const Expr *Arg0 = E->getArg(0)->IgnoreImpCasts();
+ QualType Arg0Type = Arg0->getType()->getPointeeType();
+
+ Value *RecordPtr = EmitScalarExpr(Arg0);
+ Value *Res = dumpRecord(*this, Arg0Type, RecordPtr, Arg0Align, Func, 0);
+ return RValue::get(Res);
+ }
+
case Builtin::BI__builtin_cimag:
case Builtin::BI__builtin_cimagf:
case Builtin::BI__builtin_cimagl:
Index: include/clang/Basic/Builtins.def
===================================================================
--- include/clang/Basic/Builtins.def
+++ include/clang/Basic/Builtins.def
@@ -1374,6 +1374,7 @@
BUILTIN(__builtin_operator_new, "v*z", "c")
BUILTIN(__builtin_operator_delete, "vv*", "n")
BUILTIN(__builtin_char_memchr, "c*cC*iz", "n")
+BUILTIN(__builtin_dump_struct, "ivC*v*", "tn")
// Safestack builtins
BUILTIN(__builtin___get_unsafe_stack_start, "v*", "Fn")
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
