ART: SHARED_REQUIRES to REQUIRES_SHARED
This coincides with the actual attribute name and upstream usage.
Preparation for deferring to libbase.
Test: m
Test: m test-art-host
Change-Id: Ia8986b5dfd926ba772bf00b0a35eaf83596d8518
diff --git a/runtime/common_throws.h b/runtime/common_throws.h
index cbd338d..ab25543 100644
--- a/runtime/common_throws.h
+++ b/runtime/common_throws.h
@@ -34,193 +34,193 @@
// AbstractMethodError
void ThrowAbstractMethodError(ArtMethod* method)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowAbstractMethodError(uint32_t method_idx, const DexFile& dex_file)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// ArithmeticException
-void ThrowArithmeticExceptionDivideByZero() SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+void ThrowArithmeticExceptionDivideByZero() REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// ArrayIndexOutOfBoundsException
void ThrowArrayIndexOutOfBoundsException(int index, int length)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// ArrayStoreException
void ThrowArrayStoreException(mirror::Class* element_class, mirror::Class* array_class)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// ClassCircularityError
void ThrowClassCircularityError(mirror::Class* c)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowClassCircularityError(mirror::Class* c, const char* fmt, ...)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// ClassCastException
void ThrowClassCastException(mirror::Class* dest_type, mirror::Class* src_type)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowClassCastException(const char* msg)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// ClassFormatError
void ThrowClassFormatError(mirror::Class* referrer, const char* fmt, ...)
__attribute__((__format__(__printf__, 2, 3)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// IllegalAccessError
void ThrowIllegalAccessErrorClass(mirror::Class* referrer, mirror::Class* accessed)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIllegalAccessErrorClassForMethodDispatch(mirror::Class* referrer, mirror::Class* accessed,
ArtMethod* called,
InvokeType type)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIllegalAccessErrorMethod(mirror::Class* referrer, ArtMethod* accessed)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIllegalAccessErrorField(mirror::Class* referrer, ArtField* accessed)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIllegalAccessErrorFinalField(ArtMethod* referrer, ArtField* accessed)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIllegalAccessError(mirror::Class* referrer, const char* fmt, ...)
__attribute__((__format__(__printf__, 2, 3)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// IllegalAccessException
void ThrowIllegalAccessException(const char* msg)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// IllegalArgumentException
void ThrowIllegalArgumentException(const char* msg)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// IncompatibleClassChangeError
void ThrowIncompatibleClassChangeError(InvokeType expected_type, InvokeType found_type,
ArtMethod* method, ArtMethod* referrer)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIncompatibleClassChangeErrorClassForInterfaceSuper(ArtMethod* method,
mirror::Class* target_class,
mirror::Object* this_object,
ArtMethod* referrer)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIncompatibleClassChangeErrorClassForInterfaceDispatch(ArtMethod* interface_method,
mirror::Object* this_object,
ArtMethod* referrer)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIncompatibleClassChangeErrorField(ArtField* resolved_field, bool is_static,
ArtMethod* referrer)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIncompatibleClassChangeError(mirror::Class* referrer, const char* fmt, ...)
__attribute__((__format__(__printf__, 2, 3)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowIncompatibleClassChangeErrorForMethodConflict(ArtMethod* method)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// IOException
void ThrowIOException(const char* fmt, ...) __attribute__((__format__(__printf__, 1, 2)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowWrappedIOException(const char* fmt, ...) __attribute__((__format__(__printf__, 1, 2)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// LinkageError
void ThrowLinkageError(mirror::Class* referrer, const char* fmt, ...)
__attribute__((__format__(__printf__, 2, 3)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowWrappedLinkageError(mirror::Class* referrer, const char* fmt, ...)
__attribute__((__format__(__printf__, 2, 3)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// NegativeArraySizeException
void ThrowNegativeArraySizeException(int size)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowNegativeArraySizeException(const char* msg)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// NoSuchFieldError
void ThrowNoSuchFieldError(const StringPiece& scope, mirror::Class* c,
const StringPiece& type, const StringPiece& name)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowNoSuchFieldException(mirror::Class* c, const StringPiece& name)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// NoSuchMethodError
void ThrowNoSuchMethodError(InvokeType type, mirror::Class* c, const StringPiece& name,
const Signature& signature)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowNoSuchMethodError(uint32_t method_idx)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// NullPointerException
void ThrowNullPointerExceptionForFieldAccess(ArtField* field,
bool is_read)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowNullPointerExceptionForMethodAccess(uint32_t method_idx,
InvokeType type)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowNullPointerExceptionForMethodAccess(ArtMethod* method,
InvokeType type)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowNullPointerExceptionFromDexPC(bool check_address = false, uintptr_t addr = 0)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
void ThrowNullPointerException(const char* msg)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// RuntimeException
void ThrowRuntimeException(const char* fmt, ...)
__attribute__((__format__(__printf__, 1, 2)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// Stack overflow.
-void ThrowStackOverflowError(Thread* self) SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+void ThrowStackOverflowError(Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// StringIndexOutOfBoundsException
void ThrowStringIndexOutOfBoundsException(int index, int length)
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
// VerifyError
void ThrowVerifyError(mirror::Class* referrer, const char* fmt, ...)
__attribute__((__format__(__printf__, 2, 3)))
- SHARED_REQUIRES(Locks::mutator_lock_) COLD_ATTR;
+ REQUIRES_SHARED(Locks::mutator_lock_) COLD_ATTR;
} // namespace art