diff options
| author | 2014-07-11 08:27:55 +0000 | |
|---|---|---|
| committer | 2014-07-10 20:18:52 +0000 | |
| commit | 6a1f4ad192e596b6bf43b39c26846300f401a692 (patch) | |
| tree | 55c09df7af6f2e8848a7462cb55f3e0bd452fe2c /compiler/dex/quick/codegen_util.cc | |
| parent | bd6b5dd3ce0f4d5454334d4848a97b00120b235e (diff) | |
| parent | 0025a86411145eb7cd4971f9234fc21c7b4aced1 (diff) | |
Merge "Revert "Revert "Revert "Add implicit null and stack checks for x86""""
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 95468d2867..048aca3735 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -1172,12 +1172,9 @@ bool Mir2Lir::BadOverlap(RegLocation rl_src, RegLocation rl_dest) { } LIR *Mir2Lir::OpCmpMemImmBranch(ConditionCode cond, RegStorage temp_reg, RegStorage base_reg, - int offset, int check_value, LIR* target, LIR** compare) { + int offset, int check_value, LIR* target) { // Handle this for architectures that can't compare to memory. - LIR* inst = Load32Disp(base_reg, offset, temp_reg); - if (compare != nullptr) { - *compare = inst; - } + Load32Disp(base_reg, offset, temp_reg); LIR* branch = OpCmpImmBranch(cond, temp_reg, check_value, target); return branch; } |