Changeset 27702 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 11, 2007, 8:27:33 PM (18 years ago)

Author:

[email protected]

Message:

Reviewed by Sam Weinig.

Fixed ​http://bugs.webkit.org/show_bug.cgi?id=15902
15% of string-validate-input.js is spent compiling the same regular expression

Store a compiled representation of the regular expression in the AST.

Only a .2% SunSpider speedup overall, but a 10.6% speedup on
string-validate-input.js.

• kjs/nodes.cpp: (KJS::RegExpNode::evaluate):
• kjs/nodes.h: (KJS::RegExpNode::):
• kjs/nodes2string.cpp: (KJS::RegExpNode::streamTo):
• kjs/regexp.cpp: (KJS::RegExp::flags):
• kjs/regexp.h: (KJS::RegExp::pattern):
• kjs/regexp_object.cpp: (KJS::RegExpObjectImp::construct): (KJS::RegExpObjectImp::createRegExpImp):
• kjs/regexp_object.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (1 diff)
• kjs/nodes.h (modified) (2 diffs)
• kjs/nodes2string.cpp (modified) (1 diff)
• kjs/regexp.cpp (modified) (5 diffs)
• kjs/regexp.h (modified) (2 diffs)
• kjs/regexp_object.cpp (modified) (1 diff)
• kjs/regexp_object.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-11  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Sam Weinig.
+        
+        Fixed http://bugs.webkit.org/show_bug.cgi?id=15902
+        15% of string-validate-input.js is spent compiling the same regular expression
+        
+        Store a compiled representation of the regular expression in the AST.
+        
+        Only a .2% SunSpider speedup overall, but a 10.6% speedup on 
+        string-validate-input.js.
+
+        * kjs/nodes.cpp:
+        (KJS::RegExpNode::evaluate):
+        * kjs/nodes.h:
+        (KJS::RegExpNode::):
+        * kjs/nodes2string.cpp:
+        (KJS::RegExpNode::streamTo):
+        * kjs/regexp.cpp:
+        (KJS::RegExp::flags):
+        * kjs/regexp.h:
+        (KJS::RegExp::pattern):
+        * kjs/regexp_object.cpp:
+        (KJS::RegExpObjectImp::construct):
+        (KJS::RegExpObjectImp::createRegExpImp):
+        * kjs/regexp_object.h:
+
 2007-11-11  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -454 +454 @@
 JSValue* RegExpNode::evaluate(ExecState* exec)
 {
-  List list;
-  list.append(jsOwnedString(m_pattern));
-  list.append(jsOwnedString(m_flags));
-
-  JSObject* reg = exec->lexicalInterpreter()->builtinRegExp();
-  return reg->construct(exec, list);
+    return exec->lexicalInterpreter()->builtinRegExp()->createRegExpImp(exec, m_regExp);
 }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -29 +29 @@
 #include "Parser.h"
 #include "internal.h"
+#include "RegExp.h"
 #include "SymbolTable.h"
 #include <wtf/ListRefPtr.h>
@@ -271 +272 @@
   public:
     RegExpNode(const UString& pattern, const UString& flags) KJS_FAST_CALL 
-      : m_pattern(pattern), m_flags(flags) { }
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+        : m_regExp(new RegExp(pattern, flags))
+    {
+    }
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecPrimary; }
   private:
-    UString m_pattern;
-    UString m_flags;
+    RefPtr<RegExp> m_regExp;
   };
 

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -291 +291 @@
 void RegExpNode::streamTo(SourceStream& s) const
 { 
-    s << '/' <<  m_pattern << '/' << m_flags; 
+    s << '/' <<  m_regExp->pattern() << '/' << m_regExp->flags();
 }
 

trunk/JavaScriptCore/kjs/regexp.cpp

@@ -2 +2 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (C) 1999-2001,2004 Harri Porten ([email protected])
+ *  Copyright (C) 1999-2001, 2004 Harri Porten ([email protected])
+ *  Copyright (c) 2007, Apple Inc.
  *
  *  This library is free software; you can redistribute it and/or
@@ -34 +35 @@
   : m_refCount(0)
   , m_pattern(pattern)
