diff options
| author | 2019-02-06 18:00:50 +0000 | |
|---|---|---|
| committer | 2019-02-06 18:00:50 +0000 | |
| commit | 2f34e59c10c30ea24fa5f4bc4e3d5a9dc6469c34 (patch) | |
| tree | 9360a99feb7a1aa6fe7b2685429ddb49b17a5e7c /runtime/class_linker_test.cc | |
| parent | c66d6a7569ef72d9e9eb115bb7b663ccc8df5179 (diff) | |
| parent | 7210108e6d930f9b8bcf5eac6b7a03ea29f92f84 (diff) | |
Merge changes I14c7cddd,I4a39d0e8,I3f24c8f4,I9699f138
* changes:
Replace StringPiece with std::string_view in art/runtime/.
Replace StringPiece with std::string_view in HashSet.
Replace StringPiece with std::string_view in Signature.
Replace StringPiece with std::string_view in class.h.
Diffstat (limited to 'runtime/class_linker_test.cc')
| -rw-r--r-- | runtime/class_linker_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 2f3712343c..c9bdbdab70 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -18,6 +18,7 @@ #include <memory> #include <string> +#include <string_view> #include "android-base/strings.h" @@ -509,7 +510,7 @@ struct CheckOffsets { for (size_t i = 0; i < offsets.size(); i++) { ArtField* field = is_static ? klass->GetStaticField(i) : klass->GetInstanceField(i); - StringPiece field_name(field->GetName()); + std::string_view field_name(field->GetName()); if (field_name != offsets[i].java_name) { error = true; } @@ -518,7 +519,7 @@ struct CheckOffsets { for (size_t i = 0; i < offsets.size(); i++) { CheckOffset& offset = offsets[i]; ArtField* field = is_static ? klass->GetStaticField(i) : klass->GetInstanceField(i); - StringPiece field_name(field->GetName()); + std::string_view field_name(field->GetName()); if (field_name != offsets[i].java_name) { LOG(ERROR) << "JAVA FIELD ORDER MISMATCH NEXT LINE:"; } @@ -1254,7 +1255,7 @@ TEST_F(ClassLinkerTest, Interfaces) { EXPECT_TRUE(K->IsAssignableFrom(B.Get())); EXPECT_TRUE(J->IsAssignableFrom(B.Get())); - const Signature void_sig = I->GetDexCache()->GetDexFile()->CreateSignature("()V"); + const std::string_view void_sig("()V"); ArtMethod* Ii = I->FindClassMethod("i", void_sig, kRuntimePointerSize); ArtMethod* Jj1 = J->FindClassMethod("j1", void_sig, kRuntimePointerSize); ArtMethod* Jj2 = J->FindClassMethod("j2", void_sig, kRuntimePointerSize); |