diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-09-09 21:59:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-09 21:59:47 +0000 |
| commit | e1a851c161db964e42be642c6db470e289100f40 (patch) | |
| tree | 02cb79b5d062f20fc58ff388ed3b76a694545157 /runtime | |
| parent | 05382d22a2ebbc95142ec2fc46e2d56b23e699ee (diff) | |
| parent | cd48f2d86197d4fe87cc88077bc4af5ba66e5295 (diff) | |
| download | art-e1a851c161db964e42be642c6db470e289100f40.zip art-e1a851c161db964e42be642c6db470e289100f40.tar.gz art-e1a851c161db964e42be642c6db470e289100f40.tar.bz2 | |
Merge "Change Reference.get() intrinsic to Reference.getReferent()."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/native/java_lang_ref_Reference.cc | 4 | ||||
| -rw-r--r-- | runtime/quick/inline_method_analyser.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/native/java_lang_ref_Reference.cc b/runtime/native/java_lang_ref_Reference.cc index f221ac6..4f04d60 100644 --- a/runtime/native/java_lang_ref_Reference.cc +++ b/runtime/native/java_lang_ref_Reference.cc @@ -23,7 +23,7 @@ namespace art { -static jobject Reference_get(JNIEnv* env, jobject javaThis) { +static jobject Reference_getReferent(JNIEnv* env, jobject javaThis) { ScopedFastNativeObjectAccess soa(env); mirror::Reference* const ref = soa.Decode<mirror::Reference*>(javaThis); mirror::Object* const referent = @@ -32,7 +32,7 @@ static jobject Reference_get(JNIEnv* env, jobject javaThis) { } static JNINativeMethod gMethods[] = { - NATIVE_METHOD(Reference, get, "!()Ljava/lang/Object;"), + NATIVE_METHOD(Reference, getReferent, "!()Ljava/lang/Object;"), }; void register_java_lang_ref_Reference(JNIEnv* env) { diff --git a/runtime/quick/inline_method_analyser.h b/runtime/quick/inline_method_analyser.h index c4d51cb..a2ae397 100644 --- a/runtime/quick/inline_method_analyser.h +++ b/runtime/quick/inline_method_analyser.h @@ -53,7 +53,7 @@ enum InlineMethodOpcode : uint16_t { kIntrinsicRint, kIntrinsicRoundFloat, kIntrinsicRoundDouble, - kIntrinsicReferenceGet, + kIntrinsicReferenceGetReferent, kIntrinsicCharAt, kIntrinsicCompareTo, kIntrinsicIsEmptyOrLength, |