Merge "ARM64: Add new String.compareTo intrinsic."

diff --cc compiler/optimizing/intrinsics_arm64.cc
Simple merge

diff --cc runtime/arch/arm64/entrypoints_init_arm64.cc
index 1618ced,f271596..bf0f647
--- 1/runtime/arch/arm64/entrypoints_init_arm64.cc
--- 2/runtime/arch/arm64/entrypoints_init_arm64.cc
+++ b/runtime/arch/arm64/entrypoints_init_arm64.cc
@@@ -80,9 -134,39 +80,10 @@@ void InitEntryPoints(JniEntryPoints* jp
  
    // Intrinsics
    qpoints->pIndexOf = art_quick_indexof;
-   qpoints->pStringCompareTo = art_quick_string_compareto;
+   // The ARM64 StringCompareTo intrinsic does not call the runtime.
+   qpoints->pStringCompareTo = nullptr;
    qpoints->pMemcpy = memcpy;
  
 -  // Invocation
 -  qpoints->pQuickImtConflictTrampoline = art_quick_imt_conflict_trampoline;
 -  qpoints->pQuickResolutionTrampoline = art_quick_resolution_trampoline;
 -  qpoints->pQuickToInterpreterBridge = art_quick_to_interpreter_bridge;
 -  qpoints->pInvokeDirectTrampolineWithAccessCheck =
 -      art_quick_invoke_direct_trampoline_with_access_check;
 -  qpoints->pInvokeInterfaceTrampolineWithAccessCheck =
 -      art_quick_invoke_interface_trampoline_with_access_check;
 -  qpoints->pInvokeStaticTrampolineWithAccessCheck =
 -      art_quick_invoke_static_trampoline_with_access_check;
 -  qpoints->pInvokeSuperTrampolineWithAccessCheck =
 -      art_quick_invoke_super_trampoline_with_access_check;
 -  qpoints->pInvokeVirtualTrampolineWithAccessCheck =
 -      art_quick_invoke_virtual_trampoline_with_access_check;
 -
 -  // Thread
 -  qpoints->pTestSuspend = art_quick_test_suspend;
 -
 -  // Throws
 -  qpoints->pDeliverException = art_quick_deliver_exception;
 -  qpoints->pThrowArrayBounds = art_quick_throw_array_bounds;
 -  qpoints->pThrowDivZero = art_quick_throw_div_zero;
 -  qpoints->pThrowNoSuchMethod = art_quick_throw_no_such_method;
 -  qpoints->pThrowNullPointer = art_quick_throw_null_pointer_exception;
 -  qpoints->pThrowStackOverflow = art_quick_throw_stack_overflow;
 -
 -  // Deoptimization from compiled code.
 -  qpoints->pDeoptimize = art_quick_deoptimize_from_compiled_code;
 -
    // Read barrier.
    qpoints->pReadBarrierJni = ReadBarrierJni;
    qpoints->pReadBarrierMark = artReadBarrierMark;

diff --cc runtime/arch/arm64/quick_entrypoints_arm64.S
Simple merge

diff --cc runtime/arch/stub_test.cc
Simple merge