diff options
| author | 2015-05-07 01:29:19 +0000 | |
|---|---|---|
| committer | 2015-05-07 01:29:19 +0000 | |
| commit | 225f679f1d276e16e95960fcbe9743f95012adfa (patch) | |
| tree | 8c8395ffb790e6fa235ba0f205a7a43412cd869e /compiler | |
| parent | 8771be9a5826ebe12cea0c2feb0fa085df5d60a2 (diff) | |
| parent | a412964bf9f8b2aa78e7a4849990381207140850 (diff) | |
Merge "In quick compiler, force string init invoke to be fast path."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/mir_method_info.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/dex/mir_method_info.cc b/compiler/dex/mir_method_info.cc index 5654604797..94be1fd4a5 100644 --- a/compiler/dex/mir_method_info.cc +++ b/compiler/dex/mir_method_info.cc @@ -169,7 +169,8 @@ void MirMethodLoweringInfo::Resolve(CompilerDriver* compiler_driver, ~(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) | |