Changeset 62708 in webkit


Ignore:
Timestamp:
Jul 7, 2010 3:20:40 PM (14 years ago)
Author:
dumi@chromium.org
Message:

JavaScriptCore: Revert r62689.
https://bugs.webkit.org/show_bug.cgi?id=41804

Reviewed by Adam Roben.

  • runtime/Collector.cpp:

(JSC::Heap::freeBlocks):

WebKitLibraries: Disable MSVC warning 4288.
https://bugs.webkit.org/show_bug.cgi?id=41804

Reviewed by Adam Roben.

MSVC has a non-standard extension that allows variables declared
in for-loops to remain visible in the same scope even after
exiting the for-loop
(http://msdn.microsoft.com/en-us/library/bk5hc10s.aspx). The /Ze
option (turned on by default) enables all MSVC extensions, and
/Zc:forScope- tells the compiler to issue a C4288 warning when the
same variable is declared in the for-loop and re-declared later in
the same scope.

There seems to be a bug in VS2005 that erroneously enables
/Zc:forScope- even when that option is not specified
(http://connect.microsoft.com/VisualStudio/feedback/details/338010/bogus-compiler-warning-c4288). Looks
like our build got hit by that bug, so we need to disable warning
4288 to fix it.

  • win/tools/vsprops/common.vsprops:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r62697 r62708  
     12010-07-07  Dumitru Daniliuc  <dumi@chromium.org>
     2
     3        Reviewed by Adam Roben.
     4
     5        Revert r62689.
     6        https://bugs.webkit.org/show_bug.cgi?id=41804
     7
     8        * runtime/Collector.cpp:
     9        (JSC::Heap::freeBlocks):
     10
    1112010-07-07  Adam Barth  <abarth@webkit.org>
    212
  • trunk/JavaScriptCore/runtime/Collector.cpp

    r62689 r62708  
    316316    m_heap.nextCell = 0;
    317317    m_heap.nextBlock = 0;
    318 
    319     {
    320         DeadObjectIterator it(m_heap, m_heap.nextBlock, m_heap.nextCell);
    321         DeadObjectIterator end(m_heap, m_heap.usedBlocks);
    322         for ( ; it != end; ++it)
    323             (*it)->~JSCell();
    324     }
     318    DeadObjectIterator it(m_heap, m_heap.nextBlock, m_heap.nextCell);
     319    DeadObjectIterator end(m_heap, m_heap.usedBlocks);
     320    for ( ; it != end; ++it)
     321        (*it)->~JSCell();
    325322
    326323    ASSERT(!protectedObjectCount());
  • trunk/WebKitLibraries/ChangeLog

    r62361 r62708  
     12010-07-07  Dumitru Daniliuc  <dumi@chromium.org>
     2
     3        Reviewed by Adam Roben.
     4
     5        Disable MSVC warning 4288.
     6        https://bugs.webkit.org/show_bug.cgi?id=41804
     7
     8        MSVC has a non-standard extension that allows variables declared
     9        in for-loops to remain visible in the same scope even after
     10        exiting the for-loop
     11        (http://msdn.microsoft.com/en-us/library/bk5hc10s.aspx). The /Ze
     12        option (turned on by default) enables all MSVC extensions, and
     13        /Zc:forScope- tells the compiler to issue a C4288 warning when the
     14        same variable is declared in the for-loop and re-declared later in
     15        the same scope.
     16
     17        There seems to be a bug in VS2005 that erroneously enables
     18        /Zc:forScope- even when that option is not specified
     19        (http://connect.microsoft.com/VisualStudio/feedback/details/338010/bogus-compiler-warning-c4288). Looks
     20        like our build got hit by that bug, so we need to disable warning
     21        4288 to fix it.
     22
     23        * win/tools/vsprops/common.vsprops:
     24
    1252010-07-01  Simon Fraser  <simon.fraser@apple.com>
    226
  • trunk/WebKitLibraries/win/tools/vsprops/common.vsprops

    r54847 r62708  
    1616                WarnAsError="true"
    1717                DebugInformationFormat="3"
    18                 DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
     18                DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4288;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
    1919        />
    2020        <Tool
Note: See TracChangeset for help on using the changeset viewer.