diff options
| author | John McCall <rjmccall@apple.com> | 2012-03-30 07:09:50 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2012-03-30 07:09:50 +0000 |
| commit | 49d26d2817180ccde605c987f79cd3a5b57639cd (patch) | |
| tree | e300661d68dad6d9ccfb244cfa16a59be22944d9 /lib/CodeGen/CGDeclCXX.cpp | |
| parent | 5aeaca3fa755cddba583842e7a0c3e168bf71b4d (diff) | |
Do the static-locals thing properly in the face of unions and
other things which might mess with the variable's type.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153733 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGDeclCXX.cpp')
| -rw-r--r-- | lib/CodeGen/CGDeclCXX.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp index dc52b11279..06ae035295 100644 --- a/lib/CodeGen/CGDeclCXX.cpp +++ b/lib/CodeGen/CGDeclCXX.cpp @@ -179,7 +179,7 @@ CodeGenFunction::EmitCXXGlobalDtorRegistration(llvm::Constant *DtorFn, } void CodeGenFunction::EmitCXXGuardedInit(const VarDecl &D, - llvm::GlobalVariable *DeclPtr, + llvm::Constant *addr, bool PerformInit) { // If we've been asked to forbid guard variables, emit an error now. // This diagnostic is hard-coded for Darwin's use case; we can find @@ -189,7 +189,7 @@ void CodeGenFunction::EmitCXXGuardedInit(const VarDecl &D, "this initialization requires a guard variable, which " "the kernel does not support"); - CGM.getCXXABI().EmitGuardedInit(*this, D, DeclPtr, PerformInit); + CGM.getCXXABI().EmitGuardedInit(*this, D, addr, PerformInit); } static llvm::Function * |