diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-04-19 18:15:02 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-04-19 18:15:02 +0000 |
| commit | 63326a53418b4853a83b360ce1dbdb10c5739fc7 (patch) | |
| tree | b9c2571649b85bfbf37155a5833aaa92984621c4 /lib | |
| parent | c220a18ecdfa42ebb3ce267974cf24e343e2aa6d (diff) | |
Some renaming of methods, fixes typo
(related to PR6769).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101794 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 5 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 58b90929f0..ff78cc8184 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -205,7 +205,8 @@ void CodeGenFunction::EmitStaticBlockVarDecl(const VarDecl &D, // Store into LocalDeclMap before generating initializer to handle // circular references. DMEntry = GV; - CGM.setStaticLocalDeclMap(&D, GV); + if (getContext().getLangOptions().CPlusPlus) + CGM.setStaticLocalDeclAddress(&D, GV); // Make sure to evaluate VLA bounds now so that we have them for later. // diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 257f2fc4f2..7809972630 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -1106,8 +1106,9 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) { bool NonGCable = VD->hasLocalStorage() && !VD->hasAttr<BlocksAttr>(); llvm::Value *V = LocalDeclMap[VD]; - if (!V && VD->isStaticLocal()) - V = CGM.getStaticLocalDeclMap(VD); + if (!V && getContext().getLangOptions().CPlusPlus && + VD->isStaticLocal()) + V = CGM.getStaticLocalDeclAddress(VD); assert(V && "DeclRefExpr not entered in LocalDeclMap?"); Qualifiers Quals = MakeQualifiers(E->getType()); diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h index 022360bfc5..8bfa0b9ab7 100644 --- a/lib/CodeGen/CodeGenModule.h +++ b/lib/CodeGen/CodeGenModule.h @@ -171,10 +171,10 @@ public: /// been configured. bool hasObjCRuntime() { return !!Runtime; } - llvm::Value *getStaticLocalDeclMap(const VarDecl *VD) { + llvm::Value *getStaticLocalDeclAddress(const VarDecl *VD) { return StaticLocalDeclMap[VD]; } - void setStaticLocalDeclMap(const VarDecl *D, + void setStaticLocalDeclAddress(const VarDecl *D, llvm::GlobalVariable *GV) { StaticLocalDeclMap[D] = GV; } |