Use ArrayRef<> instead of ArraySlice<> in JVMTI.
And clean up ArrayRef<> a little bit.
Test: m test-art-host-gtest
Test: testrunner.py --host
Change-Id: I4832006b991fc87b2baec9aa605ff70653b029b3
diff --git a/runtime/openjdkjvmti/ti_class_definition.h b/runtime/openjdkjvmti/ti_class_definition.h
index 43d0c3f..2c268dd 100644
--- a/runtime/openjdkjvmti/ti_class_definition.h
+++ b/runtime/openjdkjvmti/ti_class_definition.h
@@ -34,6 +34,8 @@
#include "art_jvmti.h"
+#include "base/array_ref.h"
+
namespace openjdkjvmti {
// A struct that stores data needed for redefining/transforming classes. This structure should only
@@ -68,12 +70,12 @@
}
}
- art::ArraySlice<const unsigned char> GetNewOriginalDexFile() const {
+ art::ArrayRef<const unsigned char> GetNewOriginalDexFile() const {
DCHECK(IsInitialized());
if (redefined_) {
return original_dex_file_;
} else {
- return art::ArraySlice<const unsigned char>();
+ return art::ArrayRef<const unsigned char>();
}
}
@@ -103,9 +105,9 @@
return protection_domain_;
}
- art::ArraySlice<const unsigned char> GetDexData() const {
+ art::ArrayRef<const unsigned char> GetDexData() const {
DCHECK(IsInitialized());
- return art::ArraySlice<const unsigned char>(dex_data_.get(), dex_len_);
+ return art::ArrayRef<const unsigned char>(dex_data_.get(), dex_len_);
}
private:
@@ -118,7 +120,7 @@
jint dex_len_;
JvmtiUniquePtr<unsigned char> dex_data_;
JvmtiUniquePtr<unsigned char> original_dex_file_memory_;
- art::ArraySlice<const unsigned char> original_dex_file_;
+ art::ArrayRef<const unsigned char> original_dex_file_;
bool redefined_;
DISALLOW_COPY_AND_ASSIGN(ArtClassDefinition);