Improve handling of __FUNCTION__ and other predefined expression for Objective-C Blocks
Instead of always displaying the mangled name, try to do better and get something closer to regular functions. Differential Revision: https://reviews.llvm.org/D26522 llvm-svn: 287039
This commit is contained in:
parent
bc9a574657
commit
26168ad5c5
|
@ -518,20 +518,21 @@ std::string PredefinedExpr::ComputeName(IdentType IT, const Decl *CurrentDecl) {
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
if (auto *BD = dyn_cast<BlockDecl>(CurrentDecl)) {
|
if (isa<BlockDecl>(CurrentDecl)) {
|
||||||
std::unique_ptr<MangleContext> MC;
|
// For blocks we only emit something if it is enclosed in a function
|
||||||
MC.reset(Context.createMangleContext());
|
// For top-level block we'd like to include the name of variable, but we
|
||||||
SmallString<256> Buffer;
|
// don't have it at this point.
|
||||||
llvm::raw_svector_ostream Out(Buffer);
|
|
||||||
auto DC = CurrentDecl->getDeclContext();
|
auto DC = CurrentDecl->getDeclContext();
|
||||||
if (DC->isFileContext())
|
if (DC->isFileContext())
|
||||||
MC->mangleGlobalBlock(BD, /*ID*/ nullptr, Out);
|
return "";
|
||||||
else if (const auto *CD = dyn_cast<CXXConstructorDecl>(DC))
|
|
||||||
MC->mangleCtorBlock(CD, /*CT*/ Ctor_Complete, BD, Out);
|
SmallString<256> Buffer;
|
||||||
else if (const auto *DD = dyn_cast<CXXDestructorDecl>(DC))
|
llvm::raw_svector_ostream Out(Buffer);
|
||||||
MC->mangleDtorBlock(DD, /*DT*/ Dtor_Complete, BD, Out);
|
if (auto *DCFunc = dyn_cast<FunctionDecl>(DC))
|
||||||
|
Out << ComputeName(IT, DCFunc) << "_block_invoke";
|
||||||
else
|
else
|
||||||
MC->mangleBlock(DC, BD, Out);
|
// For nested blocks, propagate up to the parent.
|
||||||
|
Out << ComputeName(IT, cast<BlockDecl>(DC));
|
||||||
return Out.str();
|
return Out.str();
|
||||||
}
|
}
|
||||||
if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(CurrentDecl)) {
|
if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(CurrentDecl)) {
|
||||||
|
|
|
@ -2319,9 +2319,19 @@ LValue CodeGenFunction::EmitPredefinedLValue(const PredefinedExpr *E) {
|
||||||
StringRef NameItems[] = {
|
StringRef NameItems[] = {
|
||||||
PredefinedExpr::getIdentTypeName(E->getIdentType()), FnName};
|
PredefinedExpr::getIdentTypeName(E->getIdentType()), FnName};
|
||||||
std::string GVName = llvm::join(NameItems, NameItems + 2, ".");
|
std::string GVName = llvm::join(NameItems, NameItems + 2, ".");
|
||||||
if (CurCodeDecl && isa<BlockDecl>(CurCodeDecl)) {
|
if (auto *BD = dyn_cast<BlockDecl>(CurCodeDecl)) {
|
||||||
auto C = CGM.GetAddrOfConstantCString(FnName, GVName.c_str());
|
std::string Name = SL->getString();
|
||||||
return MakeAddrLValue(C, E->getType(), AlignmentSource::Decl);
|
if (!Name.empty()) {
|
||||||
|
unsigned Discriminator =
|
||||||
|
CGM.getCXXABI().getMangleContext().getBlockId(BD, true);
|
||||||
|
if (Discriminator)
|
||||||
|
Name += "_" + Twine(Discriminator + 1).str();
|
||||||
|
auto C = CGM.GetAddrOfConstantCString(Name, GVName.c_str());
|
||||||
|
return MakeAddrLValue(C, E->getType(), AlignmentSource::Decl);
|
||||||
|
} else {
|
||||||
|
auto C = CGM.GetAddrOfConstantCString(FnName, GVName.c_str());
|
||||||
|
return MakeAddrLValue(C, E->getType(), AlignmentSource::Decl);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
auto C = CGM.GetAddrOfConstantStringFromLiteral(SL, GVName);
|
auto C = CGM.GetAddrOfConstantStringFromLiteral(SL, GVName);
|
||||||
return MakeAddrLValue(C, E->getType(), AlignmentSource::Decl);
|
return MakeAddrLValue(C, E->getType(), AlignmentSource::Decl);
|
||||||
|
|
|
@ -0,0 +1,87 @@
|
||||||
|
// RUN: %clang_cc1 %s -emit-llvm -o - -fblocks -triple x86_64-apple-darwin10 -std=c++11 | FileCheck %s
|
||||||
|
|
||||||
|
void bar() {
|
||||||
|
// CHECK-DAG: @__FUNCTION__.___Z3barv_block_invoke = private unnamed_addr constant [17 x i8] c"bar_block_invoke\00", align 1
|
||||||
|
const char * (^block1)() = ^() {
|
||||||
|
return __FUNCTION__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__FUNCTION__.___Z3barv_block_invoke_2 = private unnamed_addr constant [19 x i8] c"bar_block_invoke_2\00", align 1
|
||||||
|
const char * (^block2)() = ^() {
|
||||||
|
return __FUNCTION__;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
void baz() {
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___Z3bazv_block_invoke = private unnamed_addr constant [24 x i8] c"void baz()_block_invoke\00", align 1
|
||||||
|
const char * (^block1)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___Z3bazv_block_invoke_2 = private unnamed_addr constant [26 x i8] c"void baz()_block_invoke_2\00", align 1
|
||||||
|
const char * (^block2)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace foonamespace {
|
||||||
|
class Foo {
|
||||||
|
public:
|
||||||
|
Foo() {
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___ZN12foonamespace3FooC2Ev_block_invoke = private unnamed_addr constant [38 x i8] c"foonamespace::Foo::Foo()_block_invoke\00", align 1
|
||||||
|
const char * (^block1)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___ZN12foonamespace3FooC2Ev_block_invoke_2 = private unnamed_addr constant [40 x i8] c"foonamespace::Foo::Foo()_block_invoke_2\00", align 1
|
||||||
|
const char * (^block2)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__func__.___ZN12foonamespace3FooC2Ev_block_invoke_3 = private unnamed_addr constant [19 x i8] c"Foo_block_invoke_3\00", align 1
|
||||||
|
const char * (^block3)() = ^() {
|
||||||
|
return __func__;
|
||||||
|
};
|
||||||
|
bar();
|
||||||
|
inside_lambda();
|
||||||
|
}
|
||||||
|
~Foo() {
|
||||||
|
// CHECK-DAG: @__func__.___ZN12foonamespace3FooD2Ev_block_invoke = private unnamed_addr constant [18 x i8] c"~Foo_block_invoke\00", align 1
|
||||||
|
const char * (^block1)() = ^() {
|
||||||
|
return __func__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___ZN12foonamespace3FooD2Ev_block_invoke_2 = private unnamed_addr constant [41 x i8] c"foonamespace::Foo::~Foo()_block_invoke_2\00", align 1
|
||||||
|
const char * (^block2)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
void bar() {
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___ZN12foonamespace3Foo3barEv_block_invoke = private unnamed_addr constant [43 x i8] c"void foonamespace::Foo::bar()_block_invoke\00", align 1
|
||||||
|
const char * (^block1)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___ZN12foonamespace3Foo3barEv_block_invoke_2 = private unnamed_addr constant [45 x i8] c"void foonamespace::Foo::bar()_block_invoke_2\00", align 1
|
||||||
|
const char * (^block2)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__func__.___ZN12foonamespace3Foo3barEv_block_invoke_3 = private unnamed_addr constant [19 x i8] c"bar_block_invoke_3\00", align 1
|
||||||
|
const char * (^block3)() = ^() {
|
||||||
|
return __func__;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
void inside_lambda() {
|
||||||
|
auto lambda = []() {
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___ZZN12foonamespace3Foo13inside_lambdaEvENKUlvE_clEv_block_invoke = private unnamed_addr constant [92 x i8] c"auto foonamespace::Foo::inside_lambda()::(anonymous class)::operator()() const_block_invoke\00", align 1
|
||||||
|
const char * (^block1)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__PRETTY_FUNCTION__.___ZZN12foonamespace3Foo13inside_lambdaEvENKUlvE_clEv_block_invoke_2 = private unnamed_addr constant [94 x i8] c"auto foonamespace::Foo::inside_lambda()::(anonymous class)::operator()() const_block_invoke_2\00", align 1
|
||||||
|
const char * (^block2)() = ^() {
|
||||||
|
return __PRETTY_FUNCTION__;
|
||||||
|
};
|
||||||
|
// CHECK-DAG: @__func__.___ZZN12foonamespace3Foo13inside_lambdaEvENKUlvE_clEv_block_invoke_3 = private unnamed_addr constant [26 x i8] c"operator()_block_invoke_3\00", align 1
|
||||||
|
const char * (^block3)() = ^() {
|
||||||
|
return __func__;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
lambda();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Foo f;
|
||||||
|
}
|
|
@ -17,8 +17,8 @@
|
||||||
// CHECK-DAG: @__func__._ZN24ClassInTopLevelNamespace25topLevelNamespaceFunctionEv = private unnamed_addr constant [26 x i8] c"topLevelNamespaceFunction\00"
|
// CHECK-DAG: @__func__._ZN24ClassInTopLevelNamespace25topLevelNamespaceFunctionEv = private unnamed_addr constant [26 x i8] c"topLevelNamespaceFunction\00"
|
||||||
// CHECK-DAG: @__PRETTY_FUNCTION__._ZN24ClassInTopLevelNamespace25topLevelNamespaceFunctionEv = private unnamed_addr constant [60 x i8] c"auto *ClassInTopLevelNamespace::topLevelNamespaceFunction()\00"
|
// CHECK-DAG: @__PRETTY_FUNCTION__._ZN24ClassInTopLevelNamespace25topLevelNamespaceFunctionEv = private unnamed_addr constant [60 x i8] c"auto *ClassInTopLevelNamespace::topLevelNamespaceFunction()\00"
|
||||||
|
|
||||||
// CHECK-DAG: @__func__.___ZN16ClassBlockConstrD2Ev_block_invoke = private unnamed_addr constant [41 x i8] c"___ZN16ClassBlockConstrD2Ev_block_invoke\00"
|
// CHECK-DAG: @__func__.___ZN16ClassBlockConstrD2Ev_block_invoke = private unnamed_addr constant [31 x i8] c"~ClassBlockConstr_block_invoke\00"
|
||||||
// CHECK-DAG: @__func__.___ZN16ClassBlockConstrC2Ev_block_invoke = private unnamed_addr constant [41 x i8] c"___ZN16ClassBlockConstrC2Ev_block_invoke\00"
|
// CHECK-DAG: @__func__.___ZN16ClassBlockConstrC2Ev_block_invoke = private unnamed_addr constant [30 x i8] c"ClassBlockConstr_block_invoke\00"
|
||||||
|
|
||||||
int printf(const char * _Format, ...);
|
int printf(const char * _Format, ...);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue