From 2bdbcb6db8c3ab984cf64d4a3a3f0d5529aa9e52 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 12 Apr 2010 14:29:37 -0700 Subject: Fix supplementary character support. Fixes all known bugs in our handling of supplementary characters. This change introduces a performance regression on the assumption that it won't be released without a corresponding JIT change to enable the code to be inlined back to pretty much what it used to be. Bug: 2587122 Change-Id: I3449c9718bbe32ebe53b6c10454ae1dc82105b59 --- vm/InlineNative.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'vm/InlineNative.h') diff --git a/vm/InlineNative.h b/vm/InlineNative.h index 890226e97..9b9ae3910 100644 --- a/vm/InlineNative.h +++ b/vm/InlineNative.h @@ -54,19 +54,18 @@ typedef enum NativeInlineOps { INLINE_STRING_CHARAT = 1, INLINE_STRING_COMPARETO = 2, INLINE_STRING_EQUALS = 3, - INLINE_STRING_INDEXOF_I = 4, - INLINE_STRING_INDEXOF_II = 5, - INLINE_STRING_IS_EMPTY = 6, - INLINE_STRING_LENGTH = 7, - INLINE_MATH_ABS_INT = 8, - INLINE_MATH_ABS_LONG = 9, - INLINE_MATH_ABS_FLOAT = 10, - INLINE_MATH_ABS_DOUBLE = 11, - INLINE_MATH_MIN_INT = 12, - INLINE_MATH_MAX_INT = 13, - INLINE_MATH_SQRT = 14, - INLINE_MATH_COS = 15, - INLINE_MATH_SIN = 16, + INLINE_STRING_FASTINDEXOF_II = 4, + INLINE_STRING_IS_EMPTY = 5, + INLINE_STRING_LENGTH = 6, + INLINE_MATH_ABS_INT = 7, + INLINE_MATH_ABS_LONG = 8, + INLINE_MATH_ABS_FLOAT = 9, + INLINE_MATH_ABS_DOUBLE = 10, + INLINE_MATH_MIN_INT = 11, + INLINE_MATH_MAX_INT = 12, + INLINE_MATH_SQRT = 13, + INLINE_MATH_COS = 14, + INLINE_MATH_SIN = 15, } NativeInlineOps; /* -- cgit v1.2.3