diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 21:09:52 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 21:09:52 +0000 |
| commit | 642116259e8df6286063a17361c20e95b5017a0a (patch) | |
| tree | 2c78721179976ddd235abace05dff90486ca93a2 /lib/CodeGen | |
| parent | b49dcd249c7f4f034493741f95394987a4ccf244 (diff) | |
Rename getInstantiationLineNumber to getExpansionLineNumber in both
SourceManager and FullSourceLoc.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135969 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 9b22c7f956..a372d7d696 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -274,8 +274,7 @@ void CodeGenFunction::EmitStaticVarDecl(const VarDecl &D, if (const AnnotateAttr *AA = D.getAttr<AnnotateAttr>()) { SourceManager &SM = CGM.getContext().getSourceManager(); llvm::Constant *Ann = - CGM.EmitAnnotateAttr(GV, AA, - SM.getInstantiationLineNumber(D.getLocation())); + CGM.EmitAnnotateAttr(GV, AA, SM.getExpansionLineNumber(D.getLocation())); CGM.AddAnnotation(Ann); } diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index d7b6c7ec3d..290fe242c9 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -1311,8 +1311,8 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D) { if (const AnnotateAttr *AA = D->getAttr<AnnotateAttr>()) { SourceManager &SM = Context.getSourceManager(); - AddAnnotation(EmitAnnotateAttr(GV, AA, - SM.getInstantiationLineNumber(D->getLocation()))); + AddAnnotation(EmitAnnotateAttr( + GV, AA, SM.getExpansionLineNumber(D->getLocation()))); } GV->setInitializer(Init); |