Changeset 104330 in webkit


Ignore:
Timestamp:
Jan 6, 2012 1:19:54 PM (12 years ago)
Author:
oliver@apple.com
Message:

GetByteArrayLength is incorrect
https://bugs.webkit.org/show_bug.cgi?id=75735

Reviewed by Filip Pizlo.

Load the byte array length from the correct location.
This stops an existing test from hanging.

  • dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

  • dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

Location:
trunk/Source/JavaScriptCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r104326 r104330  
     12012-01-06  Oliver Hunt  <oliver@apple.com>
     2
     3        GetByteArrayLength is incorrect
     4        https://bugs.webkit.org/show_bug.cgi?id=75735
     5
     6        Reviewed by Filip Pizlo.
     7
     8        Load the byte array length from the correct location.
     9        This stops an existing test from hanging.
     10
     11        * dfg/DFGSpeculativeJIT32_64.cpp:
     12        (JSC::DFG::SpeculativeJIT::compile):
     13        * dfg/DFGSpeculativeJIT64.cpp:
     14        (JSC::DFG::SpeculativeJIT::compile):
     15
    1162012-01-06  Filip Pizlo  <fpizlo@apple.com>
    217
  • trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp

    r103792 r104330  
    32043204       
    32053205        m_jit.loadPtr(MacroAssembler::Address(baseGPR, JSByteArray::offsetOfStorage()), resultGPR);
    3206         m_jit.load32(MacroAssembler::Address(baseGPR, ByteArray::offsetOfSize()), resultGPR);
     3206        m_jit.load32(MacroAssembler::Address(resultGPR, ByteArray::offsetOfSize()), resultGPR);
    32073207       
    32083208        integerResult(resultGPR, m_compileIndex);
  • trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp

    r103674 r104330  
    31993199       
    32003200        m_jit.loadPtr(MacroAssembler::Address(baseGPR, JSByteArray::offsetOfStorage()), resultGPR);
    3201         m_jit.load32(MacroAssembler::Address(baseGPR, ByteArray::offsetOfSize()), resultGPR);
     3201        m_jit.load32(MacroAssembler::Address(resultGPR, ByteArray::offsetOfSize()), resultGPR);
    32023202
    32033203        integerResult(resultGPR, m_compileIndex);
Note: See TracChangeset for help on using the changeset viewer.