diff options
| author | 2012-11-13 12:13:16 -0800 | |
|---|---|---|
| committer | 2012-11-13 13:13:40 -0800 | |
| commit | ec13743da80a80c1817cf6660c28917fc28846bc (patch) | |
| tree | f551225a325636dc56e0a3c01c55a59316e9e829 /src/compiler/codegen/x86/Assemble.cc | |
| parent | f42b6f912dd390808bbd5c025d773ebb02a06ed7 (diff) | |
Revert "Revert "Refactor codegen resource masks""
This reverts commit 4b39c9f1b77ff32cf5760e6bf77c189678e2c9a6.
The problem with the original commit was failure to widen a
couple of local variables to hold the newly widenened to 64-bits
EncodingMap flag field - thus we lost some high-order resource
attributes and broke instruction scheduling for x86.
Change-Id: I04d7caf79e2cc802c39369ca04666629218ccaea
Diffstat (limited to 'src/compiler/codegen/x86/Assemble.cc')
| -rw-r--r-- | src/compiler/codegen/x86/Assemble.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/codegen/x86/Assemble.cc b/src/compiler/codegen/x86/Assemble.cc index c47711cab3..71fcdc8b38 100644 --- a/src/compiler/codegen/x86/Assemble.cc +++ b/src/compiler/codegen/x86/Assemble.cc @@ -352,7 +352,7 @@ static size_t computeSize(X86EncodingMap* entry, int displacement, bool has_sib) } if (displacement != 0) { if (entry->opcode != kX86Lea32RA) { - DCHECK_NE(entry->flags & (IS_LOAD | IS_STORE), 0) << entry->name; + DCHECK_NE(entry->flags & (IS_LOAD | IS_STORE), 0ULL) << entry->name; } size += IS_SIMM8(displacement) ? 1 : 4; } |