-  , m_flags(0)
+  , m_flagBits(0)
   , m_constructionError(0)
   , m_numSubpatterns(0)
 {
-    m_regExp = jsRegExpCompile(reinterpret_cast<const ::UChar*>(m_pattern.data()), m_pattern.size(),
+    m_regExp = jsRegExpCompile(reinterpret_cast<const ::UChar*>(pattern.data()), pattern.size(),
         JSRegExpDoNotIgnoreCase, JSRegExpSingleLine, &m_numSubpatterns, &m_constructionError);
 }
@@ -45 +46 @@
   : m_refCount(0)
   , m_pattern(pattern)
-  , m_flags(0)
+  , m_flags(flags)
+  , m_flagBits(0)
   , m_constructionError(0)
   , m_numSubpatterns(0)
@@ -52 +54 @@
     // String::match and RegExpImp::match.
     if (flags.find('g') != -1)
-        m_flags |= Global;
+        m_flagBits |= Global;
 
     // FIXME: Eliminate duplication by adding a way ask a JSRegExp what its flags are?
     JSRegExpIgnoreCaseOption ignoreCaseOption = JSRegExpDoNotIgnoreCase;
     if (flags.find('i') != -1) {
-        m_flags |= IgnoreCase;
+        m_flagBits |= IgnoreCase;
         ignoreCaseOption = JSRegExpIgnoreCase;
     }
@@ -63 +65 @@
     JSRegExpMultilineOption multilineOption = JSRegExpSingleLine;
     if (flags.find('m') != -1) {
-        m_flags |= Multiline;
+        m_flagBits |= Multiline;
         multilineOption = JSRegExpMultiline;
     }
     
-    m_regExp = jsRegExpCompile(reinterpret_cast<const ::UChar*>(m_pattern.data()), m_pattern.size(),
+    m_regExp = jsRegExpCompile(reinterpret_cast<const ::UChar*>(pattern.data()), pattern.size(),
         ignoreCaseOption, multilineOption, &m_numSubpatterns, &m_constructionError);
 }

trunk/JavaScriptCore/kjs/regexp.h

@@ -47 +47 @@
     int refCount() { return m_refCount; }
 
-    bool global() const { return m_flags & Global; }
-    bool ignoreCase() const { return m_flags & IgnoreCase; }
-    bool multiline() const { return m_flags & Multiline; }
+    bool global() const { return m_flagBits & Global; }
+    bool ignoreCase() const { return m_flagBits & IgnoreCase; }
+    bool multiline() const { return m_flagBits & Multiline; }
+
     const UString& pattern() const { return m_pattern; }
+    const UString& flags() const { return m_flags; }
 
     bool isValid() const { return !m_constructionError; }
@@ -64 +66 @@
     
     // Data supplied by caller.
-    UString m_pattern;
-    int m_flags;
+    UString m_pattern; // FIXME: Just decompile m_regExp instead of storing this.
+    UString m_flags; // FIXME: Just decompile m_regExp instead of storing this.
+    int m_flagBits;
 
     // Data supplied by PCRE.

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -449 +449 @@
   UString pattern = arg0->isUndefined() ? UString("") : arg0->toString(exec);
   UString flags = arg1->isUndefined() ? UString("") : arg1->toString(exec);
-  RefPtr<RegExp> regExp = new RegExp(pattern, flags);
-
-  return regExp->isValid()
-    ? new RegExpImp(static_cast<RegExpPrototype*>(exec->lexicalInterpreter()->builtinRegExpPrototype()), regExp.release())
-    : throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(regExp->errorMessage()));
+  
+  return createRegExpImp(exec, new RegExp(pattern, flags));
+}
+
+JSObject* RegExpObjectImp::createRegExpImp(ExecState* exec, PassRefPtr<RegExp> regExp)
+{
+    return regExp->isValid()
+        ? new RegExpImp(static_cast<RegExpPrototype*>(exec->lexicalInterpreter()->builtinRegExpPrototype()), regExp)
+        : throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(regExp->errorMessage()));
 }
 

trunk/JavaScriptCore/kjs/regexp_object.h

@@ -86 +86 @@
         virtual bool implementsConstruct() const;
         virtual JSObject* construct(ExecState*, const List&);
+        JSObject* createRegExpImp(ExecState*, PassRefPtr<RegExp>);
         virtual JSValue* callAsFunction(ExecState*, JSObject*, const List&);
         virtual void put(ExecState*, const Identifier&, JSValue*, int attributes = None);