Changeset 164433 in webkit


Ignore:
Timestamp:
Feb 20, 2014 9:38:15 AM (10 years ago)
Author:
rgabor@webkit.org
Message:

ASSERTION FAILED: isUInt16() on ARMv7 after r113253.
https://bugs.webkit.org/show_bug.cgi?id=129101

Reviewed by Michael Saboff.

If the immediate value type is encoded then we shouldn't reach this assert.
Check the immediate type to avoid assertion in alignemnt check.

  • assembler/ARMv7Assembler.h:

(JSC::ARMv7Assembler::add):

Location:
trunk/Source/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r164424 r164433  
     12014-02-20  Gabor Rapcsanyi  <rgabor@webkit.org>
     2
     3        ASSERTION FAILED: isUInt16() on ARMv7 after r113253.
     4        https://bugs.webkit.org/show_bug.cgi?id=129101
     5
     6        Reviewed by Michael Saboff.
     7
     8        If the immediate value type is encoded then we shouldn't reach this assert.
     9        Check the immediate type to avoid assertion in alignemnt check.
     10
     11        * assembler/ARMv7Assembler.h:
     12        (JSC::ARMv7Assembler::add):
     13
    1142014-02-20  Csaba Osztrogonác  <ossy@webkit.org>
    215
  • trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h

    r163027 r164433  
    858858        ASSERT(imm.isValid());
    859859
    860         if (rn == ARMRegisters::sp) {
     860        if (rn == ARMRegisters::sp && imm.isUInt16()) {
    861861            ASSERT(!(imm.getUInt16() & 3));
    862862            if (!(rd & 8) && imm.isUInt10()) {
Note: See TracChangeset for help on using the changeset viewer.