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 | d48db2115a51ac2c815c7786522d1e836aa5bc4c (patch) | |
| tree | a6145325d4e5212b25581fa04d952a4c2e805c59 /clang/lib/CodeGen | |
| parent | 3ddf6aa50392ad0ef40689b104cd6d0f99e70904 (diff) | |
| download | llvm-d48db2115a51ac2c815c7786522d1e836aa5bc4c.zip llvm-d48db2115a51ac2c815c7786522d1e836aa5bc4c.tar.gz llvm-d48db2115a51ac2c815c7786522d1e836aa5bc4c.tar.bz2 | |
Rename getInstantiationLineNumber to getExpansionLineNumber in both
SourceManager and FullSourceLoc.
llvm-svn: 135969
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/CGDecl.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp index 9b22c7f9..a372d7d 100644 --- a/clang/lib/CodeGen/CGDecl.cpp +++ b/clang/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/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index d7b6c7e..290fe24 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/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); |