commit 4b39c9f1b77ff32cf5760e6bf77c189678e2c9a6
author Bill Buzbee <buzbee@google.com> Thu Nov 08 13:32:05 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 08 13:32:05 2012 -0800
tree 95cf9de07529d58d847898087f8c5fd6c1e1a4fd
parent 07131ca93c301e5cbd6a8702d6af777e1662fe65

Revert "Refactor codegen resource masks"

This reverts commit 07131ca93c301e5cbd6a8702d6af777e1662fe65

There's a problem with the x86 build - reverting until I track it down.

Change-Id: I938ed30617ee943c9dba2d52d034e6d198b32e4b

src/compiler/codegen/x86/Assemble.cc

diff --git a/src/compiler/codegen/x86/Assemble.cc b/src/compiler/codegen/x86/Assemble.cc
index 71fcdc8..c47711c 100644
--- a/src/compiler/codegen/x86/Assemble.cc
+++ b/src/compiler/codegen/x86/Assemble.cc
@@ -352,7 +352,7 @@
   }
   if (displacement != 0) {
     if (entry->opcode != kX86Lea32RA) {
-      DCHECK_NE(entry->flags & (IS_LOAD | IS_STORE), 0ULL) << entry->name;
+      DCHECK_NE(entry->flags & (IS_LOAD | IS_STORE), 0) << entry->name;
     }
     size += IS_SIMM8(displacement) ? 1 : 4;
   }