Adapt to clang-r383902
This change adapts versioner to llvm::StringRef losing its implicit
conversion to std::string().
Test: ./build-prebuilts.sh
Change-Id: Ie1b290cf12e7044a92545470ce4f968cc55d90c9
diff --git a/tools/versioner/src/DeclarationDatabase.cpp b/tools/versioner/src/DeclarationDatabase.cpp
index 3c6f643..b41c865 100644
--- a/tools/versioner/src/DeclarationDatabase.cpp
+++ b/tools/versioner/src/DeclarationDatabase.cpp
@@ -72,7 +72,7 @@
// <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 @@
return mangled;
}
- return identifier->getName();
+ return identifier->getName().str();
}
return "<unnamed>";
@@ -173,7 +173,7 @@
&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 @@
}
Location location = {
- .filename = filename,
+ .filename = filename.str(),
.start = {
.line = src_manager.getExpansionLineNumber(expansion_range.getBegin()),
.column = src_manager.getExpansionColumnNumber(expansion_range.getBegin()),