From 4c03d98e4506d189afc30d4146ddecb68ee68fef Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 25 Aug 2008 01:38:19 +0000 Subject: [PATCH] Handle static variables inside obj-c methods. llvm-svn: 55297 --- clang/lib/CodeGen/CGDecl.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp index b60e20fda5ac..c0ad1079bec7 100644 --- a/clang/lib/CodeGen/CGDecl.cpp +++ b/clang/lib/CodeGen/CGDecl.cpp @@ -16,6 +16,7 @@ #include "CodeGenModule.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" +#include "clang/AST/DeclObjC.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/TargetInfo.h" #include "llvm/GlobalVariable.h" @@ -98,10 +99,13 @@ CodeGenFunction::GenerateStaticBlockVarDecl(const VarDecl &D, assert(Init && "Unable to create initialiser for static decl"); std::string ContextName; - if (const FunctionDecl * FD = dyn_cast(CurFuncDecl)) + if (const FunctionDecl *FD = dyn_cast(CurFuncDecl)) ContextName = FD->getName(); + else if (isa(CurFuncDecl)) + ContextName = std::string(CurFn->getNameStart(), + CurFn->getNameStart() + CurFn->getNameLen()); else - assert(0 && "Unknown context for block var decl"); // FIXME Handle objc. + assert(0 && "Unknown context for block var decl"); llvm::GlobalValue *GV = new llvm::GlobalVariable(Init->getType(), false,