commit a6591ef95afa6bc9d89c0c6044635ec7a13d4c55
author Andreas Gampe <agampe@google.com> Thu May 07 03:50:01 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 07 03:50:01 2015 +0000
tree 9c1123fb69fe2828f2850c6502ef513ef1d27bca
parent 225f679f1d276e16e95960fcbe9743f95012adfa
parent d90957fbe6f41c66d5494ae5db1f60d2434d4c84

Merge "ART: Fix mips64 jni bugs."

compiler/dex/mir_method_info.cc

diff --git a/compiler/dex/mir_method_info.cc b/compiler/dex/mir_method_info.cc
index 5654604..94be1fd 100644
--- a/compiler/dex/mir_method_info.cc
+++ b/compiler/dex/mir_method_info.cc
@@ -169,7 +169,8 @@
         ~(kFlagFastPath | kFlagIsIntrinsic | kFlagIsSpecial | kFlagClassIsInitialized |
             (kInvokeTypeMask << kBitSharpTypeBegin));
     it->flags_ = other_flags |
-        (fast_path_flags != 0 ? kFlagFastPath : 0u) |
+        // String init path is a special always-fast path.
+        (fast_path_flags != 0 || string_init ? kFlagFastPath : 0u) |
         ((is_intrinsic_or_special & kInlineIntrinsic) != 0 ? kFlagIsIntrinsic : 0u) |
         ((is_intrinsic_or_special & kInlineSpecial) != 0 ? kFlagIsSpecial : 0u) |
         (static_cast<uint16_t>(invoke_type) << kBitSharpTypeBegin) |