diff options
author | Sebastien Hertz <shertz@google.com> | 2013-09-06 16:43:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-06 16:43:43 +0000 |
commit | 866709c85da0c0d2c76968713e4dc4a35dce27fd (patch) | |
tree | b2fb26bfe6c7ef9ae340d2ebb3d7c0060a8f1582 /compiler/dex/mir_dataflow.cc | |
parent | 936bf024b26f84f9332d195a581912e95d9cbe4b (diff) | |
parent | 1e54d68ce8e77dfe63340275d11a072c5184c89a (diff) | |
download | android_art-866709c85da0c0d2c76968713e4dc4a35dce27fd.tar.gz android_art-866709c85da0c0d2c76968713e4dc4a35dce27fd.tar.bz2 android_art-866709c85da0c0d2c76968713e4dc4a35dce27fd.zip |
Merge "Disable devirtualization detection in DEX-to-DEX compiler." into dalvik-dev
Diffstat (limited to 'compiler/dex/mir_dataflow.cc')
-rw-r--r-- | compiler/dex/mir_dataflow.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/mir_dataflow.cc b/compiler/dex/mir_dataflow.cc index 3a73717a7b..42ca5dcfdf 100644 --- a/compiler/dex/mir_dataflow.cc +++ b/compiler/dex/mir_dataflow.cc @@ -1224,7 +1224,7 @@ bool MIRGraph::InvokeUsesMethodStar(MIR* mir) { type, target_method, vtable_idx, direct_code, direct_method, - false) && + false, true) && !(cu_->enable_debug & (1 << kDebugSlowInvokePath)); return (((type == kDirect) || (type == kStatic)) && fast_path && ((direct_code == 0) || (direct_method == 0))); |