Author: mehdi_amini
Date: Tue Nov 15 16:19:50 2016
New Revision: 287043
URL: http://llvm.org/viewvc/llvm-project?rev=287043&view=rev
Log:
Revert "Improve handling of __FUNCTION__ and other predefined expression for
Objective-C Blocks"
This reverts commit r287039, tests are broken.
Removed:
cfe/trunk/test/CodeGen/block-with-perdefinedexpr.cpp
Modified:
cfe/trunk/lib/AST/Expr.cpp
cfe/trunk/lib/CodeGen/CGExpr.cpp
cfe/trunk/test/CodeGenCXX/predefined-expr-cxx14.cpp
Modified: cfe/trunk/lib/AST/Expr.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Expr.cpp?rev=287043&r1=287042&r2=287043&view=diff
==============================================================================
--- cfe/trunk/lib/AST/Expr.cpp (original)
+++ cfe/trunk/lib/AST/Expr.cpp Tue Nov 15 16:19:50 2016
@@ -518,21 +518,20 @@ std::string PredefinedExpr::ComputeName(
}
return "";
}
- if (isa<BlockDecl>(CurrentDecl)) {
- // For blocks we only emit something if it is enclosed in a function
- // For top-level block we'd like to include the name of variable, but we
- // don't have it at this point.
- auto DC = CurrentDecl->getDeclContext();
- if (DC->isFileContext())
- return "";
-
+ if (auto *BD = dyn_cast<BlockDecl>(CurrentDecl)) {
+ std::unique_ptr<MangleContext> MC;
+ MC.reset(Context.createMangleContext());
SmallString<256> Buffer;
llvm::raw_svector_ostream Out(Buffer);
- if (auto *DCFunc = dyn_cast<FunctionDecl>(DC))
- Out << ComputeName(IT, DCFunc) << "_block_invoke";
+ auto DC = CurrentDecl->getDeclContext();
+ if (DC->isFileContext())
+ MC->mangleGlobalBlock(BD, /*ID*/ nullptr, Out);
+ else if (const auto *CD = dyn_cast<CXXConstructorDecl>(DC))
+ MC->mangleCtorBlock(CD, /*CT*/ Ctor_Complete, BD, Out);
+ else if (const auto *DD = dyn_cast<CXXDestructorDecl>(DC))
+ MC->mangleDtorBlock(DD, /*DT*/ Dtor_Complete, BD, Out);
else
- // For nested blocks, propagate up to the parent.
- Out << ComputeName(IT, cast<BlockDecl>(DC));
+ MC->mangleBlock(DC, BD, Out);
return Out.str();
}
if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(CurrentDecl)) {
Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=287043&r1=287042&r2=287043&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Tue Nov 15 16:19:50 2016
@@ -2319,19 +2319,9 @@ LValue CodeGenFunction::EmitPredefinedLV
StringRef NameItems[] = {
PredefinedExpr::getIdentTypeName(E->getIdentType()), FnName};
std::string GVName = llvm::join(NameItems, NameItems + 2, ".");
- if (auto *BD = dyn_cast<BlockDecl>(CurCodeDecl)) {
- std::string Name = SL->getString();
- 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);
- }
+ if (CurCodeDecl && isa<BlockDecl>(CurCodeDecl)) {
+ auto C = CGM.GetAddrOfConstantCString(FnName, GVName.c_str());
+ return MakeAddrLValue(C, E->getType(), AlignmentSource::Decl);
}
auto C = CGM.GetAddrOfConstantStringFromLiteral(SL, GVName);
return MakeAddrLValue(C, E->getType(), AlignmentSource::Decl);
Removed: cfe/trunk/test/CodeGen/block-with-perdefinedexpr.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/block-with-perdefinedexpr.cpp?rev=287042&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/block-with-perdefinedexpr.cpp (original)
+++ cfe/trunk/test/CodeGen/block-with-perdefinedexpr.cpp (removed)
@@ -1,87 +0,0 @@
-// 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;
-}
Modified: cfe/trunk/test/CodeGenCXX/predefined-expr-cxx14.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/predefined-expr-cxx14.cpp?rev=287043&r1=287042&r2=287043&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/predefined-expr-cxx14.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/predefined-expr-cxx14.cpp Tue Nov 15 16:19:50 2016
@@ -17,8 +17,8 @@
// 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: @__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 [30 x i8] c"ClassBlockConstr_block_invoke\00"
+// CHECK-DAG: @__func__.___ZN16ClassBlockConstrD2Ev_block_invoke = private
unnamed_addr constant [41 x i8] c"___ZN16ClassBlockConstrD2Ev_block_invoke\00"
+// CHECK-DAG: @__func__.___ZN16ClassBlockConstrC2Ev_block_invoke = private
unnamed_addr constant [41 x i8] c"___ZN16ClassBlockConstrC2Ev_block_invoke\00"
int printf(const char * _Format, ...);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
