fix PR7892, a crash on valid in c++ codegen of __PRETTY_FUNCTION__

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@111330 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index e2ccf55f93752fb5a845bedb7db0f4e177d8efa3..e9788709963002236a13dfda69084389b6d0f48f 100644 (file)
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1287,8 +1287,12 @@ LValue CodeGenFunction::EmitPredefinedFunctionName(unsigned Type) {
     FnName = FnName.substr(1);
   GlobalVarName += FnName;
 
+  const Decl *CurDecl = CurCodeDecl;
+  if (CurDecl == 0)
+    CurDecl = getContext().getTranslationUnitDecl();
+  
   std::string FunctionName =
-    PredefinedExpr::ComputeName((PredefinedExpr::IdentType)Type, CurCodeDecl);
+    PredefinedExpr::ComputeName((PredefinedExpr::IdentType)Type, CurDecl);
 
   llvm::Constant *C =
     CGM.GetAddrOfConstantCString(FunctionName, GlobalVarName.c_str());

diff --git a/test/CodeGenCXX/expr.cpp b/test/CodeGenCXX/expr.cpp
index d92cfb46a45447d73cde0d6da8da7b1b130f1eed..26bda055b3d768939edeaa7118a057c0dd4a5516 100644 (file)
--- a/test/CodeGenCXX/expr.cpp
+++ b/test/CodeGenCXX/expr.cpp
@@ -14,3 +14,7 @@ void test1() {
 // PR5514
 int a;
 void test2() { ++a+=10; }
+
+// PR7892
+int test3(const char*);
+int test3g = test3(__PRETTY_FUNCTION__);