Make __func__ and friends work correctly within the initializer for a static
local variable. llvm-svn: 88766
This commit is contained in:
parent
1b39a2edff
commit
b210fc598f
|
@ -766,13 +766,15 @@ public:
|
||||||
return llvm::ConstantExpr::getBitCast(C, ConvertType(E->getType()));
|
return llvm::ConstantExpr::getBitCast(C, ConvertType(E->getType()));
|
||||||
}
|
}
|
||||||
case Expr::PredefinedExprClass: {
|
case Expr::PredefinedExprClass: {
|
||||||
// __func__/__FUNCTION__ -> "". __PRETTY_FUNCTION__ -> "top level".
|
unsigned Type = cast<PredefinedExpr>(E)->getIdentType();
|
||||||
std::string Str;
|
if (CGF) {
|
||||||
if (cast<PredefinedExpr>(E)->getIdentType() ==
|
LValue Res = CGF->EmitPredefinedFunctionName(Type);
|
||||||
PredefinedExpr::PrettyFunction)
|
return cast<llvm::Constant>(Res.getAddress());
|
||||||
Str = "top level";
|
} else if (Type == PredefinedExpr::PrettyFunction) {
|
||||||
|
return CGM.GetAddrOfConstantCString("top level", ".tmp");
|
||||||
|
}
|
||||||
|
|
||||||
return CGM.GetAddrOfConstantCString(Str, ".tmp");
|
return CGM.GetAddrOfConstantCString("", ".tmp");
|
||||||
}
|
}
|
||||||
case Expr::AddrLabelExprClass: {
|
case Expr::AddrLabelExprClass: {
|
||||||
assert(CGF && "Invalid address of label expression outside function.");
|
assert(CGF && "Invalid address of label expression outside function.");
|
||||||
|
|
|
@ -117,3 +117,9 @@ struct g22 {int x;} __attribute((packed));
|
||||||
struct g23 {char a; short b; char c; struct g22 d;};
|
struct g23 {char a; short b; char c; struct g22 d;};
|
||||||
struct g23 g24 = {1,2,3,4};
|
struct g23 g24 = {1,2,3,4};
|
||||||
|
|
||||||
|
// CHECK: @__func__.g25 = private constant [4 x i8] c"g25\00"
|
||||||
|
// CHECK: @g25.g26 = internal global i8* getelementptr inbounds ([4 x i8]* @__func__.g25, i32 0, i32 0)
|
||||||
|
int g25() {
|
||||||
|
static const char *g26 = __func__;
|
||||||
|
return *g26;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue