Show
Ignore:
Timestamp:
08/01/08 14:47:24 (5 months ago)
Author:
sroret
Message:

merge with webkit revision 35510

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/kjs/nodes.cpp

    r419 r427  
    3737#include "lexer.h" 
    3838#include "operations.h" 
     39#include "SamplingTool.h" 
    3940#include <math.h> 
    4041#include <wtf/Assertions.h> 
    …… 
    253254    if (dst == ignoredResult()) 
    254255        return 0; 
    255     // FIXME: should we try to atomize constant strings? 
    256     return generator.emitLoad(generator.finalDestination(dst), jsOwnedString(generator.globalExec(), m_value)); 
     256 
     257    // We atomize constant strings, in case they're later used in property lookup. 
     258    return generator.emitLoad(generator.finalDestination(dst), jsOwnedString(generator.globalExec(), Identifier(generator.globalExec(), m_value).ustring())); 
    257259} 
    258260