diff options
| author | 2012-06-20 21:17:04 -0700 | |
|---|---|---|
| committer | 2012-06-20 21:17:04 -0700 | |
| commit | 86738bd3b21cf28f6a64c72e827cc56eddd5269e (patch) | |
| tree | 690e433dd8d2f09c63165103e7c28eff81f743e0 | |
| parent | 92e3134cd84c134f167175288671a1e6838c908f (diff) | |
| parent | e33c92b3b9c75b7a5c685639d289d6381b2694a9 (diff) | |
Merge "Fix string.compareTo regression" into ics-mr1-plus-art
| -rw-r--r-- | src/compiler/codegen/GenInvoke.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/codegen/GenInvoke.cc b/src/compiler/codegen/GenInvoke.cc index 7c2cf1cba3..e6714aa807 100644 --- a/src/compiler/codegen/GenInvoke.cc +++ b/src/compiler/codegen/GenInvoke.cc @@ -854,8 +854,7 @@ bool genInlinedStringCompareTo(CompilationUnit* cUnit, CallInfo* info) bool genIntrinsic(CompilationUnit* cUnit, CallInfo* info) { - if ((info->optFlags & MIR_INLINED) || info->isRange || - (info->result.location == kLocInvalid)) { + if ((info->optFlags & MIR_INLINED) || info->isRange) { return false; } /* |