diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-02 16:44:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 16:44:44 +0000 |
| commit | ace571fb8891d1dcb6b628724949e3a620be45b5 (patch) | |
| tree | 77c695b661868452f2e03e7bd645139b739d5be3 /compiler/dex/mir_optimization.cc | |
| parent | bd7eef17de5f3d25f411702f9f260a96455b4cf7 (diff) | |
| parent | 3d21bdf8894e780d349c481e5c9e29fe1556051c (diff) | |
| download | art-ace571fb8891d1dcb6b628724949e3a620be45b5.zip art-ace571fb8891d1dcb6b628724949e3a620be45b5.tar.gz art-ace571fb8891d1dcb6b628724949e3a620be45b5.tar.bz2 | |
Merge "Move mirror::ArtMethod to native" into mnc-dev
Diffstat (limited to 'compiler/dex/mir_optimization.cc')
| -rw-r--r-- | compiler/dex/mir_optimization.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc index 7679db8..7b1ec39 100644 --- a/compiler/dex/mir_optimization.cc +++ b/compiler/dex/mir_optimization.cc @@ -249,7 +249,7 @@ int MIRGraph::GetSSAUseCount(int s_reg) { size_t MIRGraph::GetNumBytesForSpecialTemps() const { // This logic is written with assumption that Method* is only special temp. DCHECK_EQ(max_available_special_compiler_temps_, 1u); - return sizeof(StackReference<mirror::ArtMethod>); + return InstructionSetPointerSize(cu_->instruction_set); } size_t MIRGraph::GetNumAvailableVRTemps() { @@ -316,6 +316,7 @@ CompilerTemp* MIRGraph::GetNewCompilerTemp(CompilerTempType ct_type, bool wide) // The vreg is always the first special temp for method ptr. compiler_temp->v_reg = GetFirstSpecialTempVR(); + CHECK(reg_location_ == nullptr); } else if (ct_type == kCompilerTempBackend) { requested_backend_temp_ = true; |