Optimize generation of static ctors w/o var declarations

nikhilk · Aug 27, 2012 · 4cd0a4b · 4cd0a4b
1 parent 53f4374
commit 4cd0a4b
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 20 deletions.
diff --git a/src/Core/Compiler/Generator/TypeGenerator.cs b/src/Core/Compiler/Generator/TypeGenerator.cs
@@ -321,15 +321,22 @@ internal static class TypeGenerator {
             if (classSymbol.StaticConstructor != null) {
                 ScriptTextWriter writer = generator.Writer;
 
-                writer.Write("(function");
+                SymbolImplementation implementation = classSymbol.StaticConstructor.Implementation;
-                writer.WriteTrimmed(" () ");
+                bool requiresFunctionScope = implementation.DeclaresVariables;
-                writer.Write("{");
+
-                writer.WriteNewLine();
+                if (requiresFunctionScope) {
-                writer.Indent++;
+                    writer.Write("(function");
+                    writer.WriteTrimmed(" () ");
+                    writer.Write("{");
+                    writer.WriteNewLine();
+                    writer.Indent++;
+                }
                 CodeGenerator.GenerateScript(generator, classSymbol.StaticConstructor);
-                writer.Indent--;
+                if (requiresFunctionScope) {
-                writer.Write("})();");
+                    writer.Indent--;
-                writer.WriteSignificantNewLine();
+                    writer.Write("})();");
+                    writer.WriteSignificantNewLine();
+                }
             }
         }
 

diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementation.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementation.cs
@@ -21,6 +21,17 @@ internal sealed class SymbolImplementation {
             _statements = statements;
         }
 
+        public bool DeclaresVariables {
+            get {
+                foreach (Statement statement in _statements) {
+                    if (statement is VariableDeclarationStatement) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
         public SymbolScope Scope {
             get {
                 return _scope;

diff --git a/tests/TestCases/Member/Constructors/Baseline.txt b/tests/TestCases/Member/Constructors/Baseline.txt
@@ -38,10 +38,6 @@ test.MyClass2.registerClass('test.MyClass2');
 test.MyClass3.registerClass('test.MyClass3');
 test.MyClass4.registerClass('test.MyClass4', test.MyClass3);
 test.MyClass2.x = null;
-(function () {
+test.MyClass2.x = 'Hello';
-    test.MyClass2.x = 'Hello';
-})();
 test.MyClass3.c = null;
-(function () {
+test.MyClass3.c = new test.MyClass();
-    test.MyClass3.c = new test.MyClass();
-})();
diff --git a/tests/TestCases/Member/Methods/Baseline.txt b/tests/TestCases/Member/Methods/Baseline.txt
@@ -87,9 +87,7 @@ $.fn.extend = function(x, i) {
 
 test.Test.registerClass('test.Test');
 test.X.registerClass('test.X');
-(function () {
+alert('Startup code in FooBar');
-    alert('Startup code in FooBar');
-})();
 (function () {
     var timeStamp = new Date().getMilliseconds();
     alert('Startup code in FooBar: ' + timeStamp);

diff --git a/tests/TestCases/Member/StaticConstructors/Baseline.txt b/tests/TestCases/Member/StaticConstructors/Baseline.txt
@@ -14,6 +14,27 @@ test.MyClass = function(d) {
 }
 
 
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClassEmpty
+
+test.MyClassEmpty = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClassSimple
+
+test.MyClassSimple = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClassSimpleMulti
+
+test.MyClassSimpleMulti = function() {
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // test.MyBehavior
 
@@ -24,11 +45,15 @@ test.MyBehavior = function(element) {
 
 test.Behavior.registerClass('test.Behavior');
 test.MyClass.registerClass('test.MyClass');
+test.MyClassEmpty.registerClass('test.MyClassEmpty');
+test.MyClassSimple.registerClass('test.MyClassSimple');
+test.MyClassSimpleMulti.registerClass('test.MyClassSimpleMulti');
 test.MyBehavior.registerClass('test.MyBehavior', test.Behavior);
 test.MyClass.instance = null;
-(function () {
+test.MyClass.instance = new test.MyClass(Date.get_now());
-    test.MyClass.instance = new test.MyClass(Date.get_now());
+alert('simple static ctor');
-})();
+alert('simple static ctor with multiple statements');
+document.getElementById('foo').innerHTML = '...';
 (function () {
     var e = document.body;
     var b = true;

diff --git a/tests/TestCases/Member/StaticConstructors/Code.cs b/tests/TestCases/Member/StaticConstructors/Code.cs
@@ -25,6 +25,27 @@ public sealed class MyClass {
         }
     }
 
+    public sealed class MyClassEmpty {
+
+        static MyClassEmpty() {
+        }
+    }
+
+    public sealed class MyClassSimple {
+
+        static MyClassSimple() {
+            Window.Alert("simple static ctor");
+        }
+    }
+
+    public sealed class MyClassSimpleMulti {
+
+        static MyClassSimpleMulti() {
+            Window.Alert("simple static ctor with multiple statements");
+            Document.GetElementById("foo").InnerHTML = "...";
+        }
+    }
+
     public sealed class MyBehavior : Behavior {
 
         static MyBehavior() {