diff options
| author | 2012-06-01 12:25:59 -0700 | |
|---|---|---|
| committer | 2012-06-01 12:25:59 -0700 | |
| commit | 60234563a621362c6ffe753fe5368afcd6682bcb (patch) | |
| tree | dc17bb4872b6badd6860d9ce029568bcba3afc43 /src/compiler/codegen/GenInvoke.cc | |
| parent | 9ad4f22cd9a94a3bd3439e1bc9d67fdc3e9bc67f (diff) | |
Various missing hunks.
These are hunks of changes that seem to have been lost between
ics-mr1-plus-art and dalvik-dev. Maybe bad merge resolutions?
Change-Id: I822c64651dc693df38efa8bc290edb959ce3398c
Diffstat (limited to 'src/compiler/codegen/GenInvoke.cc')
| -rw-r--r-- | src/compiler/codegen/GenInvoke.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/codegen/GenInvoke.cc b/src/compiler/codegen/GenInvoke.cc index 6d3c240ad0..2217059ea7 100644 --- a/src/compiler/codegen/GenInvoke.cc +++ b/src/compiler/codegen/GenInvoke.cc @@ -667,7 +667,7 @@ bool genInlinedCharAt(CompilationUnit* cUnit, BasicBlock* bb, MIR* mir, oatFreeTemp(cUnit, regPtr); storeValue(cUnit, rlDest, rlResult); if (rangeCheck) { - launchPad->operands[2] = NULL; // no resumption + launchPad->operands[2] = 0; // no resumption launchPad->operands[3] = (uintptr_t)bb; } // Record that we've already inlined & null checked @@ -852,10 +852,10 @@ bool genInlinedStringCompareTo(CompilationUnit* cUnit, BasicBlock* bb, //TUNING: check if rlCmp.sRegLow is already null checked LIR* launchPad = rawLIR(cUnit, 0, kPseudoIntrinsicRetry, (int)mir, type); oatInsertGrowableList(cUnit, &cUnit->intrinsicLaunchpads, - (intptr_t)launchPad); + (intptr_t)launchPad); opCmpImmBranch(cUnit, kCondEq, regCmp, 0, launchPad); opReg(cUnit, kOpBlx, rTgt); - launchPad->operands[2] = NULL; // No return possible + launchPad->operands[2] = 0; // No return possible launchPad->operands[3] = (uintptr_t)bb; // Record that we've already inlined & null checked mir->optimizationFlags |= (MIR_INLINED | MIR_IGNORE_NULL_CHECK); |