diff options
| author | Jeff Hao <jeffhao@google.com> | 2015-04-27 20:54:07 -0700 |
|---|---|---|
| committer | Jeff Hao <jeffhao@google.com> | 2015-04-27 20:55:25 -0700 |
| commit | 69bdcb29fdbd8266374e3793cb4e28dcc5daf0f9 (patch) | |
| tree | 60b122ece08b503b9f1d020306ab4151d4680ae6 /runtime/arch | |
| parent | f0a3d3dad248ad0dcb7cfc6addcc66d8bd117e48 (diff) | |
| download | art-69bdcb29fdbd8266374e3793cb4e28dcc5daf0f9.tar.gz art-69bdcb29fdbd8266374e3793cb4e28dcc5daf0f9.tar.bz2 art-69bdcb29fdbd8266374e3793cb4e28dcc5daf0f9.zip | |
Fix java_lang_Class newInstance for strings; also quick entrypoints.
Change-Id: I35fd23c5a9051e1ffda0ecc2cbafb5d318c7b5e6
Diffstat (limited to 'runtime/arch')
| -rw-r--r-- | runtime/arch/quick_alloc_entrypoints.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/arch/quick_alloc_entrypoints.S b/runtime/arch/quick_alloc_entrypoints.S index eaee19b352..fe04bf5a77 100644 --- a/runtime/arch/quick_alloc_entrypoints.S +++ b/runtime/arch/quick_alloc_entrypoints.S @@ -36,11 +36,11 @@ THREE_ARG_DOWNCALL art_quick_check_and_alloc_array\c_suffix, artCheckAndAllocArr // Called by managed code to allocate an array in a special case for FILLED_NEW_ARRAY. THREE_ARG_DOWNCALL art_quick_check_and_alloc_array_with_access_check\c_suffix, artCheckAndAllocArrayFromCodeWithAccessCheck\cxx_suffix, RETURN_IF_RESULT_IS_NON_ZERO_OR_DELIVER // Called by managed code to allocate a string from bytes -FOUR_ARG_DOWNCALL art_quick_alloc_string_from_bytes\c_suffix, artAllocStringFromBytesFromCode\cxx_suffix, RETURN_IF_RESULT_IS_NON_ZERO +FOUR_ARG_DOWNCALL art_quick_alloc_string_from_bytes\c_suffix, artAllocStringFromBytesFromCode\cxx_suffix, RETURN_IF_RESULT_IS_NON_ZERO_OR_DELIVER // Called by managed code to allocate a string from chars -THREE_ARG_DOWNCALL art_quick_alloc_string_from_chars\c_suffix, artAllocStringFromCharsFromCode\cxx_suffix, RETURN_IF_RESULT_IS_NON_ZERO +THREE_ARG_DOWNCALL art_quick_alloc_string_from_chars\c_suffix, artAllocStringFromCharsFromCode\cxx_suffix, RETURN_IF_RESULT_IS_NON_ZERO_OR_DELIVER // Called by managed code to allocate a string from string -ONE_ARG_DOWNCALL art_quick_alloc_string_from_string\c_suffix, artAllocStringFromStringFromCode\cxx_suffix, RETURN_IF_RESULT_IS_NON_ZERO +ONE_ARG_DOWNCALL art_quick_alloc_string_from_string\c_suffix, artAllocStringFromStringFromCode\cxx_suffix, RETURN_IF_RESULT_IS_NON_ZERO_OR_DELIVER .endm .macro GENERATE_ALL_ALLOC_ENTRYPOINTS |