diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-30 01:26:50 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-08-13 18:09:46 -0700 |
| commit | ea46f950e7a51585db293cd7f047de190a482414 (patch) | |
| tree | 9dddc8073547a2dcb58a19e1728932a89cb149c3 /runtime/common_throws.h | |
| parent | 5e3572709b5a5d59957f835db4f73760ecef08da (diff) | |
| download | art-ea46f950e7a51585db293cd7f047de190a482414.tar.gz art-ea46f950e7a51585db293cd7f047de190a482414.tar.bz2 art-ea46f950e7a51585db293cd7f047de190a482414.zip | |
Refactor java.lang.reflect implementation
Cherry-picked from commit ed41d5c44299ec5d44b8514f6e17f802f48094d1.
Move to ArtMethod/Field instead of AbstractMethod/Field and have
java.lang.reflect APIs delegate to ArtMethod/ArtField.
Bug: 10014286.
Change-Id: Iafc1d8c5b62562c9af8fb9fd8c5e1d61270536e7
Diffstat (limited to 'runtime/common_throws.h')
| -rw-r--r-- | runtime/common_throws.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/runtime/common_throws.h b/runtime/common_throws.h index b7f2754df1..99c6343cdd 100644 --- a/runtime/common_throws.h +++ b/runtime/common_throws.h @@ -22,9 +22,9 @@ namespace art { namespace mirror { -class AbstractMethod; +class ArtField; +class ArtMethod; class Class; -class Field; class Object; } // namespace mirror class StringPiece; @@ -32,7 +32,7 @@ class ThrowLocation; // AbstractMethodError -void ThrowAbstractMethodError(const mirror::AbstractMethod* method) +void ThrowAbstractMethodError(const mirror::ArtMethod* method) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // ArithmeticException @@ -74,19 +74,19 @@ void ThrowIllegalAccessErrorClass(mirror::Class* referrer, mirror::Class* access SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void ThrowIllegalAccessErrorClassForMethodDispatch(mirror::Class* referrer, mirror::Class* accessed, - const mirror::AbstractMethod* caller, - const mirror::AbstractMethod* called, + const mirror::ArtMethod* caller, + const mirror::ArtMethod* called, InvokeType type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -void ThrowIllegalAccessErrorMethod(mirror::Class* referrer, mirror::AbstractMethod* accessed) +void ThrowIllegalAccessErrorMethod(mirror::Class* referrer, mirror::ArtMethod* accessed) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -void ThrowIllegalAccessErrorField(mirror::Class* referrer, mirror::Field* accessed) +void ThrowIllegalAccessErrorField(mirror::Class* referrer, mirror::ArtField* accessed) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -void ThrowIllegalAccessErrorFinalField(const mirror::AbstractMethod* referrer, - mirror::Field* accessed) +void ThrowIllegalAccessErrorFinalField(const mirror::ArtMethod* referrer, + mirror::ArtField* accessed) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void ThrowIllegalAccessError(mirror::Class* referrer, const char* fmt, ...) @@ -101,17 +101,17 @@ void ThrowIllegalArgumentException(const ThrowLocation* throw_location, const ch // IncompatibleClassChangeError void ThrowIncompatibleClassChangeError(InvokeType expected_type, InvokeType found_type, - mirror::AbstractMethod* method, - const mirror::AbstractMethod* referrer) + mirror::ArtMethod* method, + const mirror::ArtMethod* referrer) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -void ThrowIncompatibleClassChangeErrorClassForInterfaceDispatch(const mirror::AbstractMethod* interface_method, +void ThrowIncompatibleClassChangeErrorClassForInterfaceDispatch(const mirror::ArtMethod* interface_method, mirror::Object* this_object, - const mirror::AbstractMethod* referrer) + const mirror::ArtMethod* referrer) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -void ThrowIncompatibleClassChangeErrorField(const mirror::Field* resolved_field, bool is_static, - const mirror::AbstractMethod* referrer) +void ThrowIncompatibleClassChangeErrorField(const mirror::ArtField* resolved_field, bool is_static, + const mirror::ArtMethod* referrer) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void ThrowIncompatibleClassChangeError(const mirror::Class* referrer, const char* fmt, ...) @@ -149,7 +149,7 @@ void ThrowNoSuchMethodError(uint32_t method_idx) // NullPointerException void ThrowNullPointerExceptionForFieldAccess(const ThrowLocation& throw_location, - mirror::Field* field, + mirror::ArtField* field, bool is_read) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -159,7 +159,7 @@ void ThrowNullPointerExceptionForMethodAccess(const ThrowLocation& throw_locatio SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void ThrowNullPointerExceptionForMethodAccess(const ThrowLocation& throw_location, - mirror::AbstractMethod* method, + mirror::ArtMethod* method, InvokeType type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |