commit 626aaa987b171c0addab75d7d300a91c24f9a5cc
author buzbee <buzbee@google.com> Fri Aug 03 14:44:06 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 03 14:44:06 2012 -0700
tree 020411da9658eae76036851f49c74515f8c6f481
parent dcf8d7283bd51714f3faa55b631ae4103dc98b51
parent 63ebbb68631caaf1de0588ece186af4018c33cfd

am 63ebbb68: Quick compiler: fix NOT_LONG codegen

* commit '63ebbb68631caaf1de0588ece186af4018c33cfd':
  Quick compiler: fix NOT_LONG codegen

src/compiler/codegen/MethodBitcode.cc

diff --git a/src/compiler/codegen/MethodBitcode.cc b/src/compiler/codegen/MethodBitcode.cc
index 864372a..a8da1cd 100644
--- a/src/compiler/codegen/MethodBitcode.cc
+++ b/src/compiler/codegen/MethodBitcode.cc
@@ -2279,7 +2279,10 @@
     Instruction::Code dalvikOp = getDalvikOpcode(op, false, rlDest.wide);
     RegLocation rlSrc2;
     if (constRhs != NULL) {
-      DCHECK_EQ(dalvikOp, Instruction::NOT_LONG);
+      // ir_builder converts NOT_LONG to xor src, -1.  Restore
+      DCHECK_EQ(dalvikOp, Instruction::XOR_LONG);
+      DCHECK_EQ(-1L, constRhs->getSExtValue());
+      dalvikOp = Instruction::NOT_LONG;
       rlSrc2 = rlSrc1;
     } else {
       rlSrc2 = getLoc(cUnit, rhs);