Rewrite temporary variable elimination

js/js.translator/testData/js-optimizer/temporary-variable/ifBranch.optimized.js

@@ -0,0 +1,17 @@
+function test1(n) {
+    var $tmp;
+    if (n > 0) {
+        $tmp = 23;
+    }
+    return typeof $tmp;
+}
+
+function box() {
+    var result = test1(5);
+    if (result != "number") return "fail1: " + result;
+
+    result = test1(-5);
+    if (result != "undefined") return "fail2: " + result;
+
+    return "OK";
+}

js/js.translator/testData/js-optimizer/temporary-variable/ifBranch.original.js

@@ -0,0 +1,17 @@
+function test1(n) {
+    var $tmp;
+    if (n > 0) {
+        $tmp = 23;
+    }
+    return typeof $tmp;
+}
+
+function box() {
+    var result = test1(5);
+    if (result != "number") return "fail1: " + result;
+
+    result = test1(-5);
+    if (result != "undefined") return "fail2: " + result;
+
+    return "OK";
+}

js/js.translator/testData/js-optimizer/temporary-variable/methodCall.optimized.js

@@ -0,0 +1,77 @@
+var log = "";
+
+
+function init() {
+    log = "";
+}
+
+function foo(n) {
+    log += "{" + n + "}";
+    return n;
+}
+
+function test1() {
+    init();
+
+    return foo(foo(1) + foo(2));
+}
+
+function test2() {
+    init();
+
+    var $tmp2 = foo(2);
+    var $tmp1 = foo(1);
+
+    return foo($tmp1 + $tmp2);
+}
+
+function test3() {
+    init();
+
+    return foo(foo(1) + foo(2) + foo(foo(3)));
+}
+
+function test4() {
+    init();
+
+    var $tmp1 = foo(1);
+    var $tmp2 = foo(2);
+    var $tmp3 = foo(3);
+
+    return foo(foo($tmp1) + $tmp2 + $tmp3);
+}
+
+function test5() {
+    init();
+
+    var $tmp1 = foo(1);
+    var $tmp2 = foo(2);
+    var $tmp3 = foo(3);
+    foo(4);
+
+    return $tmp1 + $tmp2 + $tmp3;
+}
+
+function box() {
+    var result = test1();
+    if (result != 3) return "fail1a: " + result;
+    if (log != "{1}{2}{3}") return "fail1b: " + log;
+
+    result = test2();
+    if (result != 3) return "fail2a: " + result;
+    if (log != "{2}{1}{3}") return "fail2b: " + log;
+
+    result = test3();
+    if (result != 6) return "fail3a: " + result;
+    if (log != "{1}{2}{3}{3}{6}") return "fail3b: " + log;
+
+    result = test4();
+    if (result != 6) return "fail4a: " + result;
+    if (log != "{1}{2}{3}{1}{6}") return "fail4b: " + log;
+
+    result = test5();
+    if (result != 6) return "fail5a: " + result;
+    if (log != "{1}{2}{3}{4}") return "fail5b: " + log;
+
+    return "OK";
+}

js/js.translator/testData/js-optimizer/temporary-variable/methodCall.original.js

@@ -0,0 +1,84 @@
+var log = "";
+
+
+function init() {
+    log = "";
+}
+
+function foo(n) {
+    log += "{" + n + "}";
+    return n;
+}
+
+function test1() {
+    init();
+
+    var $tmp1 = foo(1);
+    var $tmp2 = foo(2);
+
+    return foo($tmp1 + $tmp2);
+}
+
+function test2() {
+    init();
+
+    var $tmp2 = foo(2);
+    var $tmp1 = foo(1);
+
+    return foo($tmp1 + $tmp2);
+}
+
+function test3() {
+    init();
+
+    var $tmp1 = foo(1);
+    var $tmp2 = foo(2);
+    var $tmp3 = foo(3);
+
+    return foo($tmp1 + $tmp2 + foo($tmp3));
+}
+
+function test4() {
+    init();
+
+    var $tmp1 = foo(1);
+    var $tmp2 = foo(2);
+    var $tmp3 = foo(3);
+
+    return foo(foo($tmp1) + $tmp2 + $tmp3);
+}
+
+function test5() {
+    init();
+
+    var $tmp1 = foo(1);
+    var $tmp2 = foo(2);
+    var $tmp3 = foo(3);
+    foo(4);
+
+    return $tmp1 + $tmp2 + $tmp3;
+}
+
+function box() {
+    var result = test1();
+    if (result != 3) return "fail1a: " + result;
+    if (log != "{1}{2}{3}") return "fail1b: " + log;
+
+    result = test2();
+    if (result != 3) return "fail2a: " + result;
+    if (log != "{2}{1}{3}") return "fail2b: " + log;
+
+    result = test3();
+    if (result != 6) return "fail3a: " + result;
+    if (log != "{1}{2}{3}{3}{6}") return "fail3b: " + log;
+
+    result = test4();
+    if (result != 6) return "fail4a: " + result;
+    if (log != "{1}{2}{3}{1}{6}") return "fail4b: " + log;
+
+    result = test5();
+    if (result != 6) return "fail5a: " + result;
+    if (log != "{1}{2}{3}{4}") return "fail5b: " + log;
+
+    return "OK";
+}

js/js.translator/testData/js-optimizer/temporary-variable/nonSideEffect.optimized.js

@@ -0,0 +1,10 @@
+function foo(x) {
+    return x;
+}
+
+function box() {
+    var result = foo(2) + 1;
+    if (result != 3) return "fail: " + result;
+    
+    return "OK";
+}

js/js.translator/testData/js-optimizer/temporary-variable/nonSideEffect.original.js

@@ -0,0 +1,13 @@
+function foo(x) {
+    return x;
+}
+
+function box() {
+    var $tmp1 = 1;
+    var $tmp2 = foo(2);
+
+    var result = $tmp2 + $tmp1;
+    if (result != 3) return "fail: " + result;
+    
+    return "OK";
+}

js/js.translator/testData/js-optimizer/temporary-variable/tryCatch.optimized.js

@@ -0,0 +1,24 @@
+function foo() {
+    throw "foo";
+}
+
+function bar() {
+    var $tmp = foo();
+    try {
+        return "result: " + $tmp;
+    } catch (e) {
+        return "error";
+    }
+}
+
+function box() {
+    try {
+        bar()
+    } catch (e) {
+        if (e == "foo") {
+            return "OK"
+        }
+        return e;
+    }
+    return "Exception expected";
+}

js/js.translator/testData/js-optimizer/temporary-variable/tryCatch.original.js

@@ -0,0 +1,24 @@
+function foo() {
+    throw "foo";
+}
+
+function bar() {
+    var $tmp = foo();
+    try {
+        return "result: " + $tmp;
+    } catch (e) {
+        return "error";
+    }
+}
+
+function box() {
+    try {
+        bar()
+    } catch (e) {
+        if (e == "foo") {
+            return "OK"
+        }
+        return e;
+    }
+    return "Exception expected";
+}