diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-01 18:35:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-01 18:35:15 +0000 |
| commit | ca1a1826327b65e1dba900224f716a72ec88c6eb (patch) | |
| tree | d2538874263d78679841b89181c6525cd8d36e04 /tools/versioner/src/DeclarationDatabase.cpp | |
| parent | 442b8eaa4ac85604fbb25fa0b1ee699cf73e7701 (diff) | |
| parent | bf7ab25e983b76135fafde6b410818504e296827 (diff) | |
Merge "Adapt to clang-r383902" am: ac47b2b56e am: bf7ab25e98
Change-Id: I65913e91a5129c86cbe2182803ae1133e4ef2a8b
Diffstat (limited to 'tools/versioner/src/DeclarationDatabase.cpp')
| -rw-r--r-- | tools/versioner/src/DeclarationDatabase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/versioner/src/DeclarationDatabase.cpp b/tools/versioner/src/DeclarationDatabase.cpp index 3c6f64348..b41c8655e 100644 --- a/tools/versioner/src/DeclarationDatabase.cpp +++ b/tools/versioner/src/DeclarationDatabase.cpp @@ -72,7 +72,7 @@ class Visitor : public RecursiveASTVisitor<Visitor> { // <math.h> maps fool onto foo on 32-bit, since long double is the same as double. if (auto asm_attr = decl->getAttr<AsmLabelAttr>()) { - return asm_attr->getLabel(); + return asm_attr->getLabel().str(); } // The decl might not have a name (e.g. bitfields). @@ -84,7 +84,7 @@ class Visitor : public RecursiveASTVisitor<Visitor> { return mangled; } - return identifier->getName(); + return identifier->getName().str(); } return "<unnamed>"; @@ -173,7 +173,7 @@ class Visitor : public RecursiveASTVisitor<Visitor> { &arch_availability[Arch::x86_64].introduced } }, }; - if (auto it = prefix_map.find(fragments[0]); it != prefix_map.end()) { + if (auto it = prefix_map.find(fragments[0].str()); it != prefix_map.end()) { int value; if (fragments[1].getAsInteger(10, value)) { errx(1, "invalid __ANDROID_AVAILABILITY_DUMP__ annotation: '%s'", @@ -201,7 +201,7 @@ class Visitor : public RecursiveASTVisitor<Visitor> { } Location location = { - .filename = filename, + .filename = filename.str(), .start = { .line = src_manager.getExpansionLineNumber(expansion_range.getBegin()), .column = src_manager.getExpansionColumnNumber(expansion_range.getBegin()), |