diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-09-10 23:43:36 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-09-10 23:43:36 +0000 |
| commit | 555b4bb2749aea2ec8e2adc351a71ec1cb9bdc33 (patch) | |
| tree | 40d6bbe97757b95d9ed04906c7b937856ccba07b /lib/CodeGen/CodeGenModule.cpp | |
| parent | 4a6835e650ff24e19ce08a3bd347c0ad186777fd (diff) | |
GlobalDecl doesn't have an explicit constructor anymore.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81481 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 37e283a9b6..064f3efcc5 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -743,7 +743,7 @@ void CodeGenModule::DeferredCopyAssignmentToEmit(GlobalDecl CopyAssignDecl) { if (!BaseClassDecl->hasTrivialCopyAssignment() && !BaseClassDecl->hasUserDeclaredCopyAssignment() && BaseClassDecl->hasConstCopyAssignment(getContext(), MD)) - GetAddrOfFunction(GlobalDecl(MD), 0); + GetAddrOfFunction(MD, 0); } for (CXXRecordDecl::field_iterator Field = ClassDecl->field_begin(), @@ -761,7 +761,7 @@ void CodeGenModule::DeferredCopyAssignmentToEmit(GlobalDecl CopyAssignDecl) { if (!FieldClassDecl->hasTrivialCopyAssignment() && !FieldClassDecl->hasUserDeclaredCopyAssignment() && FieldClassDecl->hasConstCopyAssignment(getContext(), MD)) - GetAddrOfFunction(GlobalDecl(MD), 0); + GetAddrOfFunction(MD, 0); } } DeferredDeclsToEmit.push_back(CopyAssignDecl); @@ -919,7 +919,7 @@ void CodeGenModule::EmitTentativeDefinition(const VarDecl *D) { // later. const char *MangledName = getMangledName(D); if (GlobalDeclMap.count(MangledName) == 0) { - DeferredDecls[MangledName] = GlobalDecl(D); + DeferredDecls[MangledName] = D; return; } } @@ -1640,10 +1640,11 @@ void CodeGenModule::EmitTopLevelDecl(Decl *D) { if (cast<FunctionDecl>(D)->getDescribedFunctionTemplate()) return; - // Fall through - + EmitGlobal(cast<FunctionDecl>(D)); + break; + case Decl::Var: - EmitGlobal(GlobalDecl(cast<VarDecl>(D))); + EmitGlobal(cast<VarDecl>(D)); break; // C++ Decls |