[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kdelibs/KDE/4.8] kjs: KJS: fix binary operator use instead of logical one
From:       Maksim Orlovich <mo85 () cornell ! edu>
Date:       2012-05-15 22:53:16
Message-ID: CAOHCnGfpga+ytHSFa9OqBmuRG-RXByVVZDnd=U8QHFpKOmXzzg () mail ! gmail ! com
[Download RAW message or body]

On 5/15/12, Rolf Eike Beer <kde@opensource.sf-tec.de> wrote:
> Git commit 2efcba3c713546c6dd3859b527611a52db2f5538 by Rolf Eike Beer.
> Committed on 15/05/2012 at 20:19.
> Pushed by dakon into branch 'KDE/4.8'.

Unless you have benchmarks showing this is not a performance regression,
please revert.


>
> KJS: fix binary operator use instead of logical one
>
> M  +1    -1    kjs/collector.cpp
>
> http://commits.kde.org/kdelibs/2efcba3c713546c6dd3859b527611a52db2f5538
>
> diff --git a/kjs/collector.cpp b/kjs/collector.cpp
> index 7a7190c..70e4757 100644
> --- a/kjs/collector.cpp
> +++ b/kjs/collector.cpp
> @@ -467,7 +467,7 @@ void Collector::markStackObjectsConservatively(void
> *start, void *end)
>        uintptr_t offset = reinterpret_cast<uintptr_t>(x) &
> BLOCK_OFFSET_MASK;
>        CollectorBlock* blockAddr = reinterpret_cast<CollectorBlock*>(x -
> offset);
>        for (size_t block = 0; block < usedBlocks; block++) {
> -        if ((blocks[block] == blockAddr) & (offset <= lastCellOffset)) {
> +        if ((blocks[block] == blockAddr) && (offset <= lastCellOffset)) {
>            if (((CollectorCell *)x)->u.freeCell.zeroIfFree != 0) {
>              JSCell *imp = reinterpret_cast<JSCell *>(x);
>              if (!imp->marked())
>
[prev in list] [next in list] [prev in thread] [next in thread]