Add support to indicate whether intrinsics require a dex cache
A structural change to indicate whether a given intrinsic requires access
to a dex cache. I updated the needs_environment_ field to indicate
whether an HInvoke needs an environment or a dex cache, and if an HInvoke
represents an intrisified method, we utilize this field to determine if
the HInvoke needs a dex cache.
Bug: 21481923
Change-Id: I9dd25a385e1a1397603da6c4c43f6c1aea511b32
diff --git a/compiler/optimizing/intrinsics_list.h b/compiler/optimizing/intrinsics_list.h
index 15ee5d4..7e5339e 100644
--- a/compiler/optimizing/intrinsics_list.h
+++ b/compiler/optimizing/intrinsics_list.h
@@ -22,73 +22,73 @@
// environment.
#define INTRINSICS_LIST(V) \
- V(DoubleDoubleToRawLongBits, kStatic, kNeedsEnvironment) \
- V(DoubleLongBitsToDouble, kStatic, kNeedsEnvironment) \
- V(FloatFloatToRawIntBits, kStatic, kNeedsEnvironment) \
- V(FloatIntBitsToFloat, kStatic, kNeedsEnvironment) \
- V(IntegerReverse, kStatic, kNeedsEnvironment) \
- V(IntegerReverseBytes, kStatic, kNeedsEnvironment) \
- V(IntegerNumberOfLeadingZeros, kStatic, kNeedsEnvironment) \
- V(LongReverse, kStatic, kNeedsEnvironment) \
- V(LongReverseBytes, kStatic, kNeedsEnvironment) \
- V(LongNumberOfLeadingZeros, kStatic, kNeedsEnvironment) \
- V(ShortReverseBytes, kStatic, kNeedsEnvironment) \
- V(MathAbsDouble, kStatic, kNeedsEnvironment) \
- V(MathAbsFloat, kStatic, kNeedsEnvironment) \
- V(MathAbsLong, kStatic, kNeedsEnvironment) \
- V(MathAbsInt, kStatic, kNeedsEnvironment) \
- V(MathMinDoubleDouble, kStatic, kNeedsEnvironment) \
- V(MathMinFloatFloat, kStatic, kNeedsEnvironment) \
- V(MathMinLongLong, kStatic, kNeedsEnvironment) \
- V(MathMinIntInt, kStatic, kNeedsEnvironment) \
- V(MathMaxDoubleDouble, kStatic, kNeedsEnvironment) \
- V(MathMaxFloatFloat, kStatic, kNeedsEnvironment) \
- V(MathMaxLongLong, kStatic, kNeedsEnvironment) \
- V(MathMaxIntInt, kStatic, kNeedsEnvironment) \
- V(MathSqrt, kStatic, kNeedsEnvironment) \
- V(MathCeil, kStatic, kNeedsEnvironment) \
- V(MathFloor, kStatic, kNeedsEnvironment) \
- V(MathRint, kStatic, kNeedsEnvironment) \
- V(MathRoundDouble, kStatic, kNeedsEnvironment) \
- V(MathRoundFloat, kStatic, kNeedsEnvironment) \
- V(SystemArrayCopyChar, kStatic, kNeedsEnvironment) \
- V(ThreadCurrentThread, kStatic, kNeedsEnvironment) \
- V(MemoryPeekByte, kStatic, kNeedsEnvironment) \
- V(MemoryPeekIntNative, kStatic, kNeedsEnvironment) \
- V(MemoryPeekLongNative, kStatic, kNeedsEnvironment) \
- V(MemoryPeekShortNative, kStatic, kNeedsEnvironment) \
- V(MemoryPokeByte, kStatic, kNeedsEnvironment) \
- V(MemoryPokeIntNative, kStatic, kNeedsEnvironment) \
- V(MemoryPokeLongNative, kStatic, kNeedsEnvironment) \
- V(MemoryPokeShortNative, kStatic, kNeedsEnvironment) \
- V(StringCharAt, kDirect, kNeedsEnvironment) \
- V(StringCompareTo, kDirect, kNeedsEnvironment) \
- V(StringEquals, kDirect, kNeedsEnvironment) \
- V(StringGetCharsNoCheck, kDirect, kNeedsEnvironment) \
- V(StringIndexOf, kDirect, kNeedsEnvironment) \
- V(StringIndexOfAfter, kDirect, kNeedsEnvironment) \
- V(StringNewStringFromBytes, kStatic, kNeedsEnvironment) \
- V(StringNewStringFromChars, kStatic, kNeedsEnvironment) \
- V(StringNewStringFromString, kStatic, kNeedsEnvironment) \
- V(UnsafeCASInt, kDirect, kNeedsEnvironment) \
- V(UnsafeCASLong, kDirect, kNeedsEnvironment) \
- V(UnsafeCASObject, kDirect, kNeedsEnvironment) \
- V(UnsafeGet, kDirect, kNeedsEnvironment) \
- V(UnsafeGetVolatile, kDirect, kNeedsEnvironment) \
- V(UnsafeGetObject, kDirect, kNeedsEnvironment) \
- V(UnsafeGetObjectVolatile, kDirect, kNeedsEnvironment) \
- V(UnsafeGetLong, kDirect, kNeedsEnvironment) \
- V(UnsafeGetLongVolatile, kDirect, kNeedsEnvironment) \
- V(UnsafePut, kDirect, kNeedsEnvironment) \
- V(UnsafePutOrdered, kDirect, kNeedsEnvironment) \
- V(UnsafePutVolatile, kDirect, kNeedsEnvironment) \
- V(UnsafePutObject, kDirect, kNeedsEnvironment) \
- V(UnsafePutObjectOrdered, kDirect, kNeedsEnvironment) \
- V(UnsafePutObjectVolatile, kDirect, kNeedsEnvironment) \
- V(UnsafePutLong, kDirect, kNeedsEnvironment) \
- V(UnsafePutLongOrdered, kDirect, kNeedsEnvironment) \
- V(UnsafePutLongVolatile, kDirect, kNeedsEnvironment) \
- V(ReferenceGetReferent, kDirect, kNeedsEnvironment)
+ V(DoubleDoubleToRawLongBits, kStatic, kNeedsEnvironmentOrCache) \
+ V(DoubleLongBitsToDouble, kStatic, kNeedsEnvironmentOrCache) \
+ V(FloatFloatToRawIntBits, kStatic, kNeedsEnvironmentOrCache) \
+ V(FloatIntBitsToFloat, kStatic, kNeedsEnvironmentOrCache) \
+ V(IntegerReverse, kStatic, kNeedsEnvironmentOrCache) \
+ V(IntegerReverseBytes, kStatic, kNeedsEnvironmentOrCache) \
+ V(IntegerNumberOfLeadingZeros, kStatic, kNeedsEnvironmentOrCache) \
+ V(LongReverse, kStatic, kNeedsEnvironmentOrCache) \
+ V(LongReverseBytes, kStatic, kNeedsEnvironmentOrCache) \
+ V(LongNumberOfLeadingZeros, kStatic, kNeedsEnvironmentOrCache) \
+ V(ShortReverseBytes, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathAbsDouble, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathAbsFloat, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathAbsLong, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathAbsInt, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathMinDoubleDouble, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathMinFloatFloat, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathMinLongLong, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathMinIntInt, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathMaxDoubleDouble, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathMaxFloatFloat, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathMaxLongLong, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathMaxIntInt, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathSqrt, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathCeil, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathFloor, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathRint, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathRoundDouble, kStatic, kNeedsEnvironmentOrCache) \
+ V(MathRoundFloat, kStatic, kNeedsEnvironmentOrCache) \
+ V(SystemArrayCopyChar, kStatic, kNeedsEnvironmentOrCache) \
+ V(ThreadCurrentThread, kStatic, kNeedsEnvironmentOrCache) \
+ V(MemoryPeekByte, kStatic, kNeedsEnvironmentOrCache) \
+ V(MemoryPeekIntNative, kStatic, kNeedsEnvironmentOrCache) \
+ V(MemoryPeekLongNative, kStatic, kNeedsEnvironmentOrCache) \
+ V(MemoryPeekShortNative, kStatic, kNeedsEnvironmentOrCache) \
+ V(MemoryPokeByte, kStatic, kNeedsEnvironmentOrCache) \
+ V(MemoryPokeIntNative, kStatic, kNeedsEnvironmentOrCache) \
+ V(MemoryPokeLongNative, kStatic, kNeedsEnvironmentOrCache) \
+ V(MemoryPokeShortNative, kStatic, kNeedsEnvironmentOrCache) \
+ V(StringCharAt, kDirect, kNeedsEnvironmentOrCache) \
+ V(StringCompareTo, kDirect, kNeedsEnvironmentOrCache) \
+ V(StringEquals, kDirect, kNeedsEnvironmentOrCache) \
+ V(StringGetCharsNoCheck, kDirect, kNeedsEnvironmentOrCache) \
+ V(StringIndexOf, kDirect, kNeedsEnvironmentOrCache) \
+ V(StringIndexOfAfter, kDirect, kNeedsEnvironmentOrCache) \
+ V(StringNewStringFromBytes, kStatic, kNeedsEnvironmentOrCache) \
+ V(StringNewStringFromChars, kStatic, kNeedsEnvironmentOrCache) \
+ V(StringNewStringFromString, kStatic, kNeedsEnvironmentOrCache) \
+ V(UnsafeCASInt, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafeCASLong, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafeCASObject, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafeGet, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafeGetVolatile, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafeGetObject, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafeGetObjectVolatile, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafeGetLong, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafeGetLongVolatile, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePut, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePutOrdered, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePutVolatile, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePutObject, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePutObjectOrdered, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePutObjectVolatile, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePutLong, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePutLongOrdered, kDirect, kNeedsEnvironmentOrCache) \
+ V(UnsafePutLongVolatile, kDirect, kNeedsEnvironmentOrCache) \
+ V(ReferenceGetReferent, kDirect, kNeedsEnvironmentOrCache)
#endif // ART_COMPILER_OPTIMIZING_INTRINSICS_LIST_H_
#undef ART_COMPILER_OPTIMIZING_INTRINSICS_LIST_H_ // #define is only for lint.