From f5f37ee546bd05427e37b5e9ab2cbcb2ac72f5cc Mon Sep 17 00:00:00 2001 From: Mehdi Amini Date: Tue, 15 Nov 2016 22:19:50 +0000 Subject: [PATCH] Revert "Improve handling of __FUNCTION__ and other predefined expression for Objective-C Blocks" This reverts commit r287039, tests are broken. llvm-svn: 287043 --- clang/lib/AST/Expr.cpp | 23 +++---- clang/lib/CodeGen/CGExpr.cpp | 16 +---- clang/test/CodeGen/block-with-perdefinedexpr.cpp | 87 ------------------------ clang/test/CodeGenCXX/predefined-expr-cxx14.cpp | 4 +- 4 files changed, 16 insertions(+), 114 deletions(-) delete mode 100644 clang/test/CodeGen/block-with-perdefinedexpr.cpp diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index fbaa79a..a269c99 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -518,21 +518,20 @@ std::string PredefinedExpr::ComputeName(IdentType IT, const Decl *CurrentDecl) { } return ""; } - if (isa(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(CurrentDecl)) { + std::unique_ptr MC; + MC.reset(Context.createMangleContext()); SmallString<256> Buffer; llvm::raw_svector_ostream Out(Buffer); - if (auto *DCFunc = dyn_cast(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(DC)) + MC->mangleCtorBlock(CD, /*CT*/ Ctor_Complete, BD, Out); + else if (const auto *DD = dyn_cast(DC)) + MC->mangleDtorBlock(DD, /*DT*/ Dtor_Complete, BD, Out); else - // For nested blocks, propagate up to the parent. - Out << ComputeName(IT, cast(DC)); + MC->mangleBlock(DC, BD, Out); return Out.str(); } if (const FunctionDecl *FD = dyn_cast(CurrentDecl)) { diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index 6db6682..08e1cad 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -2319,19 +2319,9 @@ LValue CodeGenFunction::EmitPredefinedLValue(const PredefinedExpr *E) { StringRef NameItems[] = { PredefinedExpr::getIdentTypeName(E->getIdentType()), FnName}; std::string GVName = llvm::join(NameItems, NameItems + 2, "."); - if (auto *BD = dyn_cast(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(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); diff --git a/clang/test/CodeGen/block-with-perdefinedexpr.cpp b/clang/test/CodeGen/block-with-perdefinedexpr.cpp deleted file mode 100644 index 890c2d6..0000000 --- a/clang/test/CodeGen/block-with-perdefinedexpr.cpp +++ /dev/null @@ -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; -} diff --git a/clang/test/CodeGenCXX/predefined-expr-cxx14.cpp b/clang/test/CodeGenCXX/predefined-expr-cxx14.cpp index dd531e3..1f03575 100644 --- a/clang/test/CodeGenCXX/predefined-expr-cxx14.cpp +++ b/clang/test/CodeGenCXX/predefined-expr-cxx14.cpp @@ -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, ...); -- 2.7.4