diff options
| author | 2014-05-08 12:20:24 +0700 | |
|---|---|---|
| committer | 2014-05-23 16:22:01 +0700 | |
| commit | 4c80043aa75d0dfa62dd2fd1845bc2b92110336d (patch) | |
| tree | 24e088fb549e4e9ac12ed3468782796aaf819f81 /compiler/dex | |
| parent | 2054b925a635642bedd912c6da37ffa9f1d21c6d (diff) | |
x86_64: Disable all intrinsics
Intrinsics are subject to rework for x86_64 and disabled for now.
Change-Id: Ice67db083fe43dc4faa9276faf02234a4a24f207
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Diffstat (limited to 'compiler/dex')
| -rw-r--r-- | compiler/dex/quick/gen_invoke.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc index 721b3452b7..5ec1ca9d63 100644 --- a/compiler/dex/quick/gen_invoke.cc +++ b/compiler/dex/quick/gen_invoke.cc @@ -1659,9 +1659,13 @@ void Mir2Lir::GenInvoke(CallInfo* info) { return; } DCHECK(cu_->compiler_driver->GetMethodInlinerMap() != nullptr); - if (cu_->compiler_driver->GetMethodInlinerMap()->GetMethodInliner(cu_->dex_file) - ->GenIntrinsic(this, info)) { - return; + // TODO: Enable instrinsics for x86_64 + // Temporary disable intrinsics for x86_64. We will enable them later step by step. + if (cu_->instruction_set != kX86_64) { + if (cu_->compiler_driver->GetMethodInlinerMap()->GetMethodInliner(cu_->dex_file) + ->GenIntrinsic(this, info)) { + return; + } } GenInvokeNoInline(info); } |