diff --git a/hphp/test/slow/add/1420.php b/hphp/test/slow/add/1420.php
index 3b7a05386..2da0732d0 100644
--- a/hphp/test/slow/add/1420.php
+++ b/hphp/test/slow/add/1420.php
@@ -1,3 +1,6 @@
 <?php
 
- printf("%s\n", 30 + 30);printf("%s\n", "30" + 30);printf("%s\n", 30 + "30");printf("%s\n", "30" + "30");
\ No newline at end of file
+printf("%s\n", 30 + 30);
+printf("%s\n", "30" + 30);
+printf("%s\n", 30 + "30");
+printf("%s\n", "30" + "30");
diff --git a/hphp/test/slow/add/1421.php b/hphp/test/slow/add/1421.php
index 58e607c21..8d3784d41 100644
--- a/hphp/test/slow/add/1421.php
+++ b/hphp/test/slow/add/1421.php
@@ -1,3 +1,22 @@
 <?php
 
- $a = "123.456" + 123;var_dump($a);$a = "123.456" + 456.123;var_dump($a);$a = "123.456" + "123";var_dump($a);$a = "123.456" + "456.123";var_dump($a);$a = "123.456";$a += 123;var_dump($a);$a = "123.456";$a += 456.123;var_dump($a);$a = "123.456";$a += "123";var_dump($a);$a = "123.456";$a += "456.123";var_dump($a);
\ No newline at end of file
+$a = "123.456" + 123;
+var_dump($a);
+$a = "123.456" + 456.123;
+var_dump($a);
+$a = "123.456" + "123";
+var_dump($a);
+$a = "123.456" + "456.123";
+var_dump($a);
+$a = "123.456";
+$a += 123;
+var_dump($a);
+$a = "123.456";
+$a += 456.123;
+var_dump($a);
+$a = "123.456";
+$a += "123";
+var_dump($a);
+$a = "123.456";
+$a += "456.123";
+var_dump($a);
diff --git a/hphp/test/slow/add/1422.php b/hphp/test/slow/add/1422.php
index b5eb5429c..4f285d75e 100644
--- a/hphp/test/slow/add/1422.php
+++ b/hphp/test/slow/add/1422.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(1.7976931348623157e+308 + 1.7976931348623157e+308);
\ No newline at end of file
+var_dump(1.7976931348623157e+308 + 1.7976931348623157e+308);
diff --git a/hphp/test/slow/apc/1812.php b/hphp/test/slow/apc/1812.php
index 0c61d236e..fb1920a58 100644
--- a/hphp/test/slow/apc/1812.php
+++ b/hphp/test/slow/apc/1812.php
@@ -1,6 +1,6 @@
 <?php
 
- $a = array();
+$a = array();
 $a[] =& $a;
 print_r($a);
 apc_store('table', $a);
diff --git a/hphp/test/slow/apc/1814.php b/hphp/test/slow/apc/1814.php
index 6ea7292ef..3416c0e97 100644
--- a/hphp/test/slow/apc/1814.php
+++ b/hphp/test/slow/apc/1814.php
@@ -1,7 +1,11 @@
 <?php
 
-
-class A { var $v = 10; function f() { $this->v = 100; } }
+class A {
+ var $v = 10;
+ function f() {
+ $this->v = 100;
+ }
+ }
 $a = array(array(1, 2, 3), new A());
 apc_store('0', $a);
 $b = apc_fetch(0);
diff --git a/hphp/test/slow/apc/1815.php b/hphp/test/slow/apc/1815.php
index 2123f4bd6..e3e859304 100644
--- a/hphp/test/slow/apc/1815.php
+++ b/hphp/test/slow/apc/1815.php
@@ -1,7 +1,10 @@
 <?php
 
-
-class A { private $b = 10; }
-class B extends A { private $b = 100; }
+class A {
+ private $b = 10;
+ }
+class B extends A {
+ private $b = 100;
+ }
 apc_store('key', new B());
 var_dump(apc_fetch('key'));
diff --git a/hphp/test/slow/apc/1816.php b/hphp/test/slow/apc/1816.php
index 181c35495..8de90ddc8 100644
--- a/hphp/test/slow/apc/1816.php
+++ b/hphp/test/slow/apc/1816.php
@@ -1,7 +1,10 @@
 <?php
 
-
-class A { var $a, $b; }
-$a = new A(); $a->a = 5; $a->b = &$a->a;
+class A {
+ var $a, $b;
+ }
+$a = new A();
+ $a->a = 5;
+ $a->b = &$a->a;
 apc_store('key', $a);
 var_dump(apc_fetch('key'));
diff --git a/hphp/test/slow/apc/1817.php b/hphp/test/slow/apc/1817.php
index ab432f52e..585efc794 100644
--- a/hphp/test/slow/apc/1817.php
+++ b/hphp/test/slow/apc/1817.php
@@ -1,4 +1,9 @@
 <?php
 
-
-class a {  protected $foo = 10;}$x = new a;apc_store('x', array($x));$x = apc_fetch('x');var_dump($x[0]);
\ No newline at end of file
+class a {
+  protected $foo = 10;
+}
+$x = new a;
+apc_store('x', array($x));
+$x = apc_fetch('x');
+var_dump($x[0]);
diff --git a/hphp/test/slow/apc/1818.php b/hphp/test/slow/apc/1818.php
index 110286354..48aef236b 100644
--- a/hphp/test/slow/apc/1818.php
+++ b/hphp/test/slow/apc/1818.php
@@ -1,7 +1,8 @@
 <?php
 
-
-class A { var $i = 10; }
+class A {
+ var $i = 10;
+ }
 $a = array(new A);
 apc_store('key1', $a);
 $b = apc_fetch('key1');
diff --git a/hphp/test/slow/apc/1819.php b/hphp/test/slow/apc/1819.php
index fa79703be..d4c2f54da 100644
--- a/hphp/test/slow/apc/1819.php
+++ b/hphp/test/slow/apc/1819.php
@@ -1,10 +1,13 @@
 <?php
 
-
 class A implements Serializable {
   var $a = 123;
-  function serialize() { return serialize($this->a); }
-  function unserialize($s) { $this->a = unserialize($s); }
+  function serialize() {
+ return serialize($this->a);
+ }
+  function unserialize($s) {
+ $this->a = unserialize($s);
+ }
 }
 $o = new A;
 apc_store('key', $o);
diff --git a/hphp/test/slow/apc/1820.php b/hphp/test/slow/apc/1820.php
index 8c76fffc1..7efdcba6f 100644
--- a/hphp/test/slow/apc/1820.php
+++ b/hphp/test/slow/apc/1820.php
@@ -1,3 +1,77 @@
 <?php
 
- class A {  public function __construct($i, $j, $k) {    $this->a = $i * $i;    $this->b = $j * $j;    $this->c = $k * $k;  }  public $a;  protected $b;  private $c;  public $aa = 'aa';  protected $bb = false;  private $cc = 1.22;}class B extends A {  public function __construct($i, $j, $k) {    $this->a = $i + $i;    $this->b = $j + $j;    $this->c = $k + $k;  }  public $a;  protected $b;  private $c;  public $aa = 'aaa';  protected $bb = 4;  private $cc = 1.222;}class C extends B {  public function __construct($i, $j, $k) {    $this->a = $i + $i + $i;    $this->b = $j + $j + $j;    $this->c = $k + $k + $k;  }  public $a;  protected $b;  private $c;  public $aa = 'aaaa';  protected $bb = 40;  private $cc = 1.333;}class D extends C {  public function __construct($i, $j, $k) {    $this->a = $i + $i + $i;    $this->b = $j + $j + $j;    $this->c = $k + $k + $k;  }  public $a;  public $b;  private $c;  public $aa = 'aaaaa';  public $bb = 400;  private $cc = 1.3333;}function foo() {  $obj = new A(111, 222, 333);  apc_store('foobar', $obj);  $obj = apc_fetch('foobar');  $obj = apc_fetch('foobar');  var_dump($obj);  $obj = new B(111, 222, 333);  apc_store('foobar', $obj);  $obj = apc_fetch('foobar');  $obj = apc_fetch('foobar');  var_dump($obj);  $obj = new C(111, 222, 333);  apc_store('foobar', $obj);  $obj = apc_fetch('foobar');  $obj = apc_fetch('foobar');  var_dump($obj);  $obj = new D(111, 222, 333);  apc_store('foobar', $obj);  $obj = apc_fetch('foobar');  $obj = apc_fetch('foobar');  var_dump($obj);}foo();
\ No newline at end of file
+class A {
+  public function __construct($i, $j, $k) {
+    $this->a = $i * $i;
+    $this->b = $j * $j;
+    $this->c = $k * $k;
+  }
+  public $a;
+  protected $b;
+  private $c;
+  public $aa = 'aa';
+  protected $bb = false;
+  private $cc = 1.22;
+}
+class B extends A {
+  public function __construct($i, $j, $k) {
+    $this->a = $i + $i;
+    $this->b = $j + $j;
+    $this->c = $k + $k;
+  }
+  public $a;
+  protected $b;
+  private $c;
+  public $aa = 'aaa';
+  protected $bb = 4;
+  private $cc = 1.222;
+}
+class C extends B {
+  public function __construct($i, $j, $k) {
+    $this->a = $i + $i + $i;
+    $this->b = $j + $j + $j;
+    $this->c = $k + $k + $k;
+  }
+  public $a;
+  protected $b;
+  private $c;
+  public $aa = 'aaaa';
+  protected $bb = 40;
+  private $cc = 1.333;
+}
+class D extends C {
+  public function __construct($i, $j, $k) {
+    $this->a = $i + $i + $i;
+    $this->b = $j + $j + $j;
+    $this->c = $k + $k + $k;
+  }
+  public $a;
+  public $b;
+  private $c;
+  public $aa = 'aaaaa';
+  public $bb = 400;
+  private $cc = 1.3333;
+}
+function foo() {
+  $obj = new A(111, 222, 333);
+  apc_store('foobar', $obj);
+  $obj = apc_fetch('foobar');
+  $obj = apc_fetch('foobar');
+  var_dump($obj);
+  $obj = new B(111, 222, 333);
+  apc_store('foobar', $obj);
+  $obj = apc_fetch('foobar');
+  $obj = apc_fetch('foobar');
+  var_dump($obj);
+  $obj = new C(111, 222, 333);
+  apc_store('foobar', $obj);
+  $obj = apc_fetch('foobar');
+  $obj = apc_fetch('foobar');
+  var_dump($obj);
+  $obj = new D(111, 222, 333);
+  apc_store('foobar', $obj);
+  $obj = apc_fetch('foobar');
+  $obj = apc_fetch('foobar');
+  var_dump($obj);
+}
+foo();
diff --git a/hphp/test/slow/apc/1821.php b/hphp/test/slow/apc/1821.php
index 8c76fffc1..7efdcba6f 100644
--- a/hphp/test/slow/apc/1821.php
+++ b/hphp/test/slow/apc/1821.php
@@ -1,3 +1,77 @@
 <?php
 
- class A {  public function __construct($i, $j, $k) {    $this->a = $i * $i;    $this->b = $j * $j;    $this->c = $k * $k;  }  public $a;  protected $b;  private $c;  public $aa = 'aa';  protected $bb = false;  private $cc = 1.22;}class B extends A {  public function __construct($i, $j, $k) {    $this->a = $i + $i;    $this->b = $j + $j;    $this->c = $k + $k;  }  public $a;  protected $b;  private $c;  public $aa = 'aaa';  protected $bb = 4;  private $cc = 1.222;}class C extends B {  public function __construct($i, $j, $k) {    $this->a = $i + $i + $i;    $this->b = $j + $j + $j;    $this->c = $k + $k + $k;  }  public $a;  protected $b;  private $c;  public $aa = 'aaaa';  protected $bb = 40;  private $cc = 1.333;}class D extends C {  public function __construct($i, $j, $k) {    $this->a = $i + $i + $i;    $this->b = $j + $j + $j;    $this->c = $k + $k + $k;  }  public $a;  public $b;  private $c;  public $aa = 'aaaaa';  public $bb = 400;  private $cc = 1.3333;}function foo() {  $obj = new A(111, 222, 333);  apc_store('foobar', $obj);  $obj = apc_fetch('foobar');  $obj = apc_fetch('foobar');  var_dump($obj);  $obj = new B(111, 222, 333);  apc_store('foobar', $obj);  $obj = apc_fetch('foobar');  $obj = apc_fetch('foobar');  var_dump($obj);  $obj = new C(111, 222, 333);  apc_store('foobar', $obj);  $obj = apc_fetch('foobar');  $obj = apc_fetch('foobar');  var_dump($obj);  $obj = new D(111, 222, 333);  apc_store('foobar', $obj);  $obj = apc_fetch('foobar');  $obj = apc_fetch('foobar');  var_dump($obj);}foo();
\ No newline at end of file
+class A {
+  public function __construct($i, $j, $k) {
+    $this->a = $i * $i;
+    $this->b = $j * $j;
+    $this->c = $k * $k;
+  }
+  public $a;
+  protected $b;
+  private $c;
+  public $aa = 'aa';
+  protected $bb = false;
+  private $cc = 1.22;
+}
+class B extends A {
+  public function __construct($i, $j, $k) {
+    $this->a = $i + $i;
+    $this->b = $j + $j;
+    $this->c = $k + $k;
+  }
+  public $a;
+  protected $b;
+  private $c;
+  public $aa = 'aaa';
+  protected $bb = 4;
+  private $cc = 1.222;
+}
+class C extends B {
+  public function __construct($i, $j, $k) {
+    $this->a = $i + $i + $i;
+    $this->b = $j + $j + $j;
+    $this->c = $k + $k + $k;
+  }
+  public $a;
+  protected $b;
+  private $c;
+  public $aa = 'aaaa';
+  protected $bb = 40;
+  private $cc = 1.333;
+}
+class D extends C {
+  public function __construct($i, $j, $k) {
+    $this->a = $i + $i + $i;
+    $this->b = $j + $j + $j;
+    $this->c = $k + $k + $k;
+  }
+  public $a;
+  public $b;
+  private $c;
+  public $aa = 'aaaaa';
+  public $bb = 400;
+  private $cc = 1.3333;
+}
+function foo() {
+  $obj = new A(111, 222, 333);
+  apc_store('foobar', $obj);
+  $obj = apc_fetch('foobar');
+  $obj = apc_fetch('foobar');
+  var_dump($obj);
+  $obj = new B(111, 222, 333);
+  apc_store('foobar', $obj);
+  $obj = apc_fetch('foobar');
+  $obj = apc_fetch('foobar');
+  var_dump($obj);
+  $obj = new C(111, 222, 333);
+  apc_store('foobar', $obj);
+  $obj = apc_fetch('foobar');
+  $obj = apc_fetch('foobar');
+  var_dump($obj);
+  $obj = new D(111, 222, 333);
+  apc_store('foobar', $obj);
+  $obj = apc_fetch('foobar');
+  $obj = apc_fetch('foobar');
+  var_dump($obj);
+}
+foo();
diff --git a/hphp/test/slow/apc/1822.php b/hphp/test/slow/apc/1822.php
index f363f6f2d..a167be40d 100644
--- a/hphp/test/slow/apc/1822.php
+++ b/hphp/test/slow/apc/1822.php
@@ -1,7 +1,7 @@
 <?php
 
-
-class C {}
+class C {
+}
 class D {
   public function __construct($f) {
     $this->map = $f;
diff --git a/hphp/test/slow/apc/1823.php b/hphp/test/slow/apc/1823.php
index 376c36280..156ece87c 100644
--- a/hphp/test/slow/apc/1823.php
+++ b/hphp/test/slow/apc/1823.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $v = 42;
 $o1 = new stdclass;
 $o2 = new stdclass;
diff --git a/hphp/test/slow/apc/1824.php b/hphp/test/slow/apc/1824.php
index 6d5fa4d83..b6c298766 100644
--- a/hphp/test/slow/apc/1824.php
+++ b/hphp/test/slow/apc/1824.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   public function gen($a, $b) {
     yield $a;
@@ -10,7 +9,9 @@ class A {
 
 $x = new A;
 $x->cache_gen = $x->gen('a', 'b');
-foreach ($x->cache_gen as $v) { var_dump($v); }
+foreach ($x->cache_gen as $v) {
+ var_dump($v);
+ }
 apc_store('key', $x);
 $y = apc_fetch('key');
 print_r($y->cache_gen);
diff --git a/hphp/test/slow/apc/1825.php b/hphp/test/slow/apc/1825.php
index 737074a02..4fecea50a 100644
--- a/hphp/test/slow/apc/1825.php
+++ b/hphp/test/slow/apc/1825.php
@@ -1,4 +1,11 @@
 <?php
 
+$f = function($a) {
+ return $a;
+ }
+;
+ var_dump($f('x'));
+ apc_store('key', $f);
+ $g = apc_fetch('key');
+ print_r($g);
 
-$f = function($a) { return $a; }; var_dump($f('x')); apc_store('key', $f); $g = apc_fetch('key'); print_r($g); 
\ No newline at end of file
diff --git a/hphp/test/slow/apc/1826.php b/hphp/test/slow/apc/1826.php
index bc6fe2dc3..d43930b7b 100644
--- a/hphp/test/slow/apc/1826.php
+++ b/hphp/test/slow/apc/1826.php
@@ -1,3 +1,9 @@
 <?php
 
- function test($x) {  apc_store('foo', array('a'.$x, array($x)));  $a = apc_fetch('foo');  $x = array_intersect($a, $a);  var_dump($x);}test('foo');
\ No newline at end of file
+function test($x) {
+  apc_store('foo', array('a'.$x, array($x)));
+  $a = apc_fetch('foo');
+  $x = array_intersect($a, $a);
+  var_dump($x);
+}
+test('foo');
diff --git a/hphp/test/slow/apc/1827.php b/hphp/test/slow/apc/1827.php
index 762c34dd0..015d97b60 100644
--- a/hphp/test/slow/apc/1827.php
+++ b/hphp/test/slow/apc/1827.php
@@ -1,3 +1,20 @@
 <?php
 
- class X implements Serializable {  public function serialize() {    return 'true';  }  public function unserialize($serialized ) {  }}function test() {  $a[] = $x = new X;  $a[] = $x;  $a[] = $x;  apc_store('foo', $a);  $a = apc_fetch('foo');  var_dump($a);  $a = apc_fetch('foo');  var_dump($a);}test();
\ No newline at end of file
+class X implements Serializable {
+  public function serialize() {
+    return 'true';
+  }
+  public function unserialize($serialized ) {
+  }
+}
+function test() {
+  $a[] = $x = new X;
+  $a[] = $x;
+  $a[] = $x;
+  apc_store('foo', $a);
+  $a = apc_fetch('foo');
+  var_dump($a);
+  $a = apc_fetch('foo');
+  var_dump($a);
+}
+test();
diff --git a/hphp/test/slow/argument_handling/28.php b/hphp/test/slow/argument_handling/28.php
index e4224c834..fb30d0014 100644
--- a/hphp/test/slow/argument_handling/28.php
+++ b/hphp/test/slow/argument_handling/28.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function test($str) {
   return strlen($str);
 }
diff --git a/hphp/test/slow/argument_handling/29.php b/hphp/test/slow/argument_handling/29.php
index 443020214..ceac3b0bb 100644
--- a/hphp/test/slow/argument_handling/29.php
+++ b/hphp/test/slow/argument_handling/29.php
@@ -1,3 +1,9 @@
 <?php
 
- function f($x) { $b = $x; $b++; }$a = 1;f(&$a);var_dump($a);
\ No newline at end of file
+function f($x) {
+ $b = $x;
+ $b++;
+ }
+$a = 1;
+f(&$a);
+var_dump($a);
diff --git a/hphp/test/slow/array/177.php b/hphp/test/slow/array/177.php
index 640252b65..338965341 100644
--- a/hphp/test/slow/array/177.php
+++ b/hphp/test/slow/array/177.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array('b' => '2', 'a' => '1'));
\ No newline at end of file
+var_dump(array('b' => '2', 'a' => '1'));
diff --git a/hphp/test/slow/array/178.php b/hphp/test/slow/array/178.php
index ddf1cbf0f..0bbd09f7f 100644
--- a/hphp/test/slow/array/178.php
+++ b/hphp/test/slow/array/178.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array(1 => 'a', 0 => 'b'));
\ No newline at end of file
+var_dump(array(1 => 'a', 0 => 'b'));
diff --git a/hphp/test/slow/array/179.php b/hphp/test/slow/array/179.php
index 2c236f87e..8c3ceb64b 100644
--- a/hphp/test/slow/array/179.php
+++ b/hphp/test/slow/array/179.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array();                       var_dump($a);
\ No newline at end of file
+$a = array();
+                       var_dump($a);
diff --git a/hphp/test/slow/array/180.php b/hphp/test/slow/array/180.php
index 934eebf05..73de3c2f1 100644
--- a/hphp/test/slow/array/180.php
+++ b/hphp/test/slow/array/180.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(1);                      var_dump($a);
\ No newline at end of file
+$a = array(1);
+                      var_dump($a);
diff --git a/hphp/test/slow/array/181.php b/hphp/test/slow/array/181.php
index 96f700c8a..911fdec00 100644
--- a/hphp/test/slow/array/181.php
+++ b/hphp/test/slow/array/181.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(2, 1);                   var_dump($a);
\ No newline at end of file
+$a = array(2, 1);
+                   var_dump($a);
diff --git a/hphp/test/slow/array/182.php b/hphp/test/slow/array/182.php
index 58225c8d6..481dba5fa 100644
--- a/hphp/test/slow/array/182.php
+++ b/hphp/test/slow/array/182.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('1');                    var_dump($a);
\ No newline at end of file
+$a = array('1');
+                    var_dump($a);
diff --git a/hphp/test/slow/array/183.php b/hphp/test/slow/array/183.php
index 777b9c43d..ea14e4b44 100644
--- a/hphp/test/slow/array/183.php
+++ b/hphp/test/slow/array/183.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('2', '1');               var_dump($a);
\ No newline at end of file
+$a = array('2', '1');
+               var_dump($a);
diff --git a/hphp/test/slow/array/184.php b/hphp/test/slow/array/184.php
index 5bf041d6e..92c32afd0 100644
--- a/hphp/test/slow/array/184.php
+++ b/hphp/test/slow/array/184.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => 1);               var_dump($a);
\ No newline at end of file
+$a = array('a' => 1);
+               var_dump($a);
diff --git a/hphp/test/slow/array/185.php b/hphp/test/slow/array/185.php
index 253f242d9..f06d2f1b4 100644
--- a/hphp/test/slow/array/185.php
+++ b/hphp/test/slow/array/185.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('b' => 2, 'a' => 1);     var_dump($a);
\ No newline at end of file
+$a = array('b' => 2, 'a' => 1);
+     var_dump($a);
diff --git a/hphp/test/slow/array/186.php b/hphp/test/slow/array/186.php
index 0572fa50c..fc0f27f9b 100644
--- a/hphp/test/slow/array/186.php
+++ b/hphp/test/slow/array/186.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => '1');             var_dump($a);
\ No newline at end of file
+$a = array('a' => '1');
+             var_dump($a);
diff --git a/hphp/test/slow/array/187.php b/hphp/test/slow/array/187.php
index a478b7953..2a5e33442 100644
--- a/hphp/test/slow/array/187.php
+++ b/hphp/test/slow/array/187.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('b' => '2', 'a' => '1'); var_dump($a);
\ No newline at end of file
+$a = array('b' => '2', 'a' => '1');
+ var_dump($a);
diff --git a/hphp/test/slow/array/188.php b/hphp/test/slow/array/188.php
index 8500ae025..c2cf6b3a1 100644
--- a/hphp/test/slow/array/188.php
+++ b/hphp/test/slow/array/188.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => 1, 'a' => 2); var_dump($a);
\ No newline at end of file
+$a = array('a' => 1, 'a' => 2);
+ var_dump($a);
diff --git a/hphp/test/slow/array/189.php b/hphp/test/slow/array/189.php
index 08c6b483b..b92957c34 100644
--- a/hphp/test/slow/array/189.php
+++ b/hphp/test/slow/array/189.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => 1, 'b' => 2, 'a' => 3); var_dump($a);
\ No newline at end of file
+$a = array('a' => 1, 'b' => 2, 'a' => 3);
+ var_dump($a);
diff --git a/hphp/test/slow/array/190.php b/hphp/test/slow/array/190.php
index d70eca15b..d584aad55 100644
--- a/hphp/test/slow/array/190.php
+++ b/hphp/test/slow/array/190.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(1); $b = $a;                var_dump($b);
\ No newline at end of file
+$a = array(1);
+ $b = $a;
+                var_dump($b);
diff --git a/hphp/test/slow/array/191.php b/hphp/test/slow/array/191.php
index 4d5ab9cf8..4a51cc33f 100644
--- a/hphp/test/slow/array/191.php
+++ b/hphp/test/slow/array/191.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1); $b = $a; $a = array(2); var_dump($b);
\ No newline at end of file
+$a = array(1);
+ $b = $a;
+ $a = array(2);
+ var_dump($b);
diff --git a/hphp/test/slow/array/192.php b/hphp/test/slow/array/192.php
index 122c1bbb0..5eca0f5d3 100644
--- a/hphp/test/slow/array/192.php
+++ b/hphp/test/slow/array/192.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1); $b = $a; $a = array(2); var_dump($a);
\ No newline at end of file
+$a = array(1);
+ $b = $a;
+ $a = array(2);
+ var_dump($a);
diff --git a/hphp/test/slow/array/193.php b/hphp/test/slow/array/193.php
index 0666fb6c2..35c25d33c 100644
--- a/hphp/test/slow/array/193.php
+++ b/hphp/test/slow/array/193.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1); $b = $a; $b = array(2); var_dump($a);
\ No newline at end of file
+$a = array(1);
+ $b = $a;
+ $b = array(2);
+ var_dump($a);
diff --git a/hphp/test/slow/array/194.php b/hphp/test/slow/array/194.php
index e7d1fe83c..a6b5e7c1b 100644
--- a/hphp/test/slow/array/194.php
+++ b/hphp/test/slow/array/194.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(); foreach ($a as $item) print '['.$item.']';
\ No newline at end of file
+$a = array();
+ foreach ($a as $item) print '['.$item.']';
diff --git a/hphp/test/slow/array/195.php b/hphp/test/slow/array/195.php
index 560bd8b39..48ed57cf4 100644
--- a/hphp/test/slow/array/195.php
+++ b/hphp/test/slow/array/195.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(1); foreach ($a as $item) print '['.$item.']';
\ No newline at end of file
+$a = array(1);
+ foreach ($a as $item) print '['.$item.']';
diff --git a/hphp/test/slow/array/196.php b/hphp/test/slow/array/196.php
index 6ce651814..a3e035145 100644
--- a/hphp/test/slow/array/196.php
+++ b/hphp/test/slow/array/196.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(2,1); foreach ($a as $item) print '['.$item.']';
\ No newline at end of file
+$a = array(2,1);
+ foreach ($a as $item) print '['.$item.']';
diff --git a/hphp/test/slow/array/197.php b/hphp/test/slow/array/197.php
index c4bdcedfe..f40798774 100644
--- a/hphp/test/slow/array/197.php
+++ b/hphp/test/slow/array/197.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('b' => 2, 'a' => 1); foreach ($a as $item) print '['.$item.']';
\ No newline at end of file
+$a = array('b' => 2, 'a' => 1);
+ foreach ($a as $item) print '['.$item.']';
diff --git a/hphp/test/slow/array/198.php b/hphp/test/slow/array/198.php
index 000f84892..0804761e8 100644
--- a/hphp/test/slow/array/198.php
+++ b/hphp/test/slow/array/198.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('b' => 2, 'a' => 1); foreach ($a as $name => $item) print '['.$name.'=>'.$item.']';
\ No newline at end of file
+$a = array('b' => 2, 'a' => 1);
+ foreach ($a as $name => $item) print '['.$name.'=>'.$item.']';
diff --git a/hphp/test/slow/array/199.php b/hphp/test/slow/array/199.php
index 6e27c55d0..997268307 100644
--- a/hphp/test/slow/array/199.php
+++ b/hphp/test/slow/array/199.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(2,1); var_dump($a[0]);
\ No newline at end of file
+$a = array(2,1);
+ var_dump($a[0]);
diff --git a/hphp/test/slow/array/200.php b/hphp/test/slow/array/200.php
index cc7b53ba4..30ec06357 100644
--- a/hphp/test/slow/array/200.php
+++ b/hphp/test/slow/array/200.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(2,1); var_dump($a[-1]);
\ No newline at end of file
+$a = array(2,1);
+ var_dump($a[-1]);
diff --git a/hphp/test/slow/array/201.php b/hphp/test/slow/array/201.php
index a23e177f4..475221222 100644
--- a/hphp/test/slow/array/201.php
+++ b/hphp/test/slow/array/201.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(2,1); var_dump($a[3]);
\ No newline at end of file
+$a = array(2,1);
+ var_dump($a[3]);
diff --git a/hphp/test/slow/array/202.php b/hphp/test/slow/array/202.php
index a35860b3a..bf7689a83 100644
--- a/hphp/test/slow/array/202.php
+++ b/hphp/test/slow/array/202.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('b' => 2, 'a' => 1); var_dump($a['b']);
\ No newline at end of file
+$a = array('b' => 2, 'a' => 1);
+ var_dump($a['b']);
diff --git a/hphp/test/slow/array/203.php b/hphp/test/slow/array/203.php
index c10edd1c6..12be016f8 100644
--- a/hphp/test/slow/array/203.php
+++ b/hphp/test/slow/array/203.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('b' => 2, 'a' => 1); var_dump($a['bogus']);
\ No newline at end of file
+$a = array('b' => 2, 'a' => 1);
+ var_dump($a['bogus']);
diff --git a/hphp/test/slow/array/204.php b/hphp/test/slow/array/204.php
index f71c2bdff..1e5907fe8 100644
--- a/hphp/test/slow/array/204.php
+++ b/hphp/test/slow/array/204.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(2, 'test' => 1); var_dump($a);
\ No newline at end of file
+$a = array(2, 'test' => 1);
+ var_dump($a);
diff --git a/hphp/test/slow/array/205.php b/hphp/test/slow/array/205.php
index bca539e3d..e0600bbc9 100644
--- a/hphp/test/slow/array/205.php
+++ b/hphp/test/slow/array/205.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(1.2 => 'test'); var_dump($a[1]);
\ No newline at end of file
+$a = array(1.2 => 'test');
+ var_dump($a[1]);
diff --git a/hphp/test/slow/array/206.php b/hphp/test/slow/array/206.php
index b909da90c..6b0399af1 100644
--- a/hphp/test/slow/array/206.php
+++ b/hphp/test/slow/array/206.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(1, 'test'); var_dump($a);
\ No newline at end of file
+$a = array(1, 'test');
+ var_dump($a);
diff --git a/hphp/test/slow/array/207.php b/hphp/test/slow/array/207.php
index 547f7426f..53de7856c 100644
--- a/hphp/test/slow/array/207.php
+++ b/hphp/test/slow/array/207.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(); $a[] = 3; $a[] = 'test'; var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[] = 3;
+ $a[] = 'test';
+ var_dump($a);
diff --git a/hphp/test/slow/array/208.php b/hphp/test/slow/array/208.php
index d846e7e03..03ec95bac 100644
--- a/hphp/test/slow/array/208.php
+++ b/hphp/test/slow/array/208.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array();     $a['test'] = 3; var_dump($a);
\ No newline at end of file
+$a = array();
+     $a['test'] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/array/209.php b/hphp/test/slow/array/209.php
index f81de9843..5de82513c 100644
--- a/hphp/test/slow/array/209.php
+++ b/hphp/test/slow/array/209.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(1);    $a['test'] = 3; var_dump($a);
\ No newline at end of file
+$a = array(1);
+    $a['test'] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/array/210.php b/hphp/test/slow/array/210.php
index 3966807a1..29cb0c3dd 100644
--- a/hphp/test/slow/array/210.php
+++ b/hphp/test/slow/array/210.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(1, 2); $a[10] = 3;     var_dump($a);
\ No newline at end of file
+$a = array(1, 2);
+ $a[10] = 3;
+     var_dump($a);
diff --git a/hphp/test/slow/array/211.php b/hphp/test/slow/array/211.php
index c5b098c71..c60e82c35 100644
--- a/hphp/test/slow/array/211.php
+++ b/hphp/test/slow/array/211.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(1, 2); $a['10'] = 3;   var_dump($a);
\ No newline at end of file
+$a = array(1, 2);
+ $a['10'] = 3;
+   var_dump($a);
diff --git a/hphp/test/slow/array/212.php b/hphp/test/slow/array/212.php
index 46a607cae..72c9b381d 100644
--- a/hphp/test/slow/array/212.php
+++ b/hphp/test/slow/array/212.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1, 2); $b = $a; $a['10'] = 3; var_dump($b);
\ No newline at end of file
+$a = array(1, 2);
+ $b = $a;
+ $a['10'] = 3;
+ var_dump($b);
diff --git a/hphp/test/slow/array/213.php b/hphp/test/slow/array/213.php
index 91af2480b..d1c0c941d 100644
--- a/hphp/test/slow/array/213.php
+++ b/hphp/test/slow/array/213.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1, 2); $b = $a; $a['10'] = 3; var_dump($a);
\ No newline at end of file
+$a = array(1, 2);
+ $b = $a;
+ $a['10'] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/array/214.php b/hphp/test/slow/array/214.php
index 4e5fbcda5..a74e65795 100644
--- a/hphp/test/slow/array/214.php
+++ b/hphp/test/slow/array/214.php
@@ -1,3 +1,4 @@
 <?php
 
- $a[] = 3; var_dump($a);
\ No newline at end of file
+$a[] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/array/215.php b/hphp/test/slow/array/215.php
index 1318447aa..19a4a06f5 100644
--- a/hphp/test/slow/array/215.php
+++ b/hphp/test/slow/array/215.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[] = 3; var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/array/216.php b/hphp/test/slow/array/216.php
index e285c76fd..c088183d3 100644
--- a/hphp/test/slow/array/216.php
+++ b/hphp/test/slow/array/216.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(1); $a[] = 3; var_dump($a);
\ No newline at end of file
+$a = array(1);
+ $a[] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/array/217.php b/hphp/test/slow/array/217.php
index 2b6c1cb97..80512a2a5 100644
--- a/hphp/test/slow/array/217.php
+++ b/hphp/test/slow/array/217.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(1,2); $a[] = 3; var_dump($a);
\ No newline at end of file
+$a = array(1,2);
+ $a[] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/array/218.php b/hphp/test/slow/array/218.php
index 8872f655f..414f66fe8 100644
--- a/hphp/test/slow/array/218.php
+++ b/hphp/test/slow/array/218.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = ''; $a[] = 'test'; var_dump($a);
\ No newline at end of file
+$a = '';
+ $a[] = 'test';
+ var_dump($a);
diff --git a/hphp/test/slow/array/219.php b/hphp/test/slow/array/219.php
index 02cf5c93c..ee86d6ed8 100644
--- a/hphp/test/slow/array/219.php
+++ b/hphp/test/slow/array/219.php
@@ -1,3 +1,11 @@
 <?php
 
- $a = array(1, 2); foreach ($a as $item) {   print 'A['.$item.']';   if ($item == 1) $a[] = 'new item'; } foreach ($a as $item) {   print 'B['.$item.']'; }var_dump($a);
\ No newline at end of file
+$a = array(1, 2);
+ foreach ($a as $item) {
+   print 'A['.$item.']';
+   if ($item == 1) $a[] = 'new item';
+ }
+ foreach ($a as $item) {
+   print 'B['.$item.']';
+ }
+var_dump($a);
diff --git a/hphp/test/slow/array/220.php b/hphp/test/slow/array/220.php
index bc1d59802..91ea054e0 100644
--- a/hphp/test/slow/array/220.php
+++ b/hphp/test/slow/array/220.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1); $b = array(2); $c = $a + $b; var_dump($c);
\ No newline at end of file
+$a = array(1);
+ $b = array(2);
+ $c = $a + $b;
+ var_dump($c);
diff --git a/hphp/test/slow/array/221.php b/hphp/test/slow/array/221.php
index 7855eb72e..9a97ed5fe 100644
--- a/hphp/test/slow/array/221.php
+++ b/hphp/test/slow/array/221.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1,2); $b = array(2,3); $c = $a + $b; var_dump($c);
\ No newline at end of file
+$a = array(1,2);
+ $b = array(2,3);
+ $c = $a + $b;
+ var_dump($c);
diff --git a/hphp/test/slow/array/222.php b/hphp/test/slow/array/222.php
index ccebdb35b..5feaf5d1d 100644
--- a/hphp/test/slow/array/222.php
+++ b/hphp/test/slow/array/222.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1,2); $b = array(2); $c = $a + $b; var_dump($c);
\ No newline at end of file
+$a = array(1,2);
+ $b = array(2);
+ $c = $a + $b;
+ var_dump($c);
diff --git a/hphp/test/slow/array/223.php b/hphp/test/slow/array/223.php
index cf11e6e48..99dc8dfbf 100644
--- a/hphp/test/slow/array/223.php
+++ b/hphp/test/slow/array/223.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(1); $b = array(2,3); $c = $a + $b; var_dump($c);
\ No newline at end of file
+$a = array(1);
+ $b = array(2,3);
+ $c = $a + $b;
+ var_dump($c);
diff --git a/hphp/test/slow/array/224.php b/hphp/test/slow/array/224.php
index ea53437bd..ef7030612 100644
--- a/hphp/test/slow/array/224.php
+++ b/hphp/test/slow/array/224.php
@@ -1,3 +1,9 @@
 <?php
 
- $array_variables = array(  array(),  array(NULL),  array());foreach ($array_variables as $array_var) {  $keys = array_keys($array_var);  foreach ($keys as $key_value) {    echo $key_value;  }}
\ No newline at end of file
+$array_variables = array(  array(),  array(NULL),  array());
+foreach ($array_variables as $array_var) {
+  $keys = array_keys($array_var);
+  foreach ($keys as $key_value) {
+    echo $key_value;
+  }
+}
diff --git a/hphp/test/slow/array/225.php b/hphp/test/slow/array/225.php
index 5abd45d2e..13c7dfe78 100644
--- a/hphp/test/slow/array/225.php
+++ b/hphp/test/slow/array/225.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array('a' => 1, 'b' => 2);foreach ($a as $b => $c) {  var_dump($b);  unset($a['b']);}
\ No newline at end of file
+$a = array('a' => 1, 'b' => 2);
+foreach ($a as $b => $c) {
+  var_dump($b);
+  unset($a['b']);
+}
diff --git a/hphp/test/slow/array/226.php b/hphp/test/slow/array/226.php
index 2b324e2e9..be03a3de1 100644
--- a/hphp/test/slow/array/226.php
+++ b/hphp/test/slow/array/226.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array('a' => 1, 'b' => 2);foreach ($a as $b => &$c) {  var_dump($b);  unset($a['b']);}
\ No newline at end of file
+$a = array('a' => 1, 'b' => 2);
+foreach ($a as $b => &$c) {
+  var_dump($b);
+  unset($a['b']);
+}
diff --git a/hphp/test/slow/array/227.php b/hphp/test/slow/array/227.php
index 28f8389c4..5c8ba325d 100644
--- a/hphp/test/slow/array/227.php
+++ b/hphp/test/slow/array/227.php
@@ -1,3 +1,12 @@
 <?php
 
- function gen() {  $a = array('a' => 1, 'b' => 2);  foreach ($a as $b => &$c) {    yield null;    var_dump($b);    unset($a['b']);  }}foreach (gen() as $_) {}
\ No newline at end of file
+function gen() {
+  $a = array('a' => 1, 'b' => 2);
+  foreach ($a as $b => &$c) {
+    yield null;
+    var_dump($b);
+    unset($a['b']);
+  }
+}
+foreach (gen() as $_) {
+}
diff --git a/hphp/test/slow/array/228.php b/hphp/test/slow/array/228.php
index 6c81e2c97..2b2b0761c 100644
--- a/hphp/test/slow/array/228.php
+++ b/hphp/test/slow/array/228.php
@@ -1,3 +1,15 @@
 <?php
 
- $foo = array(1,2,3,4);foreach ($foo as $key => $val) {  if($val == 2) {    $foo[$key] = 0;  } else if($val == 3) {    unset($foo[$key]);  } else {    $foo[$key] = $val + 1;  }}var_dump($foo);
\ No newline at end of file
+$foo = array(1,2,3,4);
+foreach ($foo as $key => $val) {
+  if($val == 2) {
+    $foo[$key] = 0;
+  }
+ else if($val == 3) {
+    unset($foo[$key]);
+  }
+ else {
+    $foo[$key] = $val + 1;
+  }
+}
+var_dump($foo);
diff --git a/hphp/test/slow/array/229.php b/hphp/test/slow/array/229.php
index 38e422d6f..cf6a48fee 100644
--- a/hphp/test/slow/array/229.php
+++ b/hphp/test/slow/array/229.php
@@ -1,3 +1,15 @@
 <?php
 
- $foo = array(1,2,3,4);foreach ($foo as $key => &$val) {  if($val == 2) {    $foo[$key] = 0;  } else if($val == 3) {    unset($foo[$key]);  } else {    $val++;  }}var_dump($foo);
\ No newline at end of file
+$foo = array(1,2,3,4);
+foreach ($foo as $key => &$val) {
+  if($val == 2) {
+    $foo[$key] = 0;
+  }
+ else if($val == 3) {
+    unset($foo[$key]);
+  }
+ else {
+    $val++;
+  }
+}
+var_dump($foo);
diff --git a/hphp/test/slow/array/230.php b/hphp/test/slow/array/230.php
index 3cb94504a..c38644222 100644
--- a/hphp/test/slow/array/230.php
+++ b/hphp/test/slow/array/230.php
@@ -1,3 +1,20 @@
 <?php
 
- function gen() {  $foo = array(1,2,3,4);  foreach ($foo as $key => &$val) {    if($val == 2) {      $foo[$key] = 0;    } else if($val == 3) {      unset($foo[$key]);    } else {      $val++;    }  }  var_dump($foo);  yield null;}foreach (gen() as $_) {}
\ No newline at end of file
+function gen() {
+  $foo = array(1,2,3,4);
+  foreach ($foo as $key => &$val) {
+    if($val == 2) {
+      $foo[$key] = 0;
+    }
+ else if($val == 3) {
+      unset($foo[$key]);
+    }
+ else {
+      $val++;
+    }
+  }
+  var_dump($foo);
+  yield null;
+}
+foreach (gen() as $_) {
+}
diff --git a/hphp/test/slow/array/231.php b/hphp/test/slow/array/231.php
index a040db198..3f95eff76 100644
--- a/hphp/test/slow/array/231.php
+++ b/hphp/test/slow/array/231.php
@@ -1,3 +1,11 @@
 <?php
 
- $a = array('a' => 'apple', 'b' => 'banana', 'c' => 'citrus');foreach ($a as $k1 => &$v1) {  foreach ($a as $k2 => &$v2) {    if ($k2 == 'a') {      unset($a[$k2]);    }    var_dump($v1, $v2);  }}
\ No newline at end of file
+$a = array('a' => 'apple', 'b' => 'banana', 'c' => 'citrus');
+foreach ($a as $k1 => &$v1) {
+  foreach ($a as $k2 => &$v2) {
+    if ($k2 == 'a') {
+      unset($a[$k2]);
+    }
+    var_dump($v1, $v2);
+  }
+}
diff --git a/hphp/test/slow/array/232.php b/hphp/test/slow/array/232.php
index abf526c8d..64b32a4d1 100644
--- a/hphp/test/slow/array/232.php
+++ b/hphp/test/slow/array/232.php
@@ -1,3 +1,16 @@
 <?php
 
- function gen() {  $a = array('a' => 'apple', 'b' => 'banana', 'c' => 'citrus');  foreach ($a as $k1 => &$v1) {    foreach ($a as $k2 => &$v2) {      if ($k2 == 'a') {        unset($a[$k2]);      }      var_dump($v1, $v2);    }  }  yield null;}foreach (gen() as $_) {}
\ No newline at end of file
+function gen() {
+  $a = array('a' => 'apple', 'b' => 'banana', 'c' => 'citrus');
+  foreach ($a as $k1 => &$v1) {
+    foreach ($a as $k2 => &$v2) {
+      if ($k2 == 'a') {
+        unset($a[$k2]);
+      }
+      var_dump($v1, $v2);
+    }
+  }
+  yield null;
+}
+foreach (gen() as $_) {
+}
diff --git a/hphp/test/slow/array/233.php b/hphp/test/slow/array/233.php
index c82d363c3..d718e3dfd 100644
--- a/hphp/test/slow/array/233.php
+++ b/hphp/test/slow/array/233.php
@@ -1,3 +1,24 @@
 <?php
 
- $stack = array();function push_stack(){  global $stack;  static $index = 0;  $val = $index++;  array_push($stack, $val);}function pop_stack(){  global $stack;  if ($stack) {    array_pop($stack);  }}push_stack();pop_stack();pop_stack();pop_stack();push_stack();pop_stack();push_stack();$info = array(count($stack), $stack[count($stack)-1], $stack);var_dump($info);
\ No newline at end of file
+$stack = array();
+function push_stack(){
+  global $stack;
+  static $index = 0;
+  $val = $index++;
+  array_push($stack, $val);
+}
+function pop_stack(){
+  global $stack;
+  if ($stack) {
+    array_pop($stack);
+  }
+}
+push_stack();
+pop_stack();
+pop_stack();
+pop_stack();
+push_stack();
+pop_stack();
+push_stack();
+$info = array(count($stack), $stack[count($stack)-1], $stack);
+var_dump($info);
diff --git a/hphp/test/slow/array/234.php b/hphp/test/slow/array/234.php
index e0ffd8de1..fb81c9941 100644
--- a/hphp/test/slow/array/234.php
+++ b/hphp/test/slow/array/234.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { function f($a) { var_dump($a === null); } }$a = true; $a = new A();$a->f(array());
\ No newline at end of file
+class A {
+ function f($a) {
+ var_dump($a === null);
+ }
+ }
+$a = true;
+ $a = new A();
+$a->f(array());
diff --git a/hphp/test/slow/array/235.php b/hphp/test/slow/array/235.php
index e24d186fc..3e9abfa72 100644
--- a/hphp/test/slow/array/235.php
+++ b/hphp/test/slow/array/235.php
@@ -1,3 +1,22 @@
 <?php
 
- function test($a) {  var_dump(current($a));  while (next($a)) echo '.';  $a[] = 2;  $a[] = 3;  var_dump(current($a));  var_dump(next($a));  var_dump(next($a));  var_dump(current($a));  $a[17] = 4;  var_dump(current($a));  $a[18] = 5;  var_dump(current($a));  while(next($a)) echo '.';  var_dump(current($a));  $a[1] = 5;  var_dump(current($a));}test(array(1));test(array(1,2,3,4,5,6,7,8,9));
\ No newline at end of file
+function test($a) {
+  var_dump(current($a));
+  while (next($a)) echo '.';
+  $a[] = 2;
+  $a[] = 3;
+  var_dump(current($a));
+  var_dump(next($a));
+  var_dump(next($a));
+  var_dump(current($a));
+  $a[17] = 4;
+  var_dump(current($a));
+  $a[18] = 5;
+  var_dump(current($a));
+  while(next($a)) echo '.';
+  var_dump(current($a));
+  $a[1] = 5;
+  var_dump(current($a));
+}
+test(array(1));
+test(array(1,2,3,4,5,6,7,8,9));
diff --git a/hphp/test/slow/array/236.php b/hphp/test/slow/array/236.php
index cfff74dfb..2f0847a23 100644
--- a/hphp/test/slow/array/236.php
+++ b/hphp/test/slow/array/236.php
@@ -1,3 +1,11 @@
 <?php
 
- function foo() {  $a = array();  $a[] = '1.1';  $a[] = '2.2';  $a[] = '3.3';  var_dump(array_sum($a));  var_dump(array_product($a));}foo();
\ No newline at end of file
+function foo() {
+  $a = array();
+  $a[] = '1.1';
+  $a[] = '2.2';
+  $a[] = '3.3';
+  var_dump(array_sum($a));
+  var_dump(array_product($a));
+}
+foo();
diff --git a/hphp/test/slow/array/237.php b/hphp/test/slow/array/237.php
index bddcddd41..fcfaa5e1c 100644
--- a/hphp/test/slow/array/237.php
+++ b/hphp/test/slow/array/237.php
@@ -1,3 +1,5 @@
 <?php
 
- $array = array('1' => array(2 => 'test'));unset($array['1'][2]);var_dump($array['1']);
\ No newline at end of file
+$array = array('1' => array(2 => 'test'));
+unset($array['1'][2]);
+var_dump($array['1']);
diff --git a/hphp/test/slow/array/238.php b/hphp/test/slow/array/238.php
index 2f2940440..dd88e5743 100644
--- a/hphp/test/slow/array/238.php
+++ b/hphp/test/slow/array/238.php
@@ -1,3 +1,4 @@
 <?php
 
- $x['1'] += 1;var_dump($x);
\ No newline at end of file
+$x['1'] += 1;
+var_dump($x);
diff --git a/hphp/test/slow/array/239.php b/hphp/test/slow/array/239.php
index caa4a0200..df3e9ff2a 100644
--- a/hphp/test/slow/array/239.php
+++ b/hphp/test/slow/array/239.php
@@ -1,3 +1,11 @@
 <?php
 
- function foo($x) { var_dump($x); }function test() {  $data = null;  $data['bar']['baz'] = 1;  foo($data);}test();
\ No newline at end of file
+function foo($x) {
+ var_dump($x);
+ }
+function test() {
+  $data = null;
+  $data['bar']['baz'] = 1;
+  foo($data);
+}
+test();
diff --git a/hphp/test/slow/array/240.php b/hphp/test/slow/array/240.php
index fb4c25751..cb8465d85 100644
--- a/hphp/test/slow/array/240.php
+++ b/hphp/test/slow/array/240.php
@@ -1,3 +1,29 @@
 <?php
 
- class A {  public function __call($method, $args) {    foreach ($args as $a) { var_dump($a); }    var_dump(array_pop($args));    if (isset($args[1])) { var_dump($args[1]); }    reset($args);    if (key($args) === 0) {       $args = array(5);    }    if (current($args) === 0) {       $args = array(5);    }    if (next($args) === 0) {       $args = array(5);    }    var_dump($args['1']);    var_dump($args['hi']);    $args = $args + array(2 => 0, 3 => true, 4 => true);     var_dump($args);  }}$obj = new A;$obj->foo(1, 2, 3);
\ No newline at end of file
+class A {
+  public function __call($method, $args) {
+    foreach ($args as $a) {
+ var_dump($a);
+ }
+    var_dump(array_pop($args));
+    if (isset($args[1])) {
+ var_dump($args[1]);
+ }
+    reset($args);
+    if (key($args) === 0) {
+       $args = array(5);
+    }
+    if (current($args) === 0) {
+       $args = array(5);
+    }
+    if (next($args) === 0) {
+       $args = array(5);
+    }
+    var_dump($args['1']);
+    var_dump($args['hi']);
+    $args = $args + array(2 => 0, 3 => true, 4 => true);
+     var_dump($args);
+  }
+}
+$obj = new A;
+$obj->foo(1, 2, 3);
diff --git a/hphp/test/slow/array/242.php b/hphp/test/slow/array/242.php
index 9febddb12..759a3b0a2 100644
--- a/hphp/test/slow/array/242.php
+++ b/hphp/test/slow/array/242.php
@@ -1,3 +1,11 @@
 <?php
 
- function test($q, $a, $b, $c) {  $x = array($a, 'foo'=> $a);  if ($x) {    var_dump(isset($x[0][1]), isset($x['foo'][1]));    var_dump(isset($x[$b][1]), isset($x[$c][1]));    var_dump(end($x[0]));  }}test(5, array(0,1), 0, 'foo');
\ No newline at end of file
+function test($q, $a, $b, $c) {
+  $x = array($a, 'foo'=> $a);
+  if ($x) {
+    var_dump(isset($x[0][1]), isset($x['foo'][1]));
+    var_dump(isset($x[$b][1]), isset($x[$c][1]));
+    var_dump(end($x[0]));
+  }
+}
+test(5, array(0,1), 0, 'foo');
diff --git a/hphp/test/slow/array/243.php b/hphp/test/slow/array/243.php
index c0fdb6c01..f03ddc89a 100644
--- a/hphp/test/slow/array/243.php
+++ b/hphp/test/slow/array/243.php
@@ -1,3 +1,15 @@
 <?php
 
- class X { function __destruct() { var_dump('two'); } }function test($a) {  $x = array(new X);  $a['foo'] = $x;  var_dump('one');  var_dump($x);}test(1);var_dump('three');
\ No newline at end of file
+class X {
+ function __destruct() {
+ var_dump('two');
+ }
+ }
+function test($a) {
+  $x = array(new X);
+  $a['foo'] = $x;
+  var_dump('one');
+  var_dump($x);
+}
+test(1);
+var_dump('three');
diff --git a/hphp/test/slow/array/244.php b/hphp/test/slow/array/244.php
index 8901462d4..730eb1d1a 100644
--- a/hphp/test/slow/array/244.php
+++ b/hphp/test/slow/array/244.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array('a' => null, 'b' => 123, 'c' => false);var_dump(array_keys($a));var_dump(array_keys($a, null));var_dump(array_keys($a, null, true));
\ No newline at end of file
+$a = array('a' => null, 'b' => 123, 'c' => false);
+var_dump(array_keys($a));
+var_dump(array_keys($a, null));
+var_dump(array_keys($a, null, true));
diff --git a/hphp/test/slow/array_access/434.php b/hphp/test/slow/array_access/434.php
index d8731418f..c2d5b9f1e 100644
--- a/hphp/test/slow/array_access/434.php
+++ b/hphp/test/slow/array_access/434.php
@@ -1,7 +1,26 @@
 <?php
 
-
-class A implements ArrayAccess {  public $a;  public function offsetExists($offset) {    echo "offsetExist";    return false;  }  public function offsetGet($offset) {    echo "offsetGet";    return $this->$offset.'get';  }  public function offsetSet($offset, $value) {    $this->$offset = $value.'set';  }  public function offsetUnset($offset) {    $this->$offset = 'unset';  }}function f() { var_dump('f()'); return 1; }
+class A implements ArrayAccess {
+  public $a;
+  public function offsetExists($offset) {
+    echo "offsetExist";
+    return false;
+  }
+  public function offsetGet($offset) {
+    echo "offsetGet";
+    return $this->$offset.'get';
+  }
+  public function offsetSet($offset, $value) {
+    $this->$offset = $value.'set';
+  }
+  public function offsetUnset($offset) {
+    $this->$offset = 'unset';
+  }
+}
+function f() {
+ var_dump('f()');
+ return 1;
+ }
 function test($a) {
 $a['foo'] .= f();
 $a['bar'] += f();
diff --git a/hphp/test/slow/array_access/435.php b/hphp/test/slow/array_access/435.php
index 89eb9f656..71272570c 100644
--- a/hphp/test/slow/array_access/435.php
+++ b/hphp/test/slow/array_access/435.php
@@ -1,3 +1,29 @@
 <?php
 
- class A implements ArrayAccess {  public $a;  public function offsetExists($offset) {    echo "offsetExist";    return false;  }  public function offsetGet($offset) {    echo "offsetGet";    return $this->$offset.'get';  }  public function offsetSet($offset, $value) {    $this->$offset = $value.'set';  }  public function offsetUnset($offset) {    $this->$offset = 'unset';  }}$obj = new A();if (!isset($obj['a'])) {  $obj['a'] = 'test';}if (!empty($obj['a'])) {  $obj['a'] = 'test2';}var_dump($obj['a']);unset($obj['a']);var_dump($obj['a']);
\ No newline at end of file
+class A implements ArrayAccess {
+  public $a;
+  public function offsetExists($offset) {
+    echo "offsetExist";
+    return false;
+  }
+  public function offsetGet($offset) {
+    echo "offsetGet";
+    return $this->$offset.'get';
+  }
+  public function offsetSet($offset, $value) {
+    $this->$offset = $value.'set';
+  }
+  public function offsetUnset($offset) {
+    $this->$offset = 'unset';
+  }
+}
+$obj = new A();
+if (!isset($obj['a'])) {
+  $obj['a'] = 'test';
+}
+if (!empty($obj['a'])) {
+  $obj['a'] = 'test2';
+}
+var_dump($obj['a']);
+unset($obj['a']);
+var_dump($obj['a']);
diff --git a/hphp/test/slow/array_access/436.php b/hphp/test/slow/array_access/436.php
index c8a41b3a1..a5a990790 100644
--- a/hphp/test/slow/array_access/436.php
+++ b/hphp/test/slow/array_access/436.php
@@ -1,3 +1,101 @@
 <?php
 
- function offsetGet($index) {  echo ("GET0: $index\n");}class ArrayAccessImpl implements ArrayAccess {  public $data = array();  public function offsetUnset($index) { echo "UNSET: $index\n"; }  public function offsetSet($index, $value) {    echo ("SET: $index\n");    if(isset($data[$index])) {        unset($data[$index]);    }    $u = &$this->data[$index];    if(is_array($value)) {        $u = new ArrayAccessImpl();        foreach($value as $idx=>$e)            $u[$idx]=$e;    } else        $u=$value;  }  public function offsetGet($index) {    echo ("GET: $index\n");    if(!isset($this->data[$index]))        $this->data[$index]=new ArrayAccessImpl();    return $this->data[$index];  }  public function offsetExists($index) {    echo ("EXISTS: $index\n");    if(isset($this->data[$index])) {        if($this->data[$index] instanceof ArrayAccessImpl) {            if(count($this->data[$index]->data)>0)                return true;            else                return false;        } else            return true;    } else        return false;  }}class ArrayAccessImpl2 extends ArrayAccessImpl {  public function offsetUnset($index) { echo "UNSET2: $index\n"; }  public function offsetSet($index, $value) {    echo ("SET2: $index\n");    if(isset($data[$index])) {        unset($data[$index]);    }    $u = &$this->data[$index];    if(is_array($value)) {        $u = new ArrayAccessImpl();        foreach($value as $idx=>$e)            $u[$idx]=$e;    } else        $u=$value;  }  public function offsetGet($index) {    echo ("GET2: $index\n");    if(!isset($this->data[$index]))        $this->data[$index]=new ArrayAccessImpl();    return $this->data[$index];  }  public function offsetExists($index) {    echo ("EXISTS2: $index\n");    if(isset($this->data[$index])) {        if($this->data[$index] instanceof ArrayAccessImpl) {            if(count($this->data[$index]->data)>0)                return true;            else                return false;        } else            return true;    } else        return false;  }}offsetGet('foo');$data = new ArrayAccessImpl();$data['string']="Just a simple string";$data['number']=33;$data['array']['another_string']="Alpha";$data['array']['some_object']=new stdClass();$data['array']['another_array']['x']['y']="Beta";$data['blank_array']=array();print_r(isset($data['array']));print_r($data['array']['non_existent']);print_r(isset($data['array']['non_existent']));print_r($data['blank_array']);print_r(isset($data['blank_array']));unset($data['blank_array']);print_r($data);$data2 = new ArrayAccessImpl2();$data2['string']="Just a simple string";$data2['number']=33;$data2['array']['another_string']="Alpha";$data2['array']['some_object']=new stdClass();$data2['array']['another_array']['x']['y']="Beta";$data2['blank_array']=array();print_r(isset($data2['array']));print_r($data2['array']['non_existent']);print_r(isset($data2['array']['non_existent']));print_r($data2['blank_array']);print_r(isset($data2['blank_array']));unset($data2['blank_array']);print_r($data2);
\ No newline at end of file
+function offsetGet($index) {
+  echo ("GET0: $index\n");
+}
+class ArrayAccessImpl implements ArrayAccess {
+  public $data = array();
+  public function offsetUnset($index) {
+ echo "UNSET: $index\n";
+ }
+  public function offsetSet($index, $value) {
+    echo ("SET: $index\n");
+    if(isset($data[$index])) {
+        unset($data[$index]);
+    }
+    $u = &$this->data[$index];
+    if(is_array($value)) {
+        $u = new ArrayAccessImpl();
+        foreach($value as $idx=>$e)            $u[$idx]=$e;
+    }
+ else        $u=$value;
+  }
+  public function offsetGet($index) {
+    echo ("GET: $index\n");
+    if(!isset($this->data[$index]))        $this->data[$index]=new ArrayAccessImpl();
+    return $this->data[$index];
+  }
+  public function offsetExists($index) {
+    echo ("EXISTS: $index\n");
+    if(isset($this->data[$index])) {
+        if($this->data[$index] instanceof ArrayAccessImpl) {
+            if(count($this->data[$index]->data)>0)                return true;
+            else                return false;
+        }
+ else            return true;
+    }
+ else        return false;
+  }
+}
+class ArrayAccessImpl2 extends ArrayAccessImpl {
+  public function offsetUnset($index) {
+ echo "UNSET2: $index\n";
+ }
+  public function offsetSet($index, $value) {
+    echo ("SET2: $index\n");
+    if(isset($data[$index])) {
+        unset($data[$index]);
+    }
+    $u = &$this->data[$index];
+    if(is_array($value)) {
+        $u = new ArrayAccessImpl();
+        foreach($value as $idx=>$e)            $u[$idx]=$e;
+    }
+ else        $u=$value;
+  }
+  public function offsetGet($index) {
+    echo ("GET2: $index\n");
+    if(!isset($this->data[$index]))        $this->data[$index]=new ArrayAccessImpl();
+    return $this->data[$index];
+  }
+  public function offsetExists($index) {
+    echo ("EXISTS2: $index\n");
+    if(isset($this->data[$index])) {
+        if($this->data[$index] instanceof ArrayAccessImpl) {
+            if(count($this->data[$index]->data)>0)                return true;
+            else                return false;
+        }
+ else            return true;
+    }
+ else        return false;
+  }
+}
+offsetGet('foo');
+$data = new ArrayAccessImpl();
+$data['string']="Just a simple string";
+$data['number']=33;
+$data['array']['another_string']="Alpha";
+$data['array']['some_object']=new stdClass();
+$data['array']['another_array']['x']['y']="Beta";
+$data['blank_array']=array();
+print_r(isset($data['array']));
+print_r($data['array']['non_existent']);
+print_r(isset($data['array']['non_existent']));
+print_r($data['blank_array']);
+print_r(isset($data['blank_array']));
+unset($data['blank_array']);
+print_r($data);
+$data2 = new ArrayAccessImpl2();
+$data2['string']="Just a simple string";
+$data2['number']=33;
+$data2['array']['another_string']="Alpha";
+$data2['array']['some_object']=new stdClass();
+$data2['array']['another_array']['x']['y']="Beta";
+$data2['blank_array']=array();
+print_r(isset($data2['array']));
+print_r($data2['array']['non_existent']);
+print_r(isset($data2['array']['non_existent']));
+print_r($data2['blank_array']);
+print_r(isset($data2['blank_array']));
+unset($data2['blank_array']);
+print_r($data2);
diff --git a/hphp/test/slow/array_access/437.php b/hphp/test/slow/array_access/437.php
index 09fe6adc6..6bfbc4f4d 100644
--- a/hphp/test/slow/array_access/437.php
+++ b/hphp/test/slow/array_access/437.php
@@ -1,3 +1,20 @@
 <?php
 
- class X implements ArrayAccess {  function offsetGet($f) { return $f; }  function offsetSet($f, $v) {}  function offsetUnset($f) {}  function offsetExists($f) { return false; }  }function test() {  $x = new X;  unset($x['a']);  return isset($x['b']);}var_dump(test());
\ No newline at end of file
+class X implements ArrayAccess {
+  function offsetGet($f) {
+ return $f;
+ }
+  function offsetSet($f, $v) {
+}
+  function offsetUnset($f) {
+}
+  function offsetExists($f) {
+ return false;
+ }
+  }
+function test() {
+  $x = new X;
+  unset($x['a']);
+  return isset($x['b']);
+}
+var_dump(test());
diff --git a/hphp/test/slow/array_access/438.php b/hphp/test/slow/array_access/438.php
index 74d24e8ae..813315c93 100644
--- a/hphp/test/slow/array_access/438.php
+++ b/hphp/test/slow/array_access/438.php
@@ -1,3 +1,19 @@
 <?php
 
- function test($x) {  $a = $x;  $b = $a;  $a[0]->foo = 1;  var_dump($a, $b);  $a = $x;  $b = $a;  $a[0][1] = 1;  var_dump($a, $b);  $a = $x;  $c = &$a[0];  $b = $a;  $a[0][1] = 1;  var_dump($a, $b);  }test(array(false));var_dump(array(false));
\ No newline at end of file
+function test($x) {
+  $a = $x;
+  $b = $a;
+  $a[0]->foo = 1;
+  var_dump($a, $b);
+  $a = $x;
+  $b = $a;
+  $a[0][1] = 1;
+  var_dump($a, $b);
+  $a = $x;
+  $c = &$a[0];
+  $b = $a;
+  $a[0][1] = 1;
+  var_dump($a, $b);
+  }
+test(array(false));
+var_dump(array(false));
diff --git a/hphp/test/slow/array_assignment/502.php b/hphp/test/slow/array_assignment/502.php
index 08b93417d..948c13dfd 100644
--- a/hphp/test/slow/array_assignment/502.php
+++ b/hphp/test/slow/array_assignment/502.php
@@ -1,3 +1,10 @@
 <?php
 
- $a = array(1, 2, 3);$b = $a;$b[4] = 4;var_dump($a);var_dump($b);$b = 3;var_dump($a);var_dump($b);
\ No newline at end of file
+$a = array(1, 2, 3);
+$b = $a;
+$b[4] = 4;
+var_dump($a);
+var_dump($b);
+$b = 3;
+var_dump($a);
+var_dump($b);
diff --git a/hphp/test/slow/array_assignment/503.php b/hphp/test/slow/array_assignment/503.php
index 6e23a29f7..83a2f7752 100644
--- a/hphp/test/slow/array_assignment/503.php
+++ b/hphp/test/slow/array_assignment/503.php
@@ -1,3 +1,10 @@
 <?php
 
- $a = array('1', '2', '3');$b = $a;$b[4] = '4';var_dump($a);var_dump($b);$b = '3';var_dump($a);var_dump($b);
\ No newline at end of file
+$a = array('1', '2', '3');
+$b = $a;
+$b[4] = '4';
+var_dump($a);
+var_dump($b);
+$b = '3';
+var_dump($a);
+var_dump($b);
diff --git a/hphp/test/slow/array_assignment/504.php b/hphp/test/slow/array_assignment/504.php
index ec9c5d0e4..d61f86a12 100644
--- a/hphp/test/slow/array_assignment/504.php
+++ b/hphp/test/slow/array_assignment/504.php
@@ -1,3 +1,10 @@
 <?php
 
- $a = array(1.5, 2.5, 3.5);$b = $a;$b[4] = 4.5;var_dump($a);var_dump($b);$b = 3.5;var_dump($a);var_dump($b);
\ No newline at end of file
+$a = array(1.5, 2.5, 3.5);
+$b = $a;
+$b[4] = 4.5;
+var_dump($a);
+var_dump($b);
+$b = 3.5;
+var_dump($a);
+var_dump($b);
diff --git a/hphp/test/slow/array_assignment/505.php b/hphp/test/slow/array_assignment/505.php
index 0bd8134e6..661034de8 100644
--- a/hphp/test/slow/array_assignment/505.php
+++ b/hphp/test/slow/array_assignment/505.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array(1, 'hello', 3.5);$b = $a;$b[4] = 'world';var_dump($a);var_dump($b);
\ No newline at end of file
+$a = array(1, 'hello', 3.5);
+$b = $a;
+$b[4] = 'world';
+var_dump($a);
+var_dump($b);
diff --git a/hphp/test/slow/array_assignment/506.php b/hphp/test/slow/array_assignment/506.php
index ee792fae5..7539ddcfc 100644
--- a/hphp/test/slow/array_assignment/506.php
+++ b/hphp/test/slow/array_assignment/506.php
@@ -1,3 +1,10 @@
 <?php
 
- $a = array(1, 'hello', 3.5);$b = $a;$b[4] = 'world';var_dump($a);var_dump($b);$b = 3;var_dump($a);var_dump($b);
\ No newline at end of file
+$a = array(1, 'hello', 3.5);
+$b = $a;
+$b[4] = 'world';
+var_dump($a);
+var_dump($b);
+$b = 3;
+var_dump($a);
+var_dump($b);
diff --git a/hphp/test/slow/array_assignment/507.php b/hphp/test/slow/array_assignment/507.php
index 1f31f0274..227f05086 100644
--- a/hphp/test/slow/array_assignment/507.php
+++ b/hphp/test/slow/array_assignment/507.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array('a' => '1', 2 => 2, 'c' => '3');var_dump($a);$a = array('a' => '1', 2 => 2, 'c' => '3',           'd' => array('a' => '1', 2 => 2, 'c' => '3'));var_dump($a);
\ No newline at end of file
+$a = array('a' => '1', 2 => 2, 'c' => '3');
+var_dump($a);
+$a = array('a' => '1', 2 => 2, 'c' => '3',           'd' => array('a' => '1', 2 => 2, 'c' => '3'));
+var_dump($a);
diff --git a/hphp/test/slow/array_assignment/508.php b/hphp/test/slow/array_assignment/508.php
index 243070366..397ad1d68 100644
--- a/hphp/test/slow/array_assignment/508.php
+++ b/hphp/test/slow/array_assignment/508.php
@@ -1,3 +1,8 @@
 <?php
 
- $a = array(1=>'main', 2=>'sub');$b = $a;var_dump(array_pop($b));print_r($a);var_dump(array_shift($b));print_r($a);
\ No newline at end of file
+$a = array(1=>'main', 2=>'sub');
+$b = $a;
+var_dump(array_pop($b));
+print_r($a);
+var_dump(array_shift($b));
+print_r($a);
diff --git a/hphp/test/slow/array_assignment/509.php b/hphp/test/slow/array_assignment/509.php
index b1f723465..c7ac3b719 100644
--- a/hphp/test/slow/array_assignment/509.php
+++ b/hphp/test/slow/array_assignment/509.php
@@ -1,3 +1,8 @@
 <?php
 
- $a = array(1, 2, 3);var_dump($a);array_pop($a);var_dump($a);array_shift($a);var_dump($a);
\ No newline at end of file
+$a = array(1, 2, 3);
+var_dump($a);
+array_pop($a);
+var_dump($a);
+array_shift($a);
+var_dump($a);
diff --git a/hphp/test/slow/array_assignment/510.php b/hphp/test/slow/array_assignment/510.php
index fbe99c316..2050bae91 100644
--- a/hphp/test/slow/array_assignment/510.php
+++ b/hphp/test/slow/array_assignment/510.php
@@ -1,3 +1,15 @@
 <?php
 
- function foo() {  $p = 1;  $q = 2;  $r = 3;  $s = 4;  $a = array('1'=>$p, '2'=>&$q);  $b = array('3'=>$r, '4'=>&$s);  var_dump($a);  $a += $b;  var_dump($a);  var_dump($b);}foo();
\ No newline at end of file
+function foo() {
+  $p = 1;
+  $q = 2;
+  $r = 3;
+  $s = 4;
+  $a = array('1'=>$p, '2'=>&$q);
+  $b = array('3'=>$r, '4'=>&$s);
+  var_dump($a);
+  $a += $b;
+  var_dump($a);
+  var_dump($b);
+}
+foo();
diff --git a/hphp/test/slow/array_assignment/511.php b/hphp/test/slow/array_assignment/511.php
index e0e4da664..c48d35bfd 100644
--- a/hphp/test/slow/array_assignment/511.php
+++ b/hphp/test/slow/array_assignment/511.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = false; $a['a'] = 10;
\ No newline at end of file
+$a = false;
+ $a['a'] = 10;
diff --git a/hphp/test/slow/array_assignment/512.php b/hphp/test/slow/array_assignment/512.php
index 936e82617..bf292398f 100644
--- a/hphp/test/slow/array_assignment/512.php
+++ b/hphp/test/slow/array_assignment/512.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = false; $a['a']['b'] = 10;
\ No newline at end of file
+$a = false;
+ $a['a']['b'] = 10;
diff --git a/hphp/test/slow/array_assignment/513.php b/hphp/test/slow/array_assignment/513.php
index 298d47f50..b4b381b83 100644
--- a/hphp/test/slow/array_assignment/513.php
+++ b/hphp/test/slow/array_assignment/513.php
@@ -1,7 +1,10 @@
 <?php
 
-
-class c { function f(&$a, $b) { $a = $b; } }
+class c {
+ function f(&$a, $b) {
+ $a = $b;
+ }
+ }
 function setNullVariantHelper($f, $value) {
   $a = array();
   $obj = new c;
diff --git a/hphp/test/slow/array_assignment/514.php b/hphp/test/slow/array_assignment/514.php
index 199206958..9618f8b08 100644
--- a/hphp/test/slow/array_assignment/514.php
+++ b/hphp/test/slow/array_assignment/514.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $s = '';
 $s[0] += 10;
 var_dump($s);
diff --git a/hphp/test/slow/array_copy/250.php b/hphp/test/slow/array_copy/250.php
index 36ae307e7..2112a9934 100644
--- a/hphp/test/slow/array_copy/250.php
+++ b/hphp/test/slow/array_copy/250.php
@@ -1,6 +1,6 @@
 <?php
 
- function h1() {
+function h1() {
   $x = array(1,2,3,4);
   next($x);
   $y = $x;
diff --git a/hphp/test/slow/array_copy/251.php b/hphp/test/slow/array_copy/251.php
index 7c4eb7829..944340bfe 100644
--- a/hphp/test/slow/array_copy/251.php
+++ b/hphp/test/slow/array_copy/251.php
@@ -1,6 +1,6 @@
 <?php
 
- function h2() {
+function h2() {
   $x = array(1,2,3,4);
   next($x);
   $y = $x;
diff --git a/hphp/test/slow/array_copy/252.php b/hphp/test/slow/array_copy/252.php
index d7c10ba11..59b018f06 100644
--- a/hphp/test/slow/array_copy/252.php
+++ b/hphp/test/slow/array_copy/252.php
@@ -1,6 +1,6 @@
 <?php
 
- function h3() {
+function h3() {
   $x = array(1,2,3,4);
   next($x);
   $y = $x;
diff --git a/hphp/test/slow/array_copy/253.php b/hphp/test/slow/array_copy/253.php
index c9a87c4ea..069c07491 100644
--- a/hphp/test/slow/array_copy/253.php
+++ b/hphp/test/slow/array_copy/253.php
@@ -1,6 +1,6 @@
 <?php
 
- function h4() {
+function h4() {
   $x = array(1,2,3,4);
   end($x);
   next($x);
diff --git a/hphp/test/slow/array_copy/254.php b/hphp/test/slow/array_copy/254.php
index fe7cf4a63..03ab981bd 100644
--- a/hphp/test/slow/array_copy/254.php
+++ b/hphp/test/slow/array_copy/254.php
@@ -1,6 +1,6 @@
 <?php
 
- function h5() {
+function h5() {
   $x = array(1,2,3,4);
   end($x);
   next($x);
diff --git a/hphp/test/slow/array_copy/255.php b/hphp/test/slow/array_copy/255.php
index 8f529d100..5335e4c1f 100644
--- a/hphp/test/slow/array_copy/255.php
+++ b/hphp/test/slow/array_copy/255.php
@@ -1,6 +1,6 @@
 <?php
 
- function h6() {
+function h6() {
   $x = array(1,2,3,4);
   end($x);
   next($x);
diff --git a/hphp/test/slow/array_copy/256.php b/hphp/test/slow/array_copy/256.php
index 68b462043..c9cbd2eda 100644
--- a/hphp/test/slow/array_copy/256.php
+++ b/hphp/test/slow/array_copy/256.php
@@ -1,6 +1,6 @@
 <?php
 
- function h7() {
+function h7() {
   $arr = array(0,1,2,3,4);
   end($arr);
   next($arr);
diff --git a/hphp/test/slow/array_copy/257.php b/hphp/test/slow/array_copy/257.php
index 886cfbc86..7e19d17f4 100644
--- a/hphp/test/slow/array_copy/257.php
+++ b/hphp/test/slow/array_copy/257.php
@@ -1,6 +1,6 @@
 <?php
 
- function h8() {
+function h8() {
   $arr = array(0,1,2,3,4);
   end($arr);
   next($arr);
diff --git a/hphp/test/slow/array_copy/258.php b/hphp/test/slow/array_copy/258.php
index 19b7429ab..b91b4c785 100644
--- a/hphp/test/slow/array_copy/258.php
+++ b/hphp/test/slow/array_copy/258.php
@@ -1,5 +1,7 @@
 <?php
 
-
-function f($a) { $a[0] = $a; var_dump($a); }
+function f($a) {
+ $a[0] = $a;
+ var_dump($a);
+ }
 f(false);
diff --git a/hphp/test/slow/array_copy/259.php b/hphp/test/slow/array_copy/259.php
index 1402e61be..28566466a 100644
--- a/hphp/test/slow/array_copy/259.php
+++ b/hphp/test/slow/array_copy/259.php
@@ -1,8 +1,8 @@
 <?php
 
-
 function f($b) {
   $a = $b ? 0 : array('x' => $b);
-  $a[0] = $a; var_dump($a);
+  $a[0] = $a;
+ var_dump($a);
 }
 f(false);
diff --git a/hphp/test/slow/array_copy/260.php b/hphp/test/slow/array_copy/260.php
index 8f97b9852..e2d093b82 100644
--- a/hphp/test/slow/array_copy/260.php
+++ b/hphp/test/slow/array_copy/260.php
@@ -1,5 +1,7 @@
 <?php
 
-
-function f($a) { $a[] = $a; var_dump($a); }
+function f($a) {
+ $a[] = $a;
+ var_dump($a);
+ }
 f(false);
diff --git a/hphp/test/slow/array_copy/261.php b/hphp/test/slow/array_copy/261.php
index 573b0cb7f..796e871a5 100644
--- a/hphp/test/slow/array_copy/261.php
+++ b/hphp/test/slow/array_copy/261.php
@@ -1,8 +1,9 @@
 <?php
 
-
 function f($b) {
   $a = $b ? 0 : array('x' => $b);
-  $a2 = &$a; $a[] = $a2; var_dump($a);
+  $a2 = &$a;
+ $a[] = $a2;
+ var_dump($a);
 }
 f(false);
diff --git a/hphp/test/slow/array_copy/262.php b/hphp/test/slow/array_copy/262.php
index 91b74ed65..d9effbfc8 100644
--- a/hphp/test/slow/array_copy/262.php
+++ b/hphp/test/slow/array_copy/262.php
@@ -1,8 +1,8 @@
 <?php
 
-
 function f($b) {
   $a = $b ? 0 : array($b);
-  $a[1][0] = $a; var_dump($a);
+  $a[1][0] = $a;
+ var_dump($a);
 }
 f(false);
diff --git a/hphp/test/slow/array_cse/533.php b/hphp/test/slow/array_cse/533.php
index 9091496be..7205b0c32 100644
--- a/hphp/test/slow/array_cse/533.php
+++ b/hphp/test/slow/array_cse/533.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x, $y) {
   var_dump($x[$y]);
   if ($x[$y]) print 'HI';
diff --git a/hphp/test/slow/array_cse/534.php b/hphp/test/slow/array_cse/534.php
index 7308b4aca..9ac69c868 100644
--- a/hphp/test/slow/array_cse/534.php
+++ b/hphp/test/slow/array_cse/534.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f(array $a = null, $e) {
   $a[$e]['foo'] = 30;
   $x = $a[$e]['baz'];
diff --git a/hphp/test/slow/array_cse/535.php b/hphp/test/slow/array_cse/535.php
index 3a01c00ee..896a952d6 100644
--- a/hphp/test/slow/array_cse/535.php
+++ b/hphp/test/slow/array_cse/535.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f(array $a, $e) {
   $a[$e][$e] = 30;
   $x = new stdClass();
diff --git a/hphp/test/slow/array_cse/536.php b/hphp/test/slow/array_cse/536.php
index 6fded6b3a..a9ddabdd3 100644
--- a/hphp/test/slow/array_cse/536.php
+++ b/hphp/test/slow/array_cse/536.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x) {
   var_dump($x[0]);
   $x =& $x[0];
diff --git a/hphp/test/slow/array_cse/538.php b/hphp/test/slow/array_cse/538.php
index a589ad1b5..e044fd062 100644
--- a/hphp/test/slow/array_cse/538.php
+++ b/hphp/test/slow/array_cse/538.php
@@ -1,6 +1,8 @@
+<?php
+
 function f1($x) {
-  if (count($x) > 0) { 
-    var_dump($x); 
+  if (count($x) > 0) {
+    var_dump($x);
   } else if (count($x[0]) > 0) {
     var_dump($x[0]);
   }
@@ -8,7 +10,9 @@ function f1($x) {
 f1(array(array(0, 1, 2)));
 f1('abc');
 
-function id($x) { return $x; }
+function id($x) {
+  return $x;
+}
 function f2($x) {
   if ($x[0]) var_dump(id($x), $x[0]);
 }
diff --git a/hphp/test/slow/array_cse/538.php.expect b/hphp/test/slow/array_cse/538.php.expect
index a589ad1b5..bed1b92a2 100644
--- a/hphp/test/slow/array_cse/538.php.expect
+++ b/hphp/test/slow/array_cse/538.php.expect
@@ -1,36 +1,23 @@
-function f1($x) {
-  if (count($x) > 0) { 
-    var_dump($x); 
-  } else if (count($x[0]) > 0) {
-    var_dump($x[0]);
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
   }
 }
-f1(array(array(0, 1, 2)));
-f1('abc');
-
-function id($x) { return $x; }
-function f2($x) {
-  if ($x[0]) var_dump(id($x), $x[0]);
+string(3) "abc"
+array(1) {
+  [0]=>
+  int(10)
 }
-f2(null);
-f2(array());
-f2(array(10));
-
-function f3($x) {
-  var_dump($x[0].'/'. $x[1]);
-  var_dump($x[0].'/'. $x[1]);
-}
-f3(array('first', 'second'));
-f3('AB');
-
-function f4($x) {
-  $z = @id($x[0]);
-  var_dump($z);
-  var_dump($x[0]);
-}
-f4(array('e1', 'e2'));
-
-function f5($x) {
-  if ($x[0][id($x[0])-1]) var_dump($x);
-}
-f5(array(0, 1, 2));
+int(10)
+string(12) "first/second"
+string(12) "first/second"
+string(3) "A/B"
+string(3) "A/B"
+string(2) "e1"
+string(2) "e1"
diff --git a/hphp/test/slow/array_cse/539.php b/hphp/test/slow/array_cse/539.php
index 36adbd0eb..1918cd3cc 100644
--- a/hphp/test/slow/array_cse/539.php
+++ b/hphp/test/slow/array_cse/539.php
@@ -1,4 +1,8 @@
-function id($x) { return $x; }
+<?php
+
+function id($x) {
+  return $x;
+}
 function f1($x) {
   $z = id($x[0]);
   foreach ($x[0] as $a) {
diff --git a/hphp/test/slow/array_cse/539.php.expect b/hphp/test/slow/array_cse/539.php.expect
index 36adbd0eb..5e7fe11b8 100644
--- a/hphp/test/slow/array_cse/539.php.expect
+++ b/hphp/test/slow/array_cse/539.php.expect
@@ -1,21 +1,3 @@
-function id($x) { return $x; }
-function f1($x) {
-  $z = id($x[0]);
-  foreach ($x[0] as $a) {
-    $z[] = array(id($z), count($x[0]));
-  }
-}
-f1(array(array(0, 1, 2, 3)));
-
-function f2($x) {
-  var_dump($x[0]);
-  $y = 'foo' . $x[0] . 'bar';
-}
-f2('foobar');
-
-function f3($x) {
-  $x = is_string($x[0]) ? $x[0] : get_class($x[0]);
-  return $x;
-}
-var_dump(f3('abc'));
-var_dump(f3(array(new stdClass)));
+string(1) "f"
+string(1) "a"
+string(8) "stdClass"
diff --git a/hphp/test/slow/array_cse/540.php b/hphp/test/slow/array_cse/540.php
index 5c3677b47..3e0cbf2ac 100644
--- a/hphp/test/slow/array_cse/540.php
+++ b/hphp/test/slow/array_cse/540.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo($a, $b, $c, $d) {
   var_dump($a, $b, $c, $d);
 }
diff --git a/hphp/test/slow/array_cse/541.php b/hphp/test/slow/array_cse/541.php
index ffe300021..cc65073c5 100644
--- a/hphp/test/slow/array_cse/541.php
+++ b/hphp/test/slow/array_cse/541.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $GLOBALS['foo'] = 10;
 $GLOBALS['bar'] = 
   array(
diff --git a/hphp/test/slow/array_cse/542.php b/hphp/test/slow/array_cse/542.php
index 79ab045f9..96e98038a 100644
--- a/hphp/test/slow/array_cse/542.php
+++ b/hphp/test/slow/array_cse/542.php
@@ -1,7 +1,8 @@
 <?php
 
-
-function blocker() { print 'block'; }
+function blocker() {
+ print 'block';
+ }
 function f($x) {
   $x = (string) $x;
   blocker();
diff --git a/hphp/test/slow/array_cse/543.php b/hphp/test/slow/array_cse/543.php
index d4d306322..5058c73b6 100644
--- a/hphp/test/slow/array_cse/543.php
+++ b/hphp/test/slow/array_cse/543.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f1($x) {
   if ($x[1]) goto x_t;
   var_dump($x[0]);
@@ -17,7 +16,8 @@ function f2($x) {
 function f3($x, $y) {
   do {
     var_dump($x[0]);
-  } while ($x[0] && $y);
+  }
+ while ($x[0] && $y);
   var_dump($x[0]);
 }
 function f4($x) {
@@ -34,7 +34,9 @@ function f5($x) {
 }
 function f6($x, $y, $z) {
   if ($z) goto my_clause;
-  if ($y) { var_dump($y); }
+  if ($y) {
+ var_dump($y);
+ }
   else if ($x[0]) {
     var_dump($x[0]);
     my_clause:
diff --git a/hphp/test/slow/array_cse/544.php b/hphp/test/slow/array_cse/544.php
index c167c4f05..856a63083 100644
--- a/hphp/test/slow/array_cse/544.php
+++ b/hphp/test/slow/array_cse/544.php
@@ -1,8 +1,11 @@
 <?php
 
-
-function blocker() { print 'block'; }
-function id($x) { return $x; }
+function blocker() {
+ print 'block';
+ }
+function id($x) {
+ return $x;
+ }
 function f($x, $y) {
   $y = $x[$y[0]] ? $x[$y[0]] : id($x[$y[0]]);
   blocker();
diff --git a/hphp/test/slow/array_escalation/263.php b/hphp/test/slow/array_escalation/263.php
index 515519539..74c65d61a 100644
--- a/hphp/test/slow/array_escalation/263.php
+++ b/hphp/test/slow/array_escalation/263.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[] = 1;              var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[] = 1;
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/264.php b/hphp/test/slow/array_escalation/264.php
index b28338abd..75470b3d3 100644
--- a/hphp/test/slow/array_escalation/264.php
+++ b/hphp/test/slow/array_escalation/264.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[] = 'test';         var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[] = 'test';
+         var_dump($a);
diff --git a/hphp/test/slow/array_escalation/265.php b/hphp/test/slow/array_escalation/265.php
index a12fc0482..3355c45f7 100644
--- a/hphp/test/slow/array_escalation/265.php
+++ b/hphp/test/slow/array_escalation/265.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[] = array(0);       var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[] = array(0);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/266.php b/hphp/test/slow/array_escalation/266.php
index f61e3117e..7e4517d11 100644
--- a/hphp/test/slow/array_escalation/266.php
+++ b/hphp/test/slow/array_escalation/266.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[0] = 1;             var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[0] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/267.php b/hphp/test/slow/array_escalation/267.php
index 0b46f866b..9bf385321 100644
--- a/hphp/test/slow/array_escalation/267.php
+++ b/hphp/test/slow/array_escalation/267.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[0] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[0] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/268.php b/hphp/test/slow/array_escalation/268.php
index 97dd993b7..402fe70f4 100644
--- a/hphp/test/slow/array_escalation/268.php
+++ b/hphp/test/slow/array_escalation/268.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[0] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[0] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/269.php b/hphp/test/slow/array_escalation/269.php
index d6f2e8c76..419aaeb09 100644
--- a/hphp/test/slow/array_escalation/269.php
+++ b/hphp/test/slow/array_escalation/269.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[1] = 1;             var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[1] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/270.php b/hphp/test/slow/array_escalation/270.php
index 8c6171f14..ecb57e777 100644
--- a/hphp/test/slow/array_escalation/270.php
+++ b/hphp/test/slow/array_escalation/270.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[1] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[1] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/271.php b/hphp/test/slow/array_escalation/271.php
index 55563a30d..d6cb27be8 100644
--- a/hphp/test/slow/array_escalation/271.php
+++ b/hphp/test/slow/array_escalation/271.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[1] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[1] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/272.php b/hphp/test/slow/array_escalation/272.php
index b7dc5cf95..48476da94 100644
--- a/hphp/test/slow/array_escalation/272.php
+++ b/hphp/test/slow/array_escalation/272.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[2] = 1;             var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[2] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/273.php b/hphp/test/slow/array_escalation/273.php
index c3e57674c..9d7e99db3 100644
--- a/hphp/test/slow/array_escalation/273.php
+++ b/hphp/test/slow/array_escalation/273.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[2] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[2] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/274.php b/hphp/test/slow/array_escalation/274.php
index 3e3b396f0..b4c8c3a9f 100644
--- a/hphp/test/slow/array_escalation/274.php
+++ b/hphp/test/slow/array_escalation/274.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a[2] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[2] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/275.php b/hphp/test/slow/array_escalation/275.php
index 0b85faa93..e47a40c77 100644
--- a/hphp/test/slow/array_escalation/275.php
+++ b/hphp/test/slow/array_escalation/275.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a['test'] = 1;        var_dump($a);
\ No newline at end of file
+$a = array();
+ $a['test'] = 1;
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/276.php b/hphp/test/slow/array_escalation/276.php
index ca0bc01a4..45f506582 100644
--- a/hphp/test/slow/array_escalation/276.php
+++ b/hphp/test/slow/array_escalation/276.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a['test'] = 'test';   var_dump($a);
\ No newline at end of file
+$a = array();
+ $a['test'] = 'test';
+   var_dump($a);
diff --git a/hphp/test/slow/array_escalation/277.php b/hphp/test/slow/array_escalation/277.php
index 96b51edd5..3b9eaaaa9 100644
--- a/hphp/test/slow/array_escalation/277.php
+++ b/hphp/test/slow/array_escalation/277.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a['test'] = array(0); var_dump($a);
\ No newline at end of file
+$a = array();
+ $a['test'] = array(0);
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/278.php b/hphp/test/slow/array_escalation/278.php
index e104950ad..015bcc299 100644
--- a/hphp/test/slow/array_escalation/278.php
+++ b/hphp/test/slow/array_escalation/278.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[] = 1;              var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[] = 1;
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/279.php b/hphp/test/slow/array_escalation/279.php
index b452bf222..ef36e7946 100644
--- a/hphp/test/slow/array_escalation/279.php
+++ b/hphp/test/slow/array_escalation/279.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[] = 'test';         var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[] = 'test';
+         var_dump($a);
diff --git a/hphp/test/slow/array_escalation/280.php b/hphp/test/slow/array_escalation/280.php
index 800115d6e..980c8413a 100644
--- a/hphp/test/slow/array_escalation/280.php
+++ b/hphp/test/slow/array_escalation/280.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[] = array(0);       var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[] = array(0);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/281.php b/hphp/test/slow/array_escalation/281.php
index d37f7d667..3ba796a16 100644
--- a/hphp/test/slow/array_escalation/281.php
+++ b/hphp/test/slow/array_escalation/281.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[0] = 1;             var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[0] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/282.php b/hphp/test/slow/array_escalation/282.php
index 10d0d3c79..9a753e651 100644
--- a/hphp/test/slow/array_escalation/282.php
+++ b/hphp/test/slow/array_escalation/282.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[0] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[0] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/283.php b/hphp/test/slow/array_escalation/283.php
index 190042c05..32bec40ef 100644
--- a/hphp/test/slow/array_escalation/283.php
+++ b/hphp/test/slow/array_escalation/283.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[0] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[0] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/284.php b/hphp/test/slow/array_escalation/284.php
index c2746abb7..09926269e 100644
--- a/hphp/test/slow/array_escalation/284.php
+++ b/hphp/test/slow/array_escalation/284.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[1] = 1;             var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[1] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/285.php b/hphp/test/slow/array_escalation/285.php
index c70b7fb71..ac33916e1 100644
--- a/hphp/test/slow/array_escalation/285.php
+++ b/hphp/test/slow/array_escalation/285.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[1] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[1] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/286.php b/hphp/test/slow/array_escalation/286.php
index b38036b7d..640ce5c74 100644
--- a/hphp/test/slow/array_escalation/286.php
+++ b/hphp/test/slow/array_escalation/286.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[1] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[1] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/287.php b/hphp/test/slow/array_escalation/287.php
index be82ee152..cf6dbb83c 100644
--- a/hphp/test/slow/array_escalation/287.php
+++ b/hphp/test/slow/array_escalation/287.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[2] = 1;             var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[2] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/288.php b/hphp/test/slow/array_escalation/288.php
index 5957b084e..d79265019 100644
--- a/hphp/test/slow/array_escalation/288.php
+++ b/hphp/test/slow/array_escalation/288.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[2] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[2] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/289.php b/hphp/test/slow/array_escalation/289.php
index 886ad9947..e850abbf5 100644
--- a/hphp/test/slow/array_escalation/289.php
+++ b/hphp/test/slow/array_escalation/289.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a[2] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a[2] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/290.php b/hphp/test/slow/array_escalation/290.php
index e077b44b8..80a6702a9 100644
--- a/hphp/test/slow/array_escalation/290.php
+++ b/hphp/test/slow/array_escalation/290.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a['test'] = 1;        var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a['test'] = 1;
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/291.php b/hphp/test/slow/array_escalation/291.php
index 0e244e70d..687a69830 100644
--- a/hphp/test/slow/array_escalation/291.php
+++ b/hphp/test/slow/array_escalation/291.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a['test'] = 'test';   var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a['test'] = 'test';
+   var_dump($a);
diff --git a/hphp/test/slow/array_escalation/292.php b/hphp/test/slow/array_escalation/292.php
index c227752d8..185bb2365 100644
--- a/hphp/test/slow/array_escalation/292.php
+++ b/hphp/test/slow/array_escalation/292.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a['test'] = array(0); var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a['test'] = array(0);
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/293.php b/hphp/test/slow/array_escalation/293.php
index 6b82bdf9c..f1229eff6 100644
--- a/hphp/test/slow/array_escalation/293.php
+++ b/hphp/test/slow/array_escalation/293.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[] = 1;              var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[] = 1;
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/294.php b/hphp/test/slow/array_escalation/294.php
index d21daa540..812dde59d 100644
--- a/hphp/test/slow/array_escalation/294.php
+++ b/hphp/test/slow/array_escalation/294.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[] = 'test';         var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[] = 'test';
+         var_dump($a);
diff --git a/hphp/test/slow/array_escalation/295.php b/hphp/test/slow/array_escalation/295.php
index 117db1a90..dd8924e71 100644
--- a/hphp/test/slow/array_escalation/295.php
+++ b/hphp/test/slow/array_escalation/295.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[] = array(0);       var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[] = array(0);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/296.php b/hphp/test/slow/array_escalation/296.php
index 6e8b78159..87760610e 100644
--- a/hphp/test/slow/array_escalation/296.php
+++ b/hphp/test/slow/array_escalation/296.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[0] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[0] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/297.php b/hphp/test/slow/array_escalation/297.php
index bc0d50c05..2c66463ea 100644
--- a/hphp/test/slow/array_escalation/297.php
+++ b/hphp/test/slow/array_escalation/297.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[0] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[0] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/298.php b/hphp/test/slow/array_escalation/298.php
index 80dac3053..57d3d51da 100644
--- a/hphp/test/slow/array_escalation/298.php
+++ b/hphp/test/slow/array_escalation/298.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[0] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[0] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/299.php b/hphp/test/slow/array_escalation/299.php
index b56f481a2..f4f5de464 100644
--- a/hphp/test/slow/array_escalation/299.php
+++ b/hphp/test/slow/array_escalation/299.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[1] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[1] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/300.php b/hphp/test/slow/array_escalation/300.php
index a83642524..49b072149 100644
--- a/hphp/test/slow/array_escalation/300.php
+++ b/hphp/test/slow/array_escalation/300.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[1] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[1] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/301.php b/hphp/test/slow/array_escalation/301.php
index 55cbd6c73..41c65db43 100644
--- a/hphp/test/slow/array_escalation/301.php
+++ b/hphp/test/slow/array_escalation/301.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[1] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[1] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/302.php b/hphp/test/slow/array_escalation/302.php
index b4cb8cb2c..d7ee13cfc 100644
--- a/hphp/test/slow/array_escalation/302.php
+++ b/hphp/test/slow/array_escalation/302.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[2] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[2] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/303.php b/hphp/test/slow/array_escalation/303.php
index d9beed5dd..93f899d09 100644
--- a/hphp/test/slow/array_escalation/303.php
+++ b/hphp/test/slow/array_escalation/303.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[2] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[2] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/304.php b/hphp/test/slow/array_escalation/304.php
index 5559ee583..299634c86 100644
--- a/hphp/test/slow/array_escalation/304.php
+++ b/hphp/test/slow/array_escalation/304.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a[2] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a[2] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/305.php b/hphp/test/slow/array_escalation/305.php
index 508095362..f2249a526 100644
--- a/hphp/test/slow/array_escalation/305.php
+++ b/hphp/test/slow/array_escalation/305.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a['test'] = 1;        var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a['test'] = 1;
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/306.php b/hphp/test/slow/array_escalation/306.php
index bdbbd3364..02854b5a5 100644
--- a/hphp/test/slow/array_escalation/306.php
+++ b/hphp/test/slow/array_escalation/306.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a['test'] = 'test';   var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a['test'] = 'test';
+   var_dump($a);
diff --git a/hphp/test/slow/array_escalation/307.php b/hphp/test/slow/array_escalation/307.php
index 9eca1085a..f388c9416 100644
--- a/hphp/test/slow/array_escalation/307.php
+++ b/hphp/test/slow/array_escalation/307.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a['test'] = array(0); var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a['test'] = array(0);
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/308.php b/hphp/test/slow/array_escalation/308.php
index 092f01c9f..4e1a5d837 100644
--- a/hphp/test/slow/array_escalation/308.php
+++ b/hphp/test/slow/array_escalation/308.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[] = 1;              var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[] = 1;
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/309.php b/hphp/test/slow/array_escalation/309.php
index 170f37635..e1c8a30d7 100644
--- a/hphp/test/slow/array_escalation/309.php
+++ b/hphp/test/slow/array_escalation/309.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[] = 'test';         var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[] = 'test';
+         var_dump($a);
diff --git a/hphp/test/slow/array_escalation/310.php b/hphp/test/slow/array_escalation/310.php
index a04fad495..68487cbb6 100644
--- a/hphp/test/slow/array_escalation/310.php
+++ b/hphp/test/slow/array_escalation/310.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[] = array(0);       var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[] = array(0);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/311.php b/hphp/test/slow/array_escalation/311.php
index 01f20dfdd..ef4f4b28f 100644
--- a/hphp/test/slow/array_escalation/311.php
+++ b/hphp/test/slow/array_escalation/311.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[0] = 1;             var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[0] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/312.php b/hphp/test/slow/array_escalation/312.php
index a16f7cbe5..563048ce9 100644
--- a/hphp/test/slow/array_escalation/312.php
+++ b/hphp/test/slow/array_escalation/312.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[0] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[0] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/313.php b/hphp/test/slow/array_escalation/313.php
index 2bd68016f..9f1af447d 100644
--- a/hphp/test/slow/array_escalation/313.php
+++ b/hphp/test/slow/array_escalation/313.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[0] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[0] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/314.php b/hphp/test/slow/array_escalation/314.php
index fa6a6e81e..769094b9a 100644
--- a/hphp/test/slow/array_escalation/314.php
+++ b/hphp/test/slow/array_escalation/314.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[1] = 1;             var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[1] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/315.php b/hphp/test/slow/array_escalation/315.php
index 60e7226a6..650c50d22 100644
--- a/hphp/test/slow/array_escalation/315.php
+++ b/hphp/test/slow/array_escalation/315.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[1] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[1] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/316.php b/hphp/test/slow/array_escalation/316.php
index 955f67843..b935fef59 100644
--- a/hphp/test/slow/array_escalation/316.php
+++ b/hphp/test/slow/array_escalation/316.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[1] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[1] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/317.php b/hphp/test/slow/array_escalation/317.php
index f9a532779..d212af2ba 100644
--- a/hphp/test/slow/array_escalation/317.php
+++ b/hphp/test/slow/array_escalation/317.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[2] = 1;             var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[2] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/318.php b/hphp/test/slow/array_escalation/318.php
index 6cb94a16a..32057438f 100644
--- a/hphp/test/slow/array_escalation/318.php
+++ b/hphp/test/slow/array_escalation/318.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[2] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[2] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/319.php b/hphp/test/slow/array_escalation/319.php
index 2c040b5e1..57aa87a73 100644
--- a/hphp/test/slow/array_escalation/319.php
+++ b/hphp/test/slow/array_escalation/319.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a[2] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a[2] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/320.php b/hphp/test/slow/array_escalation/320.php
index 35b21e20d..c6c33ccf8 100644
--- a/hphp/test/slow/array_escalation/320.php
+++ b/hphp/test/slow/array_escalation/320.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a['test'] = 1;        var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a['test'] = 1;
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/321.php b/hphp/test/slow/array_escalation/321.php
index 8d55a1ea6..9f0c7dbe9 100644
--- a/hphp/test/slow/array_escalation/321.php
+++ b/hphp/test/slow/array_escalation/321.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a['test'] = 'test';   var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a['test'] = 'test';
+   var_dump($a);
diff --git a/hphp/test/slow/array_escalation/322.php b/hphp/test/slow/array_escalation/322.php
index dcb18b100..8ec553962 100644
--- a/hphp/test/slow/array_escalation/322.php
+++ b/hphp/test/slow/array_escalation/322.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a['test'] = array(0); var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a['test'] = array(0);
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/323.php b/hphp/test/slow/array_escalation/323.php
index 675c526ab..78ffba90a 100644
--- a/hphp/test/slow/array_escalation/323.php
+++ b/hphp/test/slow/array_escalation/323.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[] = 1;              var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[] = 1;
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/324.php b/hphp/test/slow/array_escalation/324.php
index cac33ac38..fac770740 100644
--- a/hphp/test/slow/array_escalation/324.php
+++ b/hphp/test/slow/array_escalation/324.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[] = 'test';         var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[] = 'test';
+         var_dump($a);
diff --git a/hphp/test/slow/array_escalation/325.php b/hphp/test/slow/array_escalation/325.php
index c76a419a2..55dcc409b 100644
--- a/hphp/test/slow/array_escalation/325.php
+++ b/hphp/test/slow/array_escalation/325.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[] = array(0);       var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[] = array(0);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/326.php b/hphp/test/slow/array_escalation/326.php
index 5ee62cde9..a391322c3 100644
--- a/hphp/test/slow/array_escalation/326.php
+++ b/hphp/test/slow/array_escalation/326.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[0] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[0] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/327.php b/hphp/test/slow/array_escalation/327.php
index 1a2e50fce..bdcb3b595 100644
--- a/hphp/test/slow/array_escalation/327.php
+++ b/hphp/test/slow/array_escalation/327.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[0] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[0] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/328.php b/hphp/test/slow/array_escalation/328.php
index 13bc0c95f..7ac1bd9e1 100644
--- a/hphp/test/slow/array_escalation/328.php
+++ b/hphp/test/slow/array_escalation/328.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[0] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[0] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/329.php b/hphp/test/slow/array_escalation/329.php
index aa247725c..429a49c3a 100644
--- a/hphp/test/slow/array_escalation/329.php
+++ b/hphp/test/slow/array_escalation/329.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[1] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[1] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/330.php b/hphp/test/slow/array_escalation/330.php
index 400c73ece..cb6fdd8f2 100644
--- a/hphp/test/slow/array_escalation/330.php
+++ b/hphp/test/slow/array_escalation/330.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[1] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[1] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/331.php b/hphp/test/slow/array_escalation/331.php
index ee9afe668..f08ed32c9 100644
--- a/hphp/test/slow/array_escalation/331.php
+++ b/hphp/test/slow/array_escalation/331.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[1] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[1] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/332.php b/hphp/test/slow/array_escalation/332.php
index a2c3b07c6..7671700b5 100644
--- a/hphp/test/slow/array_escalation/332.php
+++ b/hphp/test/slow/array_escalation/332.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[2] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[2] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/333.php b/hphp/test/slow/array_escalation/333.php
index c96060632..3d42a786d 100644
--- a/hphp/test/slow/array_escalation/333.php
+++ b/hphp/test/slow/array_escalation/333.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[2] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[2] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/334.php b/hphp/test/slow/array_escalation/334.php
index e8d55cb00..13727b9fa 100644
--- a/hphp/test/slow/array_escalation/334.php
+++ b/hphp/test/slow/array_escalation/334.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a[2] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a[2] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/335.php b/hphp/test/slow/array_escalation/335.php
index 78d79a203..7b9051670 100644
--- a/hphp/test/slow/array_escalation/335.php
+++ b/hphp/test/slow/array_escalation/335.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a['test'] = 1;        var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a['test'] = 1;
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/336.php b/hphp/test/slow/array_escalation/336.php
index dc5cb359c..d6c8b1b9e 100644
--- a/hphp/test/slow/array_escalation/336.php
+++ b/hphp/test/slow/array_escalation/336.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a['test'] = 'test';   var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a['test'] = 'test';
+   var_dump($a);
diff --git a/hphp/test/slow/array_escalation/337.php b/hphp/test/slow/array_escalation/337.php
index d588707bc..c970032fc 100644
--- a/hphp/test/slow/array_escalation/337.php
+++ b/hphp/test/slow/array_escalation/337.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a['test'] = array(0); var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a['test'] = array(0);
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/338.php b/hphp/test/slow/array_escalation/338.php
index 1154f39c6..eb33c506b 100644
--- a/hphp/test/slow/array_escalation/338.php
+++ b/hphp/test/slow/array_escalation/338.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[] = 1;              var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[] = 1;
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/339.php b/hphp/test/slow/array_escalation/339.php
index b3da8874b..2f1e93b04 100644
--- a/hphp/test/slow/array_escalation/339.php
+++ b/hphp/test/slow/array_escalation/339.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[] = 'test';         var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[] = 'test';
+         var_dump($a);
diff --git a/hphp/test/slow/array_escalation/340.php b/hphp/test/slow/array_escalation/340.php
index 46e2e04c8..696fac1d6 100644
--- a/hphp/test/slow/array_escalation/340.php
+++ b/hphp/test/slow/array_escalation/340.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[] = array(0);       var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[] = array(0);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/341.php b/hphp/test/slow/array_escalation/341.php
index b6f52ac33..03e839dbe 100644
--- a/hphp/test/slow/array_escalation/341.php
+++ b/hphp/test/slow/array_escalation/341.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[0] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[0] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/342.php b/hphp/test/slow/array_escalation/342.php
index 15a287b9c..62af04dd5 100644
--- a/hphp/test/slow/array_escalation/342.php
+++ b/hphp/test/slow/array_escalation/342.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[0] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[0] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/343.php b/hphp/test/slow/array_escalation/343.php
index e5a30949f..e892daffc 100644
--- a/hphp/test/slow/array_escalation/343.php
+++ b/hphp/test/slow/array_escalation/343.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[0] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[0] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/344.php b/hphp/test/slow/array_escalation/344.php
index ee1d8700c..83ed396f7 100644
--- a/hphp/test/slow/array_escalation/344.php
+++ b/hphp/test/slow/array_escalation/344.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[1] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[1] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/345.php b/hphp/test/slow/array_escalation/345.php
index c3ac5183b..8c22001f4 100644
--- a/hphp/test/slow/array_escalation/345.php
+++ b/hphp/test/slow/array_escalation/345.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[1] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[1] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/346.php b/hphp/test/slow/array_escalation/346.php
index f0f6b6e1e..2a4ed643f 100644
--- a/hphp/test/slow/array_escalation/346.php
+++ b/hphp/test/slow/array_escalation/346.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[1] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[1] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/347.php b/hphp/test/slow/array_escalation/347.php
index 6ce7fbcd6..758a93840 100644
--- a/hphp/test/slow/array_escalation/347.php
+++ b/hphp/test/slow/array_escalation/347.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[2] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[2] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/348.php b/hphp/test/slow/array_escalation/348.php
index 6c843a8c1..84bd4bbe8 100644
--- a/hphp/test/slow/array_escalation/348.php
+++ b/hphp/test/slow/array_escalation/348.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[2] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[2] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/349.php b/hphp/test/slow/array_escalation/349.php
index f61d6f5df..77e2888fa 100644
--- a/hphp/test/slow/array_escalation/349.php
+++ b/hphp/test/slow/array_escalation/349.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a[2] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a[2] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/350.php b/hphp/test/slow/array_escalation/350.php
index 51cf8bef5..44c594689 100644
--- a/hphp/test/slow/array_escalation/350.php
+++ b/hphp/test/slow/array_escalation/350.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a['test'] = 1;        var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a['test'] = 1;
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/351.php b/hphp/test/slow/array_escalation/351.php
index cf81ad379..3625607ed 100644
--- a/hphp/test/slow/array_escalation/351.php
+++ b/hphp/test/slow/array_escalation/351.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a['test'] = 'test';   var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a['test'] = 'test';
+   var_dump($a);
diff --git a/hphp/test/slow/array_escalation/352.php b/hphp/test/slow/array_escalation/352.php
index bff7cf66a..052ec5018 100644
--- a/hphp/test/slow/array_escalation/352.php
+++ b/hphp/test/slow/array_escalation/352.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a['test'] = array(0); var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a['test'] = array(0);
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/353.php b/hphp/test/slow/array_escalation/353.php
index 20ce2f08c..0e26c8767 100644
--- a/hphp/test/slow/array_escalation/353.php
+++ b/hphp/test/slow/array_escalation/353.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[] = 1;              var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[] = 1;
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/354.php b/hphp/test/slow/array_escalation/354.php
index d80be3be4..004f99883 100644
--- a/hphp/test/slow/array_escalation/354.php
+++ b/hphp/test/slow/array_escalation/354.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[] = 'test';         var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[] = 'test';
+         var_dump($a);
diff --git a/hphp/test/slow/array_escalation/355.php b/hphp/test/slow/array_escalation/355.php
index 2f1c255ad..d9cf2678a 100644
--- a/hphp/test/slow/array_escalation/355.php
+++ b/hphp/test/slow/array_escalation/355.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[] = array(0);       var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[] = array(0);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/356.php b/hphp/test/slow/array_escalation/356.php
index 61668f4d4..77a6abe47 100644
--- a/hphp/test/slow/array_escalation/356.php
+++ b/hphp/test/slow/array_escalation/356.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[0] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[0] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/357.php b/hphp/test/slow/array_escalation/357.php
index 9c89e7555..911b3be0b 100644
--- a/hphp/test/slow/array_escalation/357.php
+++ b/hphp/test/slow/array_escalation/357.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[0] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[0] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/358.php b/hphp/test/slow/array_escalation/358.php
index 0750fa921..72b46fefd 100644
--- a/hphp/test/slow/array_escalation/358.php
+++ b/hphp/test/slow/array_escalation/358.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[0] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[0] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/359.php b/hphp/test/slow/array_escalation/359.php
index 15f160fd9..bbf449391 100644
--- a/hphp/test/slow/array_escalation/359.php
+++ b/hphp/test/slow/array_escalation/359.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[1] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[1] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/360.php b/hphp/test/slow/array_escalation/360.php
index a5a038feb..6bac61b88 100644
--- a/hphp/test/slow/array_escalation/360.php
+++ b/hphp/test/slow/array_escalation/360.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[1] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[1] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/361.php b/hphp/test/slow/array_escalation/361.php
index fe131497a..6aa10aad7 100644
--- a/hphp/test/slow/array_escalation/361.php
+++ b/hphp/test/slow/array_escalation/361.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[1] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[1] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/362.php b/hphp/test/slow/array_escalation/362.php
index 1285771e2..d41ea27c9 100644
--- a/hphp/test/slow/array_escalation/362.php
+++ b/hphp/test/slow/array_escalation/362.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[2] = 1;             var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[2] = 1;
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/363.php b/hphp/test/slow/array_escalation/363.php
index bd0eb451a..9fad8b08f 100644
--- a/hphp/test/slow/array_escalation/363.php
+++ b/hphp/test/slow/array_escalation/363.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[2] = 'test';        var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[2] = 'test';
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/364.php b/hphp/test/slow/array_escalation/364.php
index dadbc1c89..bd9568ba8 100644
--- a/hphp/test/slow/array_escalation/364.php
+++ b/hphp/test/slow/array_escalation/364.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a[2] = array(0);      var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a[2] = array(0);
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/365.php b/hphp/test/slow/array_escalation/365.php
index aab7ee1ff..8b2da10d3 100644
--- a/hphp/test/slow/array_escalation/365.php
+++ b/hphp/test/slow/array_escalation/365.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a['test'] = 1;        var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a['test'] = 1;
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/366.php b/hphp/test/slow/array_escalation/366.php
index 98f32ad55..0652f3a3c 100644
--- a/hphp/test/slow/array_escalation/366.php
+++ b/hphp/test/slow/array_escalation/366.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a['test'] = 'test';   var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a['test'] = 'test';
+   var_dump($a);
diff --git a/hphp/test/slow/array_escalation/367.php b/hphp/test/slow/array_escalation/367.php
index 2729c422c..9fb6aacfc 100644
--- a/hphp/test/slow/array_escalation/367.php
+++ b/hphp/test/slow/array_escalation/367.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a['test'] = array(0); var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a['test'] = array(0);
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/368.php b/hphp/test/slow/array_escalation/368.php
index b6c407211..7676339a5 100644
--- a/hphp/test/slow/array_escalation/368.php
+++ b/hphp/test/slow/array_escalation/368.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a += array();                var_dump($a);
\ No newline at end of file
+$a = array();
+ $a += array();
+                var_dump($a);
diff --git a/hphp/test/slow/array_escalation/369.php b/hphp/test/slow/array_escalation/369.php
index 56fa28f7d..ece44ec9c 100644
--- a/hphp/test/slow/array_escalation/369.php
+++ b/hphp/test/slow/array_escalation/369.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a += array(20);              var_dump($a);
\ No newline at end of file
+$a = array();
+ $a += array(20);
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/370.php b/hphp/test/slow/array_escalation/370.php
index 10a4db601..421d0296c 100644
--- a/hphp/test/slow/array_escalation/370.php
+++ b/hphp/test/slow/array_escalation/370.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a += array('b');             var_dump($a);
\ No newline at end of file
+$a = array();
+ $a += array('b');
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/371.php b/hphp/test/slow/array_escalation/371.php
index 909e77e6a..ae708ff4a 100644
--- a/hphp/test/slow/array_escalation/371.php
+++ b/hphp/test/slow/array_escalation/371.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a += array(array(3));        var_dump($a);
\ No newline at end of file
+$a = array();
+ $a += array(array(3));
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/372.php b/hphp/test/slow/array_escalation/372.php
index 7add34828..4a7d4f367 100644
--- a/hphp/test/slow/array_escalation/372.php
+++ b/hphp/test/slow/array_escalation/372.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a += array('c' => 20);       var_dump($a);
\ No newline at end of file
+$a = array();
+ $a += array('c' => 20);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/373.php b/hphp/test/slow/array_escalation/373.php
index a62d4be85..543760c32 100644
--- a/hphp/test/slow/array_escalation/373.php
+++ b/hphp/test/slow/array_escalation/373.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a += array('c' => 'b');      var_dump($a);
\ No newline at end of file
+$a = array();
+ $a += array('c' => 'b');
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/374.php b/hphp/test/slow/array_escalation/374.php
index 946e75fc8..4683b493d 100644
--- a/hphp/test/slow/array_escalation/374.php
+++ b/hphp/test/slow/array_escalation/374.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a += array('c' => array(3)); var_dump($a);
\ No newline at end of file
+$a = array();
+ $a += array('c' => array(3));
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/375.php b/hphp/test/slow/array_escalation/375.php
index f5409c429..206ca95cd 100644
--- a/hphp/test/slow/array_escalation/375.php
+++ b/hphp/test/slow/array_escalation/375.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a += array();                var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a += array();
+                var_dump($a);
diff --git a/hphp/test/slow/array_escalation/376.php b/hphp/test/slow/array_escalation/376.php
index 52a8bc234..c33d789ab 100644
--- a/hphp/test/slow/array_escalation/376.php
+++ b/hphp/test/slow/array_escalation/376.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a += array(20);              var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a += array(20);
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/377.php b/hphp/test/slow/array_escalation/377.php
index 5792374e0..4b727e14b 100644
--- a/hphp/test/slow/array_escalation/377.php
+++ b/hphp/test/slow/array_escalation/377.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a += array('b');             var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a += array('b');
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/378.php b/hphp/test/slow/array_escalation/378.php
index d92c18cc5..fc01affa6 100644
--- a/hphp/test/slow/array_escalation/378.php
+++ b/hphp/test/slow/array_escalation/378.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a += array(array(3));        var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a += array(array(3));
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/379.php b/hphp/test/slow/array_escalation/379.php
index e90fad74b..b91b1a664 100644
--- a/hphp/test/slow/array_escalation/379.php
+++ b/hphp/test/slow/array_escalation/379.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a += array('c' => 20);       var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a += array('c' => 20);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/380.php b/hphp/test/slow/array_escalation/380.php
index 6b95c2192..3cd044e03 100644
--- a/hphp/test/slow/array_escalation/380.php
+++ b/hphp/test/slow/array_escalation/380.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a += array('c' => 'b');      var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a += array('c' => 'b');
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/381.php b/hphp/test/slow/array_escalation/381.php
index 0c980ea82..10ae19272 100644
--- a/hphp/test/slow/array_escalation/381.php
+++ b/hphp/test/slow/array_escalation/381.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $a += array('c' => array(3)); var_dump($a);
\ No newline at end of file
+$a = array(10);
+ $a += array('c' => array(3));
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/382.php b/hphp/test/slow/array_escalation/382.php
index 5073e9f1f..e2d9bc366 100644
--- a/hphp/test/slow/array_escalation/382.php
+++ b/hphp/test/slow/array_escalation/382.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a += array();                var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a += array();
+                var_dump($a);
diff --git a/hphp/test/slow/array_escalation/383.php b/hphp/test/slow/array_escalation/383.php
index bd721e105..017791e0d 100644
--- a/hphp/test/slow/array_escalation/383.php
+++ b/hphp/test/slow/array_escalation/383.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a += array(20);              var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a += array(20);
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/384.php b/hphp/test/slow/array_escalation/384.php
index 60d8f6906..8ea585b3b 100644
--- a/hphp/test/slow/array_escalation/384.php
+++ b/hphp/test/slow/array_escalation/384.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a += array('b');             var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a += array('b');
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/385.php b/hphp/test/slow/array_escalation/385.php
index c0b52719f..d41aee774 100644
--- a/hphp/test/slow/array_escalation/385.php
+++ b/hphp/test/slow/array_escalation/385.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a += array(array(3));        var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a += array(array(3));
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/386.php b/hphp/test/slow/array_escalation/386.php
index 4a0b538a1..b2bbb16a0 100644
--- a/hphp/test/slow/array_escalation/386.php
+++ b/hphp/test/slow/array_escalation/386.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a += array('c' => 20);       var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a += array('c' => 20);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/387.php b/hphp/test/slow/array_escalation/387.php
index a161b6250..15d13b52f 100644
--- a/hphp/test/slow/array_escalation/387.php
+++ b/hphp/test/slow/array_escalation/387.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a += array('c' => 'b');      var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a += array('c' => 'b');
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/388.php b/hphp/test/slow/array_escalation/388.php
index 66adab6b5..b0c8fddd4 100644
--- a/hphp/test/slow/array_escalation/388.php
+++ b/hphp/test/slow/array_escalation/388.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('test'); $a += array('c' => array(3)); var_dump($a);
\ No newline at end of file
+$a = array('test');
+ $a += array('c' => array(3));
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/389.php b/hphp/test/slow/array_escalation/389.php
index 1282855b4..d9300585a 100644
--- a/hphp/test/slow/array_escalation/389.php
+++ b/hphp/test/slow/array_escalation/389.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a += array();                var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a += array();
+                var_dump($a);
diff --git a/hphp/test/slow/array_escalation/390.php b/hphp/test/slow/array_escalation/390.php
index 1b1628655..c708dd163 100644
--- a/hphp/test/slow/array_escalation/390.php
+++ b/hphp/test/slow/array_escalation/390.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a += array(20);              var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a += array(20);
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/391.php b/hphp/test/slow/array_escalation/391.php
index ec6e07b71..3eefe1dfa 100644
--- a/hphp/test/slow/array_escalation/391.php
+++ b/hphp/test/slow/array_escalation/391.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a += array('b');             var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a += array('b');
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/392.php b/hphp/test/slow/array_escalation/392.php
index 229139fde..de9e8534d 100644
--- a/hphp/test/slow/array_escalation/392.php
+++ b/hphp/test/slow/array_escalation/392.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a += array(array(3));        var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a += array(array(3));
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/393.php b/hphp/test/slow/array_escalation/393.php
index 4e3d8d184..e12bca680 100644
--- a/hphp/test/slow/array_escalation/393.php
+++ b/hphp/test/slow/array_escalation/393.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a += array('c' => 20);       var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a += array('c' => 20);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/394.php b/hphp/test/slow/array_escalation/394.php
index e307300b5..1f6d4298d 100644
--- a/hphp/test/slow/array_escalation/394.php
+++ b/hphp/test/slow/array_escalation/394.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a += array('c' => 'b');      var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a += array('c' => 'b');
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/395.php b/hphp/test/slow/array_escalation/395.php
index d90795cab..1bf17b1b3 100644
--- a/hphp/test/slow/array_escalation/395.php
+++ b/hphp/test/slow/array_escalation/395.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(array(0)); $a += array('c' => array(3)); var_dump($a);
\ No newline at end of file
+$a = array(array(0));
+ $a += array('c' => array(3));
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/396.php b/hphp/test/slow/array_escalation/396.php
index 4285f47f2..2f0a34889 100644
--- a/hphp/test/slow/array_escalation/396.php
+++ b/hphp/test/slow/array_escalation/396.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a += array();                var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a += array();
+                var_dump($a);
diff --git a/hphp/test/slow/array_escalation/397.php b/hphp/test/slow/array_escalation/397.php
index a406a9931..45e0fd969 100644
--- a/hphp/test/slow/array_escalation/397.php
+++ b/hphp/test/slow/array_escalation/397.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a += array(20);              var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a += array(20);
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/398.php b/hphp/test/slow/array_escalation/398.php
index 76a5c2147..b87078d9e 100644
--- a/hphp/test/slow/array_escalation/398.php
+++ b/hphp/test/slow/array_escalation/398.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a += array('b');             var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a += array('b');
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/399.php b/hphp/test/slow/array_escalation/399.php
index 548267a32..399bd54b4 100644
--- a/hphp/test/slow/array_escalation/399.php
+++ b/hphp/test/slow/array_escalation/399.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a += array(array(3));        var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a += array(array(3));
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/400.php b/hphp/test/slow/array_escalation/400.php
index 958e26bf0..2a7dc8931 100644
--- a/hphp/test/slow/array_escalation/400.php
+++ b/hphp/test/slow/array_escalation/400.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a += array('c' => 20);       var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a += array('c' => 20);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/401.php b/hphp/test/slow/array_escalation/401.php
index 25ca969ab..4ea193fa2 100644
--- a/hphp/test/slow/array_escalation/401.php
+++ b/hphp/test/slow/array_escalation/401.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a += array('c' => 'b');      var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a += array('c' => 'b');
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/402.php b/hphp/test/slow/array_escalation/402.php
index 99eb21df1..8ec688235 100644
--- a/hphp/test/slow/array_escalation/402.php
+++ b/hphp/test/slow/array_escalation/402.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 10); $a += array('c' => array(3)); var_dump($a);
\ No newline at end of file
+$a = array('a' => 10);
+ $a += array('c' => array(3));
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/403.php b/hphp/test/slow/array_escalation/403.php
index 86c230aee..6b6fe0745 100644
--- a/hphp/test/slow/array_escalation/403.php
+++ b/hphp/test/slow/array_escalation/403.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a += array();                var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a += array();
+                var_dump($a);
diff --git a/hphp/test/slow/array_escalation/404.php b/hphp/test/slow/array_escalation/404.php
index b1c06ccbc..11c536e4c 100644
--- a/hphp/test/slow/array_escalation/404.php
+++ b/hphp/test/slow/array_escalation/404.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a += array(20);              var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a += array(20);
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/405.php b/hphp/test/slow/array_escalation/405.php
index 145faf475..67b2999d8 100644
--- a/hphp/test/slow/array_escalation/405.php
+++ b/hphp/test/slow/array_escalation/405.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a += array('b');             var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a += array('b');
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/406.php b/hphp/test/slow/array_escalation/406.php
index 6c991f610..b152bd691 100644
--- a/hphp/test/slow/array_escalation/406.php
+++ b/hphp/test/slow/array_escalation/406.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a += array(array(3));        var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a += array(array(3));
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/407.php b/hphp/test/slow/array_escalation/407.php
index a485354c5..df8e26ad8 100644
--- a/hphp/test/slow/array_escalation/407.php
+++ b/hphp/test/slow/array_escalation/407.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a += array('c' => 20);       var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a += array('c' => 20);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/408.php b/hphp/test/slow/array_escalation/408.php
index 19b524382..5da83a3b5 100644
--- a/hphp/test/slow/array_escalation/408.php
+++ b/hphp/test/slow/array_escalation/408.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a += array('c' => 'b');      var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a += array('c' => 'b');
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/409.php b/hphp/test/slow/array_escalation/409.php
index 3c494f3b3..061960406 100644
--- a/hphp/test/slow/array_escalation/409.php
+++ b/hphp/test/slow/array_escalation/409.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => 'va'); $a += array('c' => array(3)); var_dump($a);
\ No newline at end of file
+$a = array('a' => 'va');
+ $a += array('c' => array(3));
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/410.php b/hphp/test/slow/array_escalation/410.php
index c18bb782f..af9a9f285 100644
--- a/hphp/test/slow/array_escalation/410.php
+++ b/hphp/test/slow/array_escalation/410.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a += array();                var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a += array();
+                var_dump($a);
diff --git a/hphp/test/slow/array_escalation/411.php b/hphp/test/slow/array_escalation/411.php
index 44e93b70b..5ca010f4f 100644
--- a/hphp/test/slow/array_escalation/411.php
+++ b/hphp/test/slow/array_escalation/411.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a += array(20);              var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a += array(20);
+              var_dump($a);
diff --git a/hphp/test/slow/array_escalation/412.php b/hphp/test/slow/array_escalation/412.php
index 88553755d..b10bea9a8 100644
--- a/hphp/test/slow/array_escalation/412.php
+++ b/hphp/test/slow/array_escalation/412.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a += array('b');             var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a += array('b');
+             var_dump($a);
diff --git a/hphp/test/slow/array_escalation/413.php b/hphp/test/slow/array_escalation/413.php
index 2a844e800..7f4d05ff9 100644
--- a/hphp/test/slow/array_escalation/413.php
+++ b/hphp/test/slow/array_escalation/413.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a += array(array(3));        var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a += array(array(3));
+        var_dump($a);
diff --git a/hphp/test/slow/array_escalation/414.php b/hphp/test/slow/array_escalation/414.php
index 56409f847..882020284 100644
--- a/hphp/test/slow/array_escalation/414.php
+++ b/hphp/test/slow/array_escalation/414.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a += array('c' => 20);       var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a += array('c' => 20);
+       var_dump($a);
diff --git a/hphp/test/slow/array_escalation/415.php b/hphp/test/slow/array_escalation/415.php
index 89cdd9b58..e447e9c63 100644
--- a/hphp/test/slow/array_escalation/415.php
+++ b/hphp/test/slow/array_escalation/415.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a += array('c' => 'b');      var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a += array('c' => 'b');
+      var_dump($a);
diff --git a/hphp/test/slow/array_escalation/416.php b/hphp/test/slow/array_escalation/416.php
index e60cd2b69..7d9a7b073 100644
--- a/hphp/test/slow/array_escalation/416.php
+++ b/hphp/test/slow/array_escalation/416.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array('a' => array(1)); $a += array('c' => array(3)); var_dump($a);
\ No newline at end of file
+$a = array('a' => array(1));
+ $a += array('c' => array(3));
+ var_dump($a);
diff --git a/hphp/test/slow/array_escalation/417.php b/hphp/test/slow/array_escalation/417.php
index 7a638f5c1..3a61fa8a2 100644
--- a/hphp/test/slow/array_escalation/417.php
+++ b/hphp/test/slow/array_escalation/417.php
@@ -1,3 +1,15 @@
 <?php
 
- function test() {  $a = array();  for ($i = 0; $i < 17; $i++) {    $a[] = $i;  }  unset($a[16]);  $b = $a;  array_unshift($a, 'foo');  var_dump(count($a), count($b));}test();
\ No newline at end of file
+function test() {
+  $a = array();
+  for ($i = 0;
+ $i < 17;
+ $i++) {
+    $a[] = $i;
+  }
+  unset($a[16]);
+  $b = $a;
+  array_unshift($a, 'foo');
+  var_dump(count($a), count($b));
+}
+test();
diff --git a/hphp/test/slow/array_for_each/447.php b/hphp/test/slow/array_for_each/447.php
index d8890c8e5..f3876c12f 100644
--- a/hphp/test/slow/array_for_each/447.php
+++ b/hphp/test/slow/array_for_each/447.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f1() {
   $i = 0;
   $foo = array(1,2,3,4);
@@ -8,9 +7,11 @@ function f1() {
     echo "key=$key val=$val\n";
     if($val == 2) {
       $foo[$key] = 0;
-    } else if($val == 3) {
+    }
+ else if($val == 3) {
       unset($foo[$key]);
-    } else {
+    }
+ else {
       $val++;
     }
     ++$i;
diff --git a/hphp/test/slow/array_for_each/448.php b/hphp/test/slow/array_for_each/448.php
index cff96d10d..f78333df9 100644
--- a/hphp/test/slow/array_for_each/448.php
+++ b/hphp/test/slow/array_for_each/448.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f1() {
   $i = 0;
   $foo = array(1,2,3,4);
@@ -9,9 +8,11 @@ function f1() {
     echo "key=$key val=$val\n";
     if($val == 2) {
       $foo[$key] = 0;
-    } else if($val == 3) {
+    }
+ else if($val == 3) {
       unset($foo[$key]);
-    } else {
+    }
+ else {
       $val++;
     }
     ++$i;
@@ -20,4 +21,5 @@ function f1() {
   }
   var_dump($foo);
 }
-foreach (f1() as $_) {}
+foreach (f1() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/449.php b/hphp/test/slow/array_for_each/449.php
index b6881f722..2662de9e4 100644
--- a/hphp/test/slow/array_for_each/449.php
+++ b/hphp/test/slow/array_for_each/449.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f2() {
   $i = 0;
   $foo = array(1,2,3,4);
@@ -8,9 +7,11 @@ function f2() {
     echo "key=$key val=$val\n";
     if($val == 2) {
       $foo[$key] = 0;
-    } else if($val == 3) {
+    }
+ else if($val == 3) {
       $foo['a'] = 7;
-    } else {
+    }
+ else {
       $val++;
     }
     ++$i;
diff --git a/hphp/test/slow/array_for_each/450.php b/hphp/test/slow/array_for_each/450.php
index 212959d11..10100d4ba 100644
--- a/hphp/test/slow/array_for_each/450.php
+++ b/hphp/test/slow/array_for_each/450.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f2() {
   $i = 0;
   $foo = array(1,2,3,4);
@@ -9,9 +8,11 @@ function f2() {
     echo "key=$key val=$val\n";
     if($val == 2) {
       $foo[$key] = 0;
-    } else if($val == 3) {
+    }
+ else if($val == 3) {
       $foo['a'] = 7;
-    } else {
+    }
+ else {
       $val++;
     }
     ++$i;
@@ -20,4 +21,5 @@ function f2() {
   }
   var_dump($foo);
 }
-foreach (f2() as $_) {}
+foreach (f2() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/451.php b/hphp/test/slow/array_for_each/451.php
index c105eae2b..9e31e76e1 100644
--- a/hphp/test/slow/array_for_each/451.php
+++ b/hphp/test/slow/array_for_each/451.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f3() {
   $i = 0;
   $foo = array('a'=>1, 'b'=>2, 'c'=>3, 'd'=>4, 'e'=>5, 'f'=>6);
diff --git a/hphp/test/slow/array_for_each/452.php b/hphp/test/slow/array_for_each/452.php
index 17685f048..299e30f34 100644
--- a/hphp/test/slow/array_for_each/452.php
+++ b/hphp/test/slow/array_for_each/452.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f3() {
   $i = 0;
   $foo = array('a'=>1, 'b'=>2, 'c'=>3, 'd'=>4, 'e'=>5, 'f'=>6);
@@ -20,4 +19,5 @@ function f3() {
   }
   var_dump($foo);
 }
-foreach (f3() as $_) {}
+foreach (f3() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/453.php b/hphp/test/slow/array_for_each/453.php
index ec66a7f47..34452e370 100644
--- a/hphp/test/slow/array_for_each/453.php
+++ b/hphp/test/slow/array_for_each/453.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f4() {
   $i = 0;
   $foo = array('a'=>1, 'b'=>2, 'c'=>3, 'd'=>4, 'e'=>5, 'f'=>6);
diff --git a/hphp/test/slow/array_for_each/454.php b/hphp/test/slow/array_for_each/454.php
index 29d3ee541..0da6410fc 100644
--- a/hphp/test/slow/array_for_each/454.php
+++ b/hphp/test/slow/array_for_each/454.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f4() {
   $i = 0;
   $foo = array('a'=>1, 'b'=>2, 'c'=>3, 'd'=>4, 'e'=>5, 'f'=>6);
@@ -21,4 +20,5 @@ function f4() {
   }
   var_dump($foo);
 }
-foreach (f4() as $_) {}
+foreach (f4() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/455.php b/hphp/test/slow/array_for_each/455.php
index 08f848913..f9a00694a 100644
--- a/hphp/test/slow/array_for_each/455.php
+++ b/hphp/test/slow/array_for_each/455.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f5() {
   $i = 0;
   $foo = array('f'=>3, 'e'=>1, 'd'=>5, 'a'=>6, 'b'=>2, 'c'=>4);
@@ -12,7 +11,9 @@ function f5() {
       unset($foo['e']);
       unset($foo['d']);
       $foo['d'] = 9;
-      for ($j = 0; $j < 10000; ++$j)
+      for ($j = 0;
+ $j < 10000;
+ ++$j)
         $foo[$j . 's' . $j] = $j;
     }
     ++$i;
diff --git a/hphp/test/slow/array_for_each/456.php b/hphp/test/slow/array_for_each/456.php
index 87149c19e..6138dd3ca 100644
--- a/hphp/test/slow/array_for_each/456.php
+++ b/hphp/test/slow/array_for_each/456.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f5() {
   $i = 0;
   $foo = array('f'=>3, 'e'=>1, 'd'=>5, 'a'=>6, 'b'=>2, 'c'=>4);
@@ -13,7 +12,9 @@ function f5() {
       unset($foo['e']);
       unset($foo['d']);
       $foo['d'] = 9;
-      for ($j = 0; $j < 10000; ++$j)
+      for ($j = 0;
+ $j < 10000;
+ ++$j)
         $foo[$j . 's' . $j] = $j;
     }
     ++$i;
@@ -21,4 +22,5 @@ function f5() {
       break;
   }
 }
-foreach (f5() as $_) {}
+foreach (f5() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/457.php b/hphp/test/slow/array_for_each/457.php
index 9d3a03a70..383e3efa3 100644
--- a/hphp/test/slow/array_for_each/457.php
+++ b/hphp/test/slow/array_for_each/457.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f6() {
   $i = 0;
   $foo = array('f'=>3, 'e'=>1, 'd'=>5, 'a'=>6, 'b'=>2, 'c'=>4);
@@ -13,7 +12,9 @@ function f6() {
       unset($foo['d']);
       $bar['e'] = 8;
       $foo['d'] = 9;
-      for ($j = 0; $j < 10000; ++$j)
+      for ($j = 0;
+ $j < 10000;
+ ++$j)
         $foo[$j . 's' . $j] = $j;
     }
     ++$i;
diff --git a/hphp/test/slow/array_for_each/458.php b/hphp/test/slow/array_for_each/458.php
index d025f188a..01b5c8835 100644
--- a/hphp/test/slow/array_for_each/458.php
+++ b/hphp/test/slow/array_for_each/458.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f6() {
   $i = 0;
   $foo = array('f'=>3, 'e'=>1, 'd'=>5, 'a'=>6, 'b'=>2, 'c'=>4);
@@ -14,7 +13,9 @@ function f6() {
       unset($foo['d']);
       $bar['e'] = 8;
       $foo['d'] = 9;
-      for ($j = 0; $j < 10000; ++$j)
+      for ($j = 0;
+ $j < 10000;
+ ++$j)
         $foo[$j . 's' . $j] = $j;
     }
     ++$i;
@@ -22,4 +23,5 @@ function f6() {
       break;
   }
 }
-foreach (f6() as $_) {}
+foreach (f6() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/459.php b/hphp/test/slow/array_for_each/459.php
index ec1dccad8..c87964df8 100644
--- a/hphp/test/slow/array_for_each/459.php
+++ b/hphp/test/slow/array_for_each/459.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f7() {
   $i = 0;
   $bar = array();
diff --git a/hphp/test/slow/array_for_each/460.php b/hphp/test/slow/array_for_each/460.php
index d28f61bac..d91fe9c96 100644
--- a/hphp/test/slow/array_for_each/460.php
+++ b/hphp/test/slow/array_for_each/460.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f7() {
   $i = 0;
   $bar = array();
@@ -18,4 +17,5 @@ function f7() {
       break;
   }
 }
-foreach (f7() as $_) {}
+foreach (f7() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/461.php b/hphp/test/slow/array_for_each/461.php
index bdced08d1..a6ad97683 100644
--- a/hphp/test/slow/array_for_each/461.php
+++ b/hphp/test/slow/array_for_each/461.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f8() {
   $i = 0;
   $bar = array();
diff --git a/hphp/test/slow/array_for_each/462.php b/hphp/test/slow/array_for_each/462.php
index 2227c244f..64c5da507 100644
--- a/hphp/test/slow/array_for_each/462.php
+++ b/hphp/test/slow/array_for_each/462.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f8() {
   $i = 0;
   $bar = array();
@@ -20,4 +19,5 @@ function f8() {
       break;
   }
 }
-foreach (f8() as $_) {}
+foreach (f8() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/463.php b/hphp/test/slow/array_for_each/463.php
index cd9003119..ff0b11a2f 100644
--- a/hphp/test/slow/array_for_each/463.php
+++ b/hphp/test/slow/array_for_each/463.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f9() {
   $i = 0;
   $arr = array(1,1,1);
diff --git a/hphp/test/slow/array_for_each/464.php b/hphp/test/slow/array_for_each/464.php
index 1a9761bce..7d340b784 100644
--- a/hphp/test/slow/array_for_each/464.php
+++ b/hphp/test/slow/array_for_each/464.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f9() {
   $i = 0;
   $arr = array(1,1,1);
@@ -23,4 +22,5 @@ function f9() {
       break;
   }
 }
-foreach (f9() as $_) {}
+foreach (f9() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/465.php b/hphp/test/slow/array_for_each/465.php
index d6754cc2b..bfe969789 100644
--- a/hphp/test/slow/array_for_each/465.php
+++ b/hphp/test/slow/array_for_each/465.php
@@ -1,6 +1,6 @@
 <?php
 
- function g1() {
+function g1() {
   $arr = array(0,1,2,3);
   $b = true;
   foreach ($arr as &$v) {
diff --git a/hphp/test/slow/array_for_each/466.php b/hphp/test/slow/array_for_each/466.php
index 46419bdc3..1ee35f56e 100644
--- a/hphp/test/slow/array_for_each/466.php
+++ b/hphp/test/slow/array_for_each/466.php
@@ -1,6 +1,6 @@
 <?php
 
- function g1() {
+function g1() {
   $arr = array(0,1,2,3);
   $b = true;
   foreach ($arr as &$v) {
@@ -12,4 +12,5 @@
      }
   }
 }
-foreach (g1() as $_) {}
+foreach (g1() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/467.php b/hphp/test/slow/array_for_each/467.php
index 086a30f46..4a9d3f8ea 100644
--- a/hphp/test/slow/array_for_each/467.php
+++ b/hphp/test/slow/array_for_each/467.php
@@ -1,6 +1,6 @@
 <?php
 
- function g2() {
+function g2() {
   $arr = array(0,1,2,3);
   $b = true;
   foreach ($arr as &$v) {
@@ -9,7 +9,8 @@
       $b = false;
       $old = $arr;
       $arr = array(4,5,6,7);
-    } else if ($v == 6) {
+    }
+ else if ($v == 6) {
       $arr = $old;
       unset($old);
     }
diff --git a/hphp/test/slow/array_for_each/468.php b/hphp/test/slow/array_for_each/468.php
index e13ea775c..dcb39d0ae 100644
--- a/hphp/test/slow/array_for_each/468.php
+++ b/hphp/test/slow/array_for_each/468.php
@@ -1,6 +1,6 @@
 <?php
 
- function g2() {
+function g2() {
   $arr = array(0,1,2,3);
   $b = true;
   foreach ($arr as &$v) {
@@ -10,10 +10,12 @@
       $b = false;
       $old = $arr;
       $arr = array(4,5,6,7);
-    } else if ($v == 6) {
+    }
+ else if ($v == 6) {
       $arr = $old;
       unset($old);
     }
   }
 }
-foreach (g2() as $_) {}
+foreach (g2() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/469.php b/hphp/test/slow/array_for_each/469.php
index 7af3d9cdf..e9bd0f828 100644
--- a/hphp/test/slow/array_for_each/469.php
+++ b/hphp/test/slow/array_for_each/469.php
@@ -1,6 +1,6 @@
 <?php
 
- function g3() {
+function g3() {
   $arr2 = array(0,1,2,3);
   $arr = $arr2;
   $b = true;
@@ -10,7 +10,8 @@
     if ($b && $v == 1) {
       $b = false;
       $arr = array(4,5,6,7);
-    } else if ($b2 && $v == 6) {
+    }
+ else if ($b2 && $v == 6) {
       $b2 = false;
       $arr = $arr2;
     }
diff --git a/hphp/test/slow/array_for_each/470.php b/hphp/test/slow/array_for_each/470.php
index 184ab48c0..16b710e92 100644
--- a/hphp/test/slow/array_for_each/470.php
+++ b/hphp/test/slow/array_for_each/470.php
@@ -1,6 +1,6 @@
 <?php
 
- function g3() {
+function g3() {
   $arr2 = array(0,1,2,3);
   $arr = $arr2;
   $b = true;
@@ -11,10 +11,12 @@
     if ($b && $v == 1) {
       $b = false;
       $arr = array(4,5,6,7);
-    } else if ($b2 && $v == 6) {
+    }
+ else if ($b2 && $v == 6) {
       $b2 = false;
       $arr = $arr2;
     }
   }
 }
-foreach (g3() as $_) {}
+foreach (g3() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/471.php b/hphp/test/slow/array_for_each/471.php
index 64c4a1e32..a8a58aa28 100644
--- a/hphp/test/slow/array_for_each/471.php
+++ b/hphp/test/slow/array_for_each/471.php
@@ -1,6 +1,6 @@
 <?php
 
- function g4() {
+function g4() {
   $arr = array(0,1,2,3);
   $b = true;
   foreach ($arr as &$v) {
diff --git a/hphp/test/slow/array_for_each/472.php b/hphp/test/slow/array_for_each/472.php
index c3bbc95b6..e810bc8a0 100644
--- a/hphp/test/slow/array_for_each/472.php
+++ b/hphp/test/slow/array_for_each/472.php
@@ -1,6 +1,6 @@
 <?php
 
- function g4() {
+function g4() {
   $arr = array(0,1,2,3);
   $b = true;
   foreach ($arr as &$v) {
@@ -12,4 +12,5 @@
     }
   }
 }
-foreach (g4() as $_) {}
+foreach (g4() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/473.php b/hphp/test/slow/array_for_each/473.php
index 5a91f5e37..3bf30a946 100644
--- a/hphp/test/slow/array_for_each/473.php
+++ b/hphp/test/slow/array_for_each/473.php
@@ -1,6 +1,6 @@
 <?php
 
- function g5() {
+function g5() {
   $arr = array(0,1,2,3);
   $arr2 = $arr;
   $b = true;
diff --git a/hphp/test/slow/array_for_each/474.php b/hphp/test/slow/array_for_each/474.php
index 880e8d310..d795d75f5 100644
--- a/hphp/test/slow/array_for_each/474.php
+++ b/hphp/test/slow/array_for_each/474.php
@@ -1,6 +1,6 @@
 <?php
 
- function g5() {
+function g5() {
   $arr = array(0,1,2,3);
   $arr2 = $arr;
   $b = true;
@@ -13,4 +13,5 @@
     }
   }
 }
-foreach (g5() as $_) {}
+foreach (g5() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/475.php b/hphp/test/slow/array_for_each/475.php
index 8c7747160..2ba904673 100644
--- a/hphp/test/slow/array_for_each/475.php
+++ b/hphp/test/slow/array_for_each/475.php
@@ -1,6 +1,6 @@
 <?php
 
- function g6() {
+function g6() {
   $arr = array(0,'a'=>1,2,'b'=>3,4);
   $b = true;
   foreach ($arr as $k => &$v) {
diff --git a/hphp/test/slow/array_for_each/476.php b/hphp/test/slow/array_for_each/476.php
index cd4d504a5..fe364a8ee 100644
--- a/hphp/test/slow/array_for_each/476.php
+++ b/hphp/test/slow/array_for_each/476.php
@@ -1,6 +1,6 @@
 <?php
 
- function g6() {
+function g6() {
   $arr = array(0,'a'=>1,2,'b'=>3,4);
   $b = true;
   foreach ($arr as $k => &$v) {
@@ -12,4 +12,5 @@
     }
   }
 }
-foreach (g6() as $_) {}
+foreach (g6() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/477.php b/hphp/test/slow/array_for_each/477.php
index 1e47a25c9..3ca2894e9 100644
--- a/hphp/test/slow/array_for_each/477.php
+++ b/hphp/test/slow/array_for_each/477.php
@@ -1,13 +1,14 @@
 <?php
 
- function g7() {
+function g7() {
   $arr = array(0,'a'=>1,2,'b'=>3,4);
   $b = true;
   foreach ($arr as $k => &$v) {
     echo "key=$k val=$v\n";
     if ($b && $v == 1) {
       $b = false;
-      unset($arr[1]); 
+      unset($arr[1]);
+
     }
   }
 }
diff --git a/hphp/test/slow/array_for_each/478.php b/hphp/test/slow/array_for_each/478.php
index 8d3fb06f3..5d078ba49 100644
--- a/hphp/test/slow/array_for_each/478.php
+++ b/hphp/test/slow/array_for_each/478.php
@@ -1,6 +1,6 @@
 <?php
 
- function g7() {
+function g7() {
   $arr = array(0,'a'=>1,2,'b'=>3,4);
   $b = true;
   foreach ($arr as $k => &$v) {
@@ -8,8 +8,10 @@
     echo "key=$k val=$v\n";
     if ($b && $v == 1) {
       $b = false;
-      unset($arr[1]); 
+      unset($arr[1]);
+
     }
   }
 }
-foreach (g7() as $_) {}
+foreach (g7() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/479.php b/hphp/test/slow/array_for_each/479.php
index fcfab2e55..f8fc322ac 100644
--- a/hphp/test/slow/array_for_each/479.php
+++ b/hphp/test/slow/array_for_each/479.php
@@ -1,13 +1,14 @@
 <?php
 
- function g8() {
+function g8() {
   $arr = array(0,'a'=>1,2,'b'=>3,4);
   $b = true;
   foreach ($arr as $k => &$v) {
     echo "key=$k val=$v\n";
     if ($b && $v == 1) {
       $b = false;
-      unset($arr[1]); 
+      unset($arr[1]);
+
       array_pop($arr);
     }
   }
diff --git a/hphp/test/slow/array_for_each/480.php b/hphp/test/slow/array_for_each/480.php
index 0fa89821b..2dd026f63 100644
--- a/hphp/test/slow/array_for_each/480.php
+++ b/hphp/test/slow/array_for_each/480.php
@@ -1,6 +1,6 @@
 <?php
 
- function g8() {
+function g8() {
   $arr = array(0,'a'=>1,2,'b'=>3,4);
   $b = true;
   foreach ($arr as $k => &$v) {
@@ -8,9 +8,11 @@
     echo "key=$k val=$v\n";
     if ($b && $v == 1) {
       $b = false;
-      unset($arr[1]); 
+      unset($arr[1]);
+
       array_pop($arr);
     }
   }
 }
-foreach (g8() as $_) {}
+foreach (g8() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/481.php b/hphp/test/slow/array_for_each/481.php
index 74ca046e3..36c800298 100644
--- a/hphp/test/slow/array_for_each/481.php
+++ b/hphp/test/slow/array_for_each/481.php
@@ -1,6 +1,6 @@
 <?php
 
- function g9() {
+function g9() {
   $arr = array(0,1,2,3,4);
   $b = true;
   foreach ($arr as &$v) {
diff --git a/hphp/test/slow/array_for_each/482.php b/hphp/test/slow/array_for_each/482.php
index 658d5c080..3dd19e8a5 100644
--- a/hphp/test/slow/array_for_each/482.php
+++ b/hphp/test/slow/array_for_each/482.php
@@ -1,6 +1,6 @@
 <?php
 
- function g9() {
+function g9() {
   $arr = array(0,1,2,3,4);
   $b = true;
   foreach ($arr as &$v) {
@@ -12,4 +12,5 @@
     }
   }
 }
-foreach (g9() as $_) {}
+foreach (g9() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/483.php b/hphp/test/slow/array_for_each/483.php
index 5e503e3ad..85f19f89c 100644
--- a/hphp/test/slow/array_for_each/483.php
+++ b/hphp/test/slow/array_for_each/483.php
@@ -1,6 +1,6 @@
 <?php
 
- function g10() {
+function g10() {
   $arr = array(0,1,2,3);
   $b = true;
   foreach ($arr as &$v) {
diff --git a/hphp/test/slow/array_for_each/484.php b/hphp/test/slow/array_for_each/484.php
index 1f049c129..c7a6ce0d5 100644
--- a/hphp/test/slow/array_for_each/484.php
+++ b/hphp/test/slow/array_for_each/484.php
@@ -1,6 +1,6 @@
 <?php
 
- function g10() {
+function g10() {
   $arr = array(0,1,2,3);
   $b = true;
   foreach ($arr as &$v) {
@@ -12,4 +12,5 @@
     }
   }
 }
-foreach (g10() as $_) {}
+foreach (g10() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/485.php b/hphp/test/slow/array_for_each/485.php
index 36882f2d1..a5660ae06 100644
--- a/hphp/test/slow/array_for_each/485.php
+++ b/hphp/test/slow/array_for_each/485.php
@@ -1,6 +1,6 @@
 <?php
 
- function g11() {
+function g11() {
   $arr = array(0,1,2,3);
   reset($arr);
   var_dump(current($arr));
diff --git a/hphp/test/slow/array_for_each/486.php b/hphp/test/slow/array_for_each/486.php
index 9e1d9e452..ea52b1fab 100644
--- a/hphp/test/slow/array_for_each/486.php
+++ b/hphp/test/slow/array_for_each/486.php
@@ -1,6 +1,6 @@
 <?php
 
- function g11() {
+function g11() {
   $arr = array(0,1,2,3);
   reset($arr);
   var_dump(current($arr));
@@ -10,4 +10,5 @@
   }
   var_dump(current($arr));
 }
-foreach (g11() as $_) {}
+foreach (g11() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/487.php b/hphp/test/slow/array_for_each/487.php
index 2e620a50a..c1e17afb8 100644
--- a/hphp/test/slow/array_for_each/487.php
+++ b/hphp/test/slow/array_for_each/487.php
@@ -1,3 +1,18 @@
 <?php
 
- function g12($a) {  var_dump($a);  $arr = array(0,1,2,3);  $b = true;  foreach ($arr as &$v) {    if ($b && $v == 1) {      $b = false;      $arr = $a;    } else {      $v = 5;    }  }  var_dump($a);}g12(array(0, 0, 0, 0));
\ No newline at end of file
+function g12($a) {
+  var_dump($a);
+  $arr = array(0,1,2,3);
+  $b = true;
+  foreach ($arr as &$v) {
+    if ($b && $v == 1) {
+      $b = false;
+      $arr = $a;
+    }
+ else {
+      $v = 5;
+    }
+  }
+  var_dump($a);
+}
+g12(array(0, 0, 0, 0));
diff --git a/hphp/test/slow/array_for_each/488.php b/hphp/test/slow/array_for_each/488.php
index 5c55d7555..934eb2c0c 100644
--- a/hphp/test/slow/array_for_each/488.php
+++ b/hphp/test/slow/array_for_each/488.php
@@ -1,3 +1,20 @@
 <?php
 
- function g12($a) {  var_dump($a);  $arr = array(0,1,2,3);  $b = true;  foreach ($arr as &$v) {    yield null;    if ($b && $v == 1) {      $b = false;      $arr = $a;    } else {      $v = 5;    }  }  var_dump($a);}foreach (g12(array(0, 0, 0, 0)) as $_) {}
\ No newline at end of file
+function g12($a) {
+  var_dump($a);
+  $arr = array(0,1,2,3);
+  $b = true;
+  foreach ($arr as &$v) {
+    yield null;
+    if ($b && $v == 1) {
+      $b = false;
+      $arr = $a;
+    }
+ else {
+      $v = 5;
+    }
+  }
+  var_dump($a);
+}
+foreach (g12(array(0, 0, 0, 0)) as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/489.php b/hphp/test/slow/array_for_each/489.php
index 4efb03fab..c2af5a679 100644
--- a/hphp/test/slow/array_for_each/489.php
+++ b/hphp/test/slow/array_for_each/489.php
@@ -1,13 +1,13 @@
 <?php
 
-
 function h1(&$arr, $i) {
   foreach ($arr as $k => &$v) {
     echo "i=$i key=$k\n";
     if ($k == 0) {
       if ($i > 0) {
         h1($arr, $i-1);
-      } else if ($i == 0) {
+      }
+ else if ($i == 0) {
         echo "Unsetting key 1\n";
         unset($arr[1]);
       }
diff --git a/hphp/test/slow/array_for_each/490.php b/hphp/test/slow/array_for_each/490.php
index 2031f600b..b631f8e8e 100644
--- a/hphp/test/slow/array_for_each/490.php
+++ b/hphp/test/slow/array_for_each/490.php
@@ -1,14 +1,15 @@
 <?php
 
-
 function h1(&$arr, $i) {
   foreach ($arr as $k => &$v) {
     yield null;
     echo "i=$i key=$k\n";
     if ($k == 0) {
       if ($i > 0) {
-        foreach (h1($arr, $i-1) as $_) {}
-      } else if ($i == 0) {
+        foreach (h1($arr, $i-1) as $_) {
+}
+      }
+ else if ($i == 0) {
         echo "Unsetting key 1\n";
         unset($arr[1]);
       }
@@ -17,5 +18,6 @@ function h1(&$arr, $i) {
   end($arr);
 }
 $arr = array('a','b','c');
-foreach (h1($arr, 10) as $_) {}
+foreach (h1($arr, 10) as $_) {
+}
 var_dump($arr);
diff --git a/hphp/test/slow/array_for_each/491.php b/hphp/test/slow/array_for_each/491.php
index b8a9e0b56..140e95f13 100644
--- a/hphp/test/slow/array_for_each/491.php
+++ b/hphp/test/slow/array_for_each/491.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo() {
   $arr = array(10,20,30,40,50);
   foreach ($arr as $k => &$v) {
diff --git a/hphp/test/slow/array_for_each/492.php b/hphp/test/slow/array_for_each/492.php
index 9a6bbe5bf..f5d4ae737 100644
--- a/hphp/test/slow/array_for_each/492.php
+++ b/hphp/test/slow/array_for_each/492.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo() {
   $arr = array(10,20,30,40,50);
   foreach ($arr as $k => &$v) {
@@ -14,4 +13,5 @@ function foo() {
   var_dump($arr);
   var_dump($arr2);
 }
-foreach (foo() as $_) {}
+foreach (foo() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/493.php b/hphp/test/slow/array_for_each/493.php
index 2fc757d2f..6237c18d7 100644
--- a/hphp/test/slow/array_for_each/493.php
+++ b/hphp/test/slow/array_for_each/493.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo() {
   $arr = array(10,20,30,40,50);
   foreach ($arr as $k => &$v) {
diff --git a/hphp/test/slow/array_for_each/494.php b/hphp/test/slow/array_for_each/494.php
index 23566fbae..6e2bdfaae 100644
--- a/hphp/test/slow/array_for_each/494.php
+++ b/hphp/test/slow/array_for_each/494.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo() {
   $arr = array(10,20,30,40,50);
   foreach ($arr as $k => &$v) {
@@ -15,4 +14,5 @@ function foo() {
   var_dump($arr);
   var_dump($arr2);
 }
-foreach (foo() as $_) {}
+foreach (foo() as $_) {
+}
diff --git a/hphp/test/slow/array_for_each/495.php b/hphp/test/slow/array_for_each/495.php
index 32a74585e..414696eaf 100644
--- a/hphp/test/slow/array_for_each/495.php
+++ b/hphp/test/slow/array_for_each/495.php
@@ -1,6 +1,6 @@
 <?php
 
- function k1() {
+function k1() {
   $arr = array(0,1,2,3,4);
   reset($arr);
   foreach ($arr as $v) {
diff --git a/hphp/test/slow/array_for_each/496.php b/hphp/test/slow/array_for_each/496.php
index 6783e57a5..5e0ec27c9 100644
--- a/hphp/test/slow/array_for_each/496.php
+++ b/hphp/test/slow/array_for_each/496.php
@@ -1,6 +1,6 @@
 <?php
 
- function k2() {
+function k2() {
   $arr = array(0,1,2,3,4);
   reset($arr);
   $arr2 = $arr;
diff --git a/hphp/test/slow/array_for_each/497.php b/hphp/test/slow/array_for_each/497.php
index 32f4606ef..33b8341bd 100644
--- a/hphp/test/slow/array_for_each/497.php
+++ b/hphp/test/slow/array_for_each/497.php
@@ -1,6 +1,6 @@
 <?php
 
- function k3() {
+function k3() {
   $arr = array(0,1,2,3,4);
   reset($arr);
   $b = true;
diff --git a/hphp/test/slow/array_for_each/498.php b/hphp/test/slow/array_for_each/498.php
index ff1c5eb2b..cc46886e4 100644
--- a/hphp/test/slow/array_for_each/498.php
+++ b/hphp/test/slow/array_for_each/498.php
@@ -1,6 +1,6 @@
 <?php
 
- function k4() {
+function k4() {
   $arr = array(0,1,2,3,4);
   reset($arr);
   $b = true;
diff --git a/hphp/test/slow/array_for_each/499.php b/hphp/test/slow/array_for_each/499.php
index 3ecb40324..3c6d697c4 100644
--- a/hphp/test/slow/array_for_each/499.php
+++ b/hphp/test/slow/array_for_each/499.php
@@ -1,3 +1,26 @@
 <?php
 
- $a = array(1,2,3,4,5);function foo($a, $b, $c) {  var_dump('foo');  return 1;}function bar($a, $b, $c) {  var_dump('bar');  return 2;}function buz($x,$y) { if ($y) return $x; return 1; }$s = buz('hello',1);foreach ($a as $s[3]) {  var_dump($s);}$i = 0;foreach ($a as          $a[bar($i++, $i++, $i++)] => &$a[foo($i++, $i++, $i++)]) {  var_dump($a[1],$a[2]);}foreach ($a as          $a[bar($i++, $i++, $i++)] => $a[foo($i++, $i++, $i++)]) {  var_dump($a[1],$a[2]);}
\ No newline at end of file
+$a = array(1,2,3,4,5);
+function foo($a, $b, $c) {
+  var_dump('foo');
+  return 1;
+}
+function bar($a, $b, $c) {
+  var_dump('bar');
+  return 2;
+}
+function buz($x,$y) {
+ if ($y) return $x;
+ return 1;
+ }
+$s = buz('hello',1);
+foreach ($a as $s[3]) {
+  var_dump($s);
+}
+$i = 0;
+foreach ($a as          $a[bar($i++, $i++, $i++)] => &$a[foo($i++, $i++, $i++)]) {
+  var_dump($a[1],$a[2]);
+}
+foreach ($a as          $a[bar($i++, $i++, $i++)] => $a[foo($i++, $i++, $i++)]) {
+  var_dump($a[1],$a[2]);
+}
diff --git a/hphp/test/slow/array_for_each/500.php b/hphp/test/slow/array_for_each/500.php
index b3213eca8..6b885fcd7 100644
--- a/hphp/test/slow/array_for_each/500.php
+++ b/hphp/test/slow/array_for_each/500.php
@@ -1,3 +1,17 @@
 <?php
 
- class X {  function __destruct() { var_dump(__METHOD__); }}function test() {  $a = array(new X, 0);  foreach ($a as $v) {    var_dump($v);  }  $a = null;  var_dump('done');}test();var_dump('exit');
\ No newline at end of file
+class X {
+  function __destruct() {
+ var_dump(__METHOD__);
+ }
+}
+function test() {
+  $a = array(new X, 0);
+  foreach ($a as $v) {
+    var_dump($v);
+  }
+  $a = null;
+  var_dump('done');
+}
+test();
+var_dump('exit');
diff --git a/hphp/test/slow/array_for_each/501.php b/hphp/test/slow/array_for_each/501.php
index 354b148bf..538d3e570 100644
--- a/hphp/test/slow/array_for_each/501.php
+++ b/hphp/test/slow/array_for_each/501.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function main() {
   echo "Entering main\n";
   foreach (array(1 => 1) as $k => $v) {
diff --git a/hphp/test/slow/array_functions/515.php b/hphp/test/slow/array_functions/515.php
index f6a42eb9b..2a5541f3f 100644
--- a/hphp/test/slow/array_functions/515.php
+++ b/hphp/test/slow/array_functions/515.php
@@ -1,3 +1,9 @@
 <?php
 
- class A implements Countable { public function count() { return 1;}} $obj = new A(); var_dump(count($obj));
\ No newline at end of file
+class A implements Countable {
+ public function count() {
+ return 1;
+}
+}
+ $obj = new A();
+ var_dump(count($obj));
diff --git a/hphp/test/slow/array_functions/516.php b/hphp/test/slow/array_functions/516.php
index 5de1c5416..b48cc7b16 100644
--- a/hphp/test/slow/array_functions/516.php
+++ b/hphp/test/slow/array_functions/516.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array(
   array('a' => 'a'),
   array('b' => 'bb'),
diff --git a/hphp/test/slow/array_functions/517.php b/hphp/test/slow/array_functions/517.php
index 6cedde934..42bbe86d0 100644
--- a/hphp/test/slow/array_functions/517.php
+++ b/hphp/test/slow/array_functions/517.php
@@ -1,7 +1,6 @@
 <?php
 
-
 $x = array('x' => 'y');
 $a = array('a1' => $x, 'a2' => $x);
 $b = array('a1' => array(1,2,3), 'a2' => array(1,2,3));
-var_dump(array_merge_recursive($a, $b));
\ No newline at end of file
+var_dump(array_merge_recursive($a, $b));
diff --git a/hphp/test/slow/array_functions/518.php b/hphp/test/slow/array_functions/518.php
index eeb2401a0..189beaaa4 100644
--- a/hphp/test/slow/array_functions/518.php
+++ b/hphp/test/slow/array_functions/518.php
@@ -1,7 +1,6 @@
 <?php
 
-
 $x = array('x' => 'y');
 $a = array('a1' => &$x, 'a2' => &$x);
 $b = array('a1' => array(), 'a2' => array(1,2));
-var_dump(array_merge_recursive($a, $b));
\ No newline at end of file
+var_dump(array_merge_recursive($a, $b));
diff --git a/hphp/test/slow/array_functions/519.php b/hphp/test/slow/array_functions/519.php
index 8a9c6de58..a10e3e88a 100644
--- a/hphp/test/slow/array_functions/519.php
+++ b/hphp/test/slow/array_functions/519.php
@@ -1,7 +1,6 @@
 <?php
 
-
 $x = array('x' => 'y');
 $a = array('a1' => &$x, 'a2' => &$x);
 $b = array('a1' => array(1,2), 'a2' => array(3,4));
-var_dump(array_merge_recursive($a, $b));
\ No newline at end of file
+var_dump(array_merge_recursive($a, $b));
diff --git a/hphp/test/slow/array_functions/520.php b/hphp/test/slow/array_functions/520.php
index 374be0762..6a1673eba 100644
--- a/hphp/test/slow/array_functions/520.php
+++ b/hphp/test/slow/array_functions/520.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(1 => 1, 3 => 3); var_dump(array_merge($a, array(2)));
\ No newline at end of file
+$a = array(1 => 1, 3 => 3);
+ var_dump(array_merge($a, array(2)));
diff --git a/hphp/test/slow/array_functions/521.php b/hphp/test/slow/array_functions/521.php
index 13589bb49..ceb909a19 100644
--- a/hphp/test/slow/array_functions/521.php
+++ b/hphp/test/slow/array_functions/521.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array(1 => 1, 3 => 3); var_dump(array_merge($a, array()));
\ No newline at end of file
+$a = array(1 => 1, 3 => 3);
+ var_dump(array_merge($a, array()));
diff --git a/hphp/test/slow/array_functions/522.php b/hphp/test/slow/array_functions/522.php
index b2f0b1f94..432d58695 100644
--- a/hphp/test/slow/array_functions/522.php
+++ b/hphp/test/slow/array_functions/522.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => 1, 3 => 3); var_dump(array_merge($a, array(2)));
\ No newline at end of file
+$a = array('a' => 1, 3 => 3);
+ var_dump(array_merge($a, array(2)));
diff --git a/hphp/test/slow/array_functions/523.php b/hphp/test/slow/array_functions/523.php
index 92a18d4ee..ceb0df1f3 100644
--- a/hphp/test/slow/array_functions/523.php
+++ b/hphp/test/slow/array_functions/523.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => 1, 'b' => 3); var_dump(array_merge($a, array(2)));
\ No newline at end of file
+$a = array('a' => 1, 'b' => 3);
+ var_dump(array_merge($a, array(2)));
diff --git a/hphp/test/slow/array_functions/524.php b/hphp/test/slow/array_functions/524.php
index 8fe27c1b8..86f8c4e30 100644
--- a/hphp/test/slow/array_functions/524.php
+++ b/hphp/test/slow/array_functions/524.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => 1, 3 => 3); var_dump(array_merge($a, array('a' => 2)));
\ No newline at end of file
+$a = array('a' => 1, 3 => 3);
+ var_dump(array_merge($a, array('a' => 2)));
diff --git a/hphp/test/slow/array_functions/525.php b/hphp/test/slow/array_functions/525.php
index b7b39758b..63a50374d 100644
--- a/hphp/test/slow/array_functions/525.php
+++ b/hphp/test/slow/array_functions/525.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => 1, 3 => 3); var_dump(array_merge($a, array('b' => 2)));
\ No newline at end of file
+$a = array('a' => 1, 3 => 3);
+ var_dump(array_merge($a, array('b' => 2)));
diff --git a/hphp/test/slow/array_functions/526.php b/hphp/test/slow/array_functions/526.php
index 15f00b994..e683f421b 100644
--- a/hphp/test/slow/array_functions/526.php
+++ b/hphp/test/slow/array_functions/526.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = array('a' => 1, 'b' => 3); var_dump(array_merge($a, array('c' => 2)));
\ No newline at end of file
+$a = array('a' => 1, 'b' => 3);
+ var_dump(array_merge($a, array('c' => 2)));
diff --git a/hphp/test/slow/array_functions/527.php b/hphp/test/slow/array_functions/527.php
index be82d38cc..44f691494 100644
--- a/hphp/test/slow/array_functions/527.php
+++ b/hphp/test/slow/array_functions/527.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array_unique(array(array(1,2), array(1,2), array(3,4),)));
\ No newline at end of file
+var_dump(array_unique(array(array(1,2), array(1,2), array(3,4),)));
diff --git a/hphp/test/slow/array_functions/528.php b/hphp/test/slow/array_functions/528.php
index bb78c47f1..d2c98b689 100644
--- a/hphp/test/slow/array_functions/528.php
+++ b/hphp/test/slow/array_functions/528.php
@@ -1,3 +1,5 @@
 <?php
 
- $input = array("a" => "green",               "red", "b" => "green", "blue", "red");$result = array_unique($input);print_r($result);
\ No newline at end of file
+$input = array("a" => "green",               "red", "b" => "green", "blue", "red");
+$result = array_unique($input);
+print_r($result);
diff --git a/hphp/test/slow/array_functions/529.php b/hphp/test/slow/array_functions/529.php
index 7b888b0b2..1c5b9f1a3 100644
--- a/hphp/test/slow/array_functions/529.php
+++ b/hphp/test/slow/array_functions/529.php
@@ -1,3 +1,5 @@
 <?php
 
- $input = array(4, "4", "3", 4, 3, "3");$result = array_unique($input);var_dump($result);
\ No newline at end of file
+$input = array(4, "4", "3", 4, 3, "3");
+$result = array_unique($input);
+var_dump($result);
diff --git a/hphp/test/slow/array_functions/530.php b/hphp/test/slow/array_functions/530.php
index eefc0347b..8d947d848 100644
--- a/hphp/test/slow/array_functions/530.php
+++ b/hphp/test/slow/array_functions/530.php
@@ -1,7 +1,7 @@
 <?php
 
-
-class A { }
+class A {
+ }
 $o = new A;
 $f = '10';
 $o->$f = 100;
diff --git a/hphp/test/slow/array_functions/531.php b/hphp/test/slow/array_functions/531.php
index f1483ae28..aa3e7273c 100644
--- a/hphp/test/slow/array_functions/531.php
+++ b/hphp/test/slow/array_functions/531.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x, $y) {
   var_dump($x, $y);
   return $x + $x + $y + 1;
@@ -16,4 +15,5 @@ var_dump(array_reduce(array(4), 'f', 23));
 var_dump(array_reduce(array(1,2,3,4), 'f'));
 var_dump(array_reduce(array(1,2,3,4), 'f', null));
 var_dump(array_reduce(array(1,2,3,4), 'f', 0));
-var_dump(array_reduce(array(1,2,3,4), 'f', 23));  
+var_dump(array_reduce(array(1,2,3,4), 'f', 23));
+
diff --git a/hphp/test/slow/array_functions/532.php b/hphp/test/slow/array_functions/532.php
index fd16ad3e9..6861ebb23 100644
--- a/hphp/test/slow/array_functions/532.php
+++ b/hphp/test/slow/array_functions/532.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array_filter(array(4294967295 => 22)));
\ No newline at end of file
+var_dump(array_filter(array(4294967295 => 22)));
diff --git a/hphp/test/slow/array_functions/usort.php b/hphp/test/slow/array_functions/usort.php
index 5799d7cff..a462eca1b 100644
--- a/hphp/test/slow/array_functions/usort.php
+++ b/hphp/test/slow/array_functions/usort.php
@@ -1,6 +1,8 @@
 <?php
 
-function less($a, $b) { return $a < $b; }
+function less($a, $b) {
+ return $a < $b;
+ }
 
 function main($a) {
   usort($a, 'less');
diff --git a/hphp/test/slow/array_init/245.php b/hphp/test/slow/array_init/245.php
index c1f6f04e6..e1cff96a5 100644
--- a/hphp/test/slow/array_init/245.php
+++ b/hphp/test/slow/array_init/245.php
@@ -1,7 +1,10 @@
 <?php
 
-
-class MyClass { function __toString() { return 'foo'; } }
+class MyClass {
+ function __toString() {
+ return 'foo';
+ }
+ }
 $obj = new MyClass();
 $arr = array($obj => 1, new MyClass() => 2, false => 3, true => 4, count(array(1,2,3)) => 5);
 var_dump($arr);
diff --git a/hphp/test/slow/array_init/246.php b/hphp/test/slow/array_init/246.php
index 006e48d54..1032bc03c 100644
--- a/hphp/test/slow/array_init/246.php
+++ b/hphp/test/slow/array_init/246.php
@@ -1,9 +1,14 @@
 <?php
 
-
-function f() { throw new Exception(); }
+function f() {
+ throw new Exception();
+ }
 function test() {
   $a = array(1, f(), 2, f(), 3);
   var_dump($a);
 }
-try { test(); } catch (Exception $e) { }
+try {
+ test();
+ }
+ catch (Exception $e) {
+ }
diff --git a/hphp/test/slow/array_init/247.php b/hphp/test/slow/array_init/247.php
index 4e260e2ae..c42b77ef1 100644
--- a/hphp/test/slow/array_init/247.php
+++ b/hphp/test/slow/array_init/247.php
@@ -1,4 +1,8 @@
 <?php
 
-
-function test($x, $y) {$a = array($x, $y);$a[] = 3;return $a;}var_dump(test(1,2));
\ No newline at end of file
+function test($x, $y) {
+$a = array($x, $y);
+$a[] = 3;
+return $a;
+}
+var_dump(test(1,2));
diff --git a/hphp/test/slow/array_init/248.php b/hphp/test/slow/array_init/248.php
index bdeb2954f..1957a8caf 100644
--- a/hphp/test/slow/array_init/248.php
+++ b/hphp/test/slow/array_init/248.php
@@ -1,4 +1,20 @@
 <?php
 
-
-function foo($p) {  $a = array('a', 'b', $p);  $a[] = 'd';  var_dump($a);  $a = array(0 => 'a', 1 => 'b', 2 => $p);  $a[] = 'd';  var_dump($a);  $a = array(2 => 'a', 4 => 'b', 6 => $p);  $a[] = 'd';  var_dump($a);  $a = array(-2 => 'a', -4 => 'b', -6 => $p);  $a[] = 'd';  var_dump($a);  $a = array(0 => 'a');  $a[] = 'b';  var_dump($a);}foo('c');
\ No newline at end of file
+function foo($p) {
+  $a = array('a', 'b', $p);
+  $a[] = 'd';
+  var_dump($a);
+  $a = array(0 => 'a', 1 => 'b', 2 => $p);
+  $a[] = 'd';
+  var_dump($a);
+  $a = array(2 => 'a', 4 => 'b', 6 => $p);
+  $a[] = 'd';
+  var_dump($a);
+  $a = array(-2 => 'a', -4 => 'b', -6 => $p);
+  $a[] = 'd';
+  var_dump($a);
+  $a = array(0 => 'a');
+  $a[] = 'b';
+  var_dump($a);
+}
+foo('c');
diff --git a/hphp/test/slow/array_init/249.php b/hphp/test/slow/array_init/249.php
index 93c936cbb..c7ee061de 100644
--- a/hphp/test/slow/array_init/249.php
+++ b/hphp/test/slow/array_init/249.php
@@ -1,4 +1,8 @@
 <?php
 
-
-$v = 1;function foo($a) {  $arr = array($a, $a++, $a);  var_dump($arr);}foo($v);
\ No newline at end of file
+$v = 1;
+function foo($a) {
+  $arr = array($a, $a++, $a);
+  var_dump($arr);
+}
+foo($v);
diff --git a/hphp/test/slow/array_iterator/439.php b/hphp/test/slow/array_iterator/439.php
index 44a84526e..6845c262c 100644
--- a/hphp/test/slow/array_iterator/439.php
+++ b/hphp/test/slow/array_iterator/439.php
@@ -1,13 +1,71 @@
 <?php
 
- class MyIterator implements Iterator{  private $var = array();  public function __construct($array)  {    echo "constructing
-";    if (is_array($array)) {        $this->var = $array;    }  }  public function rewind() {    echo "rewinding
-";    reset($this->var);  }  public function current() {    $var = current($this->var);    echo "current: $var
-";    return $var;  }  public function key() {    $var = key($this->var);    echo "key: $var
-";    return $var;  }  public function next() {    $var = next($this->var);    echo "next: $var
-";    return $var;  }  public function valid() {    $var = $this->current() !== false;    echo "valid: {$var}
-";    return $var;  }}$values = array(1,2,3);$it = new MyIterator($values);foreach ($it as $a => $b) {  print "$a: $b
-";}$itp = "it";foreach ($$itp as $a => $b) {  print "$a: $b
-";}function getIter() {  $values = array(1,2,3);  $it = new MyIterator($values);  return $it;}foreach (getIter() as $a => $b) {  print "$a: $b
-";}class MyIteratorAggregate implements IteratorAggregate {  public function getIterator() {    return getIter();  }}$obj = new MyIteratorAggregate();foreach ($obj as $a => $b) {  print "$a: $b
-";}
\ No newline at end of file
+class MyIterator implements Iterator{
+  private $var = array();
+  public function __construct($array)  {
+    echo "constructing
+";
+    if (is_array($array)) {
+        $this->var = $array;
+    }
+  }
+  public function rewind() {
+    echo "rewinding
+";
+    reset($this->var);
+  }
+  public function current() {
+    $var = current($this->var);
+    echo "current: $var
+";
+    return $var;
+  }
+  public function key() {
+    $var = key($this->var);
+    echo "key: $var
+";
+    return $var;
+  }
+  public function next() {
+    $var = next($this->var);
+    echo "next: $var
+";
+    return $var;
+  }
+  public function valid() {
+    $var = $this->current() !== false;
+    echo "valid: $var
+";
+    return $var;
+  }
+}
+$values = array(1,2,3);
+$it = new MyIterator($values);
+foreach ($it as $a => $b) {
+  print "$a: $b
+";
+}
+$itp = "it";
+foreach ($$itp as $a => $b) {
+  print "$a: $b
+";
+}
+function getIter() {
+  $values = array(1,2,3);
+  $it = new MyIterator($values);
+  return $it;
+}
+foreach (getIter() as $a => $b) {
+  print "$a: $b
+";
+}
+class MyIteratorAggregate implements IteratorAggregate {
+  public function getIterator() {
+    return getIter();
+  }
+}
+$obj = new MyIteratorAggregate();
+foreach ($obj as $a => $b) {
+  print "$a: $b
+";
+}
diff --git a/hphp/test/slow/array_iterator/440.php b/hphp/test/slow/array_iterator/440.php
index 9669a35b2..e3bc0a66a 100644
--- a/hphp/test/slow/array_iterator/440.php
+++ b/hphp/test/slow/array_iterator/440.php
@@ -1,9 +1,12 @@
 <?php
 
-
 $a = array(1, 2, 3, 4, 5, 6);
-while ($v = each($a)) { if ($v[1] < 4) $a[] = $v[1] + $v[1]; }
+while ($v = each($a)) {
+ if ($v[1] < 4) $a[] = $v[1] + $v[1];
+ }
 var_dump($a);
 $a = array(1, 2, 3, 4, 5, 6);
-foreach ($a as $k => $v) { if ($v >= 4) $a = $v + $v; }
+foreach ($a as $k => $v) {
+ if ($v >= 4) $a = $v + $v;
+ }
 var_dump($a);
diff --git a/hphp/test/slow/array_iterator/441.php b/hphp/test/slow/array_iterator/441.php
index b2a08d9ef..324e65fd6 100644
--- a/hphp/test/slow/array_iterator/441.php
+++ b/hphp/test/slow/array_iterator/441.php
@@ -1,10 +1,16 @@
 <?php
 
-
 $arr = array('bar', 'bar', 'bar', 'bar', 'bar', 'bar', 'foo');
 function foo() {
-  var_dump(__FUNCTION__); global $arr; $arr[] = 'bar';
+  var_dump(__FUNCTION__);
+ global $arr;
+ $arr[] = 'bar';
 }
-function bar() { var_dump(__FUNCTION__); }
+function bar() {
+ var_dump(__FUNCTION__);
+ }
 reset($arr);
-while ($func = each($arr)) { $f = $func[1]; $f(); }
+while ($func = each($arr)) {
+ $f = $func[1];
+ $f();
+ }
diff --git a/hphp/test/slow/array_iterator/442.php b/hphp/test/slow/array_iterator/442.php
index 95f5c03d0..61f68a8b0 100644
--- a/hphp/test/slow/array_iterator/442.php
+++ b/hphp/test/slow/array_iterator/442.php
@@ -1,3 +1,11 @@
 <?php
 
- function test($a) {  $it = new ArrayIterator($a);  while ($it->valid()) {    var_dump($it->key());    var_dump($it->current());    $it->next();  }}test(array('a' => 'x',           false => 'y',           '1' => false,           null => 'z',           'c' => 'w'));
\ No newline at end of file
+function test($a) {
+  $it = new ArrayIterator($a);
+  while ($it->valid()) {
+    var_dump($it->key());
+    var_dump($it->current());
+    $it->next();
+  }
+}
+test(array('a' => 'x',           false => 'y',           '1' => false,           null => 'z',           'c' => 'w'));
diff --git a/hphp/test/slow/array_iterator/443.php b/hphp/test/slow/array_iterator/443.php
index 4de580e19..840e1272d 100644
--- a/hphp/test/slow/array_iterator/443.php
+++ b/hphp/test/slow/array_iterator/443.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array(1, 2, 3);
 $o = new ArrayIterator($a);
 var_dump($o->next());
diff --git a/hphp/test/slow/array_iterator/446.php b/hphp/test/slow/array_iterator/446.php
index ec1af469f..b6e1b9b26 100644
--- a/hphp/test/slow/array_iterator/446.php
+++ b/hphp/test/slow/array_iterator/446.php
@@ -1,3 +1,189 @@
 <?php
 
-function ex($m) {  var_dump('Throwing: '.$m);  throw new Exception($m);}class A {  public function __construct() {    var_dump(__METHOD__);  }  public function __destruct() {    var_dump(__METHOD__);  }}class B {  public $a;  public function gen() {    ex('die!');    yield(2);  }  function __destruct() {    var_dump(__METHOD__);  }}class II {  private $tn, $tv;  function __construct($tn, $tv) { $this->tn = $tn; $this->tv = $tv; }  function __destruct() {    var_dump(__METHOD__);  }  public function gen() { return new I($this->tn, $this->tv); }}class JJ {  private $tn, $tv;  function __construct($tn, $tv) { $this->tn = $tn; $this->tv = $tv; }  function __destruct() {    var_dump(__METHOD__);  }  public function gen() { return new J($this->tn, $this->tv); }}class KK {  private $tn, $tv;  function __construct($tn, $tv) { $this->tn = $tn; $this->tv = $tv; }  function __destruct() {    var_dump(__METHOD__);  }  public function gen() { return new K($this->tn, $this->tv); }}class LL {  private $tn, $tv;  function __construct($tn, $tv) { $this->tn = $tn; $this->tv = $tv; }  function __destruct() {    var_dump(__METHOD__);  }  public function gen() { return new L($this->tn, $this->tv); }}class I implements Iterator{  private $tn, $tv, $i = 0;  public function gen() { return $this; }  public function __construct($tn, $tv) {    $this->tn = $tn;    $this->tv = $tv;  }  public function __destruct() {    var_dump(__METHOD__);  }  public function rewind() {    var_dump(__METHOD__);    if ($this->tn == 0) ex(__METHOD__);    $this->i = 1;  }  public function current() {    var_dump(__METHOD__);    return $this->i;  }  public function key() {    var_dump(__METHOD__);    return $this->i;  }  public function next() {    var_dump(__METHOD__);    if ($this->tn == $this->i) ex(__METHOD__);    return ++$this->i;  }  public function valid() {    var_dump(__METHOD__);    if ($this->tv == $this->i) ex(__METHOD__);    return $this->i < 10;  }}class J implements IteratorAggregate {  private $i;  public function __construct($tn, $tv) {    $this->i = new I($tn, $tv);  }  public function __destruct() {    var_dump(__METHOD__);  }  public function getIterator() { return $this->i; }  public function gen() { return $this; }}class K implements IteratorAggregate {  private $tn, $tv;  public function __construct($tn, $tv) {    $this->tn = $tn;    $this->tv = $tv;  }  public function __destruct() {    var_dump(__METHOD__);  }  public function getIterator() { return new I($this->tn, $this->tv); }  public function gen() { return $this; }}class L implements IteratorAggregate {  public function getIterator() { ex(__METHOD__); }  public function gen() { return $this; }}function run($n, $tn, $tv) {  var_dump('>>>main');  $a = new A();  $b = new $n($tn, $tv);  $b->a = $a;  try {    foreach ($b->gen() as $k) {      var_dump('got '.$k);    }  } catch(Exception $e) {    var_dump('Exception: ' . $e->getMessage());    unset($e);  }  unset($b);  var_dump('<<<main');}function test($n, $tn, $tv) {  run($n, $tn, $tv);  var_dump('Done: '.$n);}function triple($n) {  test($n, 0, 0);  test($n, -1, 1);  test($n, 2,-1);}function main() {  triple('I');  triple('J');  triple('K');  triple('L');  triple('II');  triple('JJ');  triple('KK');  triple('LL');  test('B', 0, 0);}main();
\ No newline at end of file
+function ex($m) {
+  var_dump('Throwing: '.$m);
+  throw new Exception($m);
+}
+class A {
+  public function __construct() {
+    var_dump(__METHOD__);
+  }
+  public function __destruct() {
+    var_dump(__METHOD__);
+  }
+}
+class B {
+  public $a;
+  public function gen() {
+    ex('die!');
+    yield(2);
+  }
+  function __destruct() {
+    var_dump(__METHOD__);
+  }
+}
+class II {
+  private $tn, $tv;
+  function __construct($tn, $tv) {
+ $this->tn = $tn;
+ $this->tv = $tv;
+ }
+  function __destruct() {
+    var_dump(__METHOD__);
+  }
+  public function gen() {
+ return new I($this->tn, $this->tv);
+ }
+}
+class JJ {
+  private $tn, $tv;
+  function __construct($tn, $tv) {
+ $this->tn = $tn;
+ $this->tv = $tv;
+ }
+  function __destruct() {
+    var_dump(__METHOD__);
+  }
+  public function gen() {
+ return new J($this->tn, $this->tv);
+ }
+}
+class KK {
+  private $tn, $tv;
+  function __construct($tn, $tv) {
+ $this->tn = $tn;
+ $this->tv = $tv;
+ }
+  function __destruct() {
+    var_dump(__METHOD__);
+  }
+  public function gen() {
+ return new K($this->tn, $this->tv);
+ }
+}
+class LL {
+  private $tn, $tv;
+  function __construct($tn, $tv) {
+ $this->tn = $tn;
+ $this->tv = $tv;
+ }
+  function __destruct() {
+    var_dump(__METHOD__);
+  }
+  public function gen() {
+ return new L($this->tn, $this->tv);
+ }
+}
+class I implements Iterator{
+  private $tn, $tv, $i = 0;
+  public function gen() {
+ return $this;
+ }
+  public function __construct($tn, $tv) {
+    $this->tn = $tn;
+    $this->tv = $tv;
+  }
+  public function __destruct() {
+    var_dump(__METHOD__);
+  }
+  public function rewind() {
+    var_dump(__METHOD__);
+    if ($this->tn == 0) ex(__METHOD__);
+    $this->i = 1;
+  }
+  public function current() {
+    var_dump(__METHOD__);
+    return $this->i;
+  }
+  public function key() {
+    var_dump(__METHOD__);
+    return $this->i;
+  }
+  public function next() {
+    var_dump(__METHOD__);
+    if ($this->tn == $this->i) ex(__METHOD__);
+    return ++$this->i;
+  }
+  public function valid() {
+    var_dump(__METHOD__);
+    if ($this->tv == $this->i) ex(__METHOD__);
+    return $this->i < 10;
+  }
+}
+class J implements IteratorAggregate {
+  private $i;
+  public function __construct($tn, $tv) {
+    $this->i = new I($tn, $tv);
+  }
+  public function __destruct() {
+    var_dump(__METHOD__);
+  }
+  public function getIterator() {
+ return $this->i;
+ }
+  public function gen() {
+ return $this;
+ }
+}
+class K implements IteratorAggregate {
+  private $tn, $tv;
+  public function __construct($tn, $tv) {
+    $this->tn = $tn;
+    $this->tv = $tv;
+  }
+  public function __destruct() {
+    var_dump(__METHOD__);
+  }
+  public function getIterator() {
+ return new I($this->tn, $this->tv);
+ }
+  public function gen() {
+ return $this;
+ }
+}
+class L implements IteratorAggregate {
+  public function getIterator() {
+ ex(__METHOD__);
+ }
+  public function gen() {
+ return $this;
+ }
+}
+function run($n, $tn, $tv) {
+  var_dump('>>>main');
+  $a = new A();
+  $b = new $n($tn, $tv);
+  $b->a = $a;
+  try {
+    foreach ($b->gen() as $k) {
+      var_dump('got '.$k);
+    }
+  }
+ catch(Exception $e) {
+    var_dump('Exception: ' . $e->getMessage());
+    unset($e);
+  }
+  unset($b);
+  var_dump('<<<main');
+}
+function test($n, $tn, $tv) {
+  run($n, $tn, $tv);
+  var_dump('Done: '.$n);
+}
+function triple($n) {
+  test($n, 0, 0);
+  test($n, -1, 1);
+  test($n, 2,-1);
+}
+function main() {
+  triple('I');
+  triple('J');
+  triple('K');
+  triple('L');
+  triple('II');
+  triple('JJ');
+  triple('KK');
+  triple('LL');
+  test('B', 0, 0);
+}
+main();
diff --git a/hphp/test/slow/array_iterator/array-traversable.php b/hphp/test/slow/array_iterator/array-traversable.php
index 2d2f8cf62..242c8bdd9 100644
--- a/hphp/test/slow/array_iterator/array-traversable.php
+++ b/hphp/test/slow/array_iterator/array-traversable.php
@@ -1,5 +1,7 @@
 <?php
-interface IFoo {}
+
+interface IFoo {
+}
 function trav(Traversable $x) {
   echo "Traversable " . $x . " \n";
   var_dump($x);
diff --git a/hphp/test/slow/array_object/append.php b/hphp/test/slow/array_object/append.php
index 1aa8af01b..da7f7ca8a 100644
--- a/hphp/test/slow/array_object/append.php
+++ b/hphp/test/slow/array_object/append.php
@@ -1,4 +1,5 @@
 <?php
+
 $arrayobj = new ArrayObject(array('first','second','third'));
 $arrayobj->append('fourth');
 $arrayobj->append(array('five', 'six'));
diff --git a/hphp/test/slow/array_object/asort.php b/hphp/test/slow/array_object/asort.php
index 75cdf6847..e843f578e 100644
--- a/hphp/test/slow/array_object/asort.php
+++ b/hphp/test/slow/array_object/asort.php
@@ -1,4 +1,5 @@
 <?php
+
 $fruits = array(
   "d" => "lemon",
   "a" => "orange",
diff --git a/hphp/test/slow/array_object/count.php b/hphp/test/slow/array_object/count.php
index aa9ab7891..8eaa7fd6e 100644
--- a/hphp/test/slow/array_object/count.php
+++ b/hphp/test/slow/array_object/count.php
@@ -1,4 +1,5 @@
 <?php
+
 class Example {
     public $public = 'prop:public';
     private $prv   = 'prop:private';
diff --git a/hphp/test/slow/array_object/exchangeArray.php b/hphp/test/slow/array_object/exchangeArray.php
index 9c1174fd3..762f4ab6e 100644
--- a/hphp/test/slow/array_object/exchangeArray.php
+++ b/hphp/test/slow/array_object/exchangeArray.php
@@ -1,4 +1,5 @@
 <?php
+
 // Array of available fruits
 $fruits = array("lemons" => 1, "oranges" => 4, "bananas" => 5, "apples" => 10);
 // Array of locations in Europe
diff --git a/hphp/test/slow/array_object/getArrayCopy.php b/hphp/test/slow/array_object/getArrayCopy.php
index e630150d9..629aaf6b6 100644
--- a/hphp/test/slow/array_object/getArrayCopy.php
+++ b/hphp/test/slow/array_object/getArrayCopy.php
@@ -1,4 +1,5 @@
 <?php
+
 // Array of available fruits
 $fruits = array("lemons" => 1, "oranges" => 4, "bananas" => 5, "apples" => 10);
 
diff --git a/hphp/test/slow/array_object/getFlags.php b/hphp/test/slow/array_object/getFlags.php
index ccaa2aaeb..c589e782b 100644
--- a/hphp/test/slow/array_object/getFlags.php
+++ b/hphp/test/slow/array_object/getFlags.php
@@ -1,4 +1,5 @@
 <?php
+
 // Array of available fruits
 $fruits = array("lemons" => 1, "oranges" => 4, "bananas" => 5, "apples" => 10);
 
diff --git a/hphp/test/slow/array_object/getIterator.php b/hphp/test/slow/array_object/getIterator.php
index 7b8d231c2..3b0cb4a35 100644
--- a/hphp/test/slow/array_object/getIterator.php
+++ b/hphp/test/slow/array_object/getIterator.php
@@ -1,4 +1,5 @@
 <?php
+
 $array = array('1' => 'one',
                '2' => 'two',
                '3' => 'three');
diff --git a/hphp/test/slow/array_object/getIteratorClass.php b/hphp/test/slow/array_object/getIteratorClass.php
index 5e10c1b0a..4dcd6aeca 100644
--- a/hphp/test/slow/array_object/getIteratorClass.php
+++ b/hphp/test/slow/array_object/getIteratorClass.php
@@ -1,4 +1,5 @@
 <?php
+
 // Custom ArrayIterator (inherits from ArrayIterator)
 class MyArrayIterator extends ArrayIterator {
     // custom implementation
diff --git a/hphp/test/slow/array_object/ksort.php b/hphp/test/slow/array_object/ksort.php
index 8c72a2e93..62b48dc41 100644
--- a/hphp/test/slow/array_object/ksort.php
+++ b/hphp/test/slow/array_object/ksort.php
@@ -1,4 +1,5 @@
 <?php
+
 $fruits = array(
   "d" => "lemon",
   "a" => "orange",
diff --git a/hphp/test/slow/array_object/natcasesort.php b/hphp/test/slow/array_object/natcasesort.php
index f5994066d..7cae15662 100644
--- a/hphp/test/slow/array_object/natcasesort.php
+++ b/hphp/test/slow/array_object/natcasesort.php
@@ -1,4 +1,5 @@
 <?php
+
 $array = array(
   'IMG0.png',
   'img12.png',
diff --git a/hphp/test/slow/array_object/natsort.php b/hphp/test/slow/array_object/natsort.php
index 7ff296413..916ff2ac0 100644
--- a/hphp/test/slow/array_object/natsort.php
+++ b/hphp/test/slow/array_object/natsort.php
@@ -1,4 +1,5 @@
 <?php
+
 $array = array("img12.png", "img10.png", "img2.png", "img1.png");
 
 $arr1 = new ArrayObject($array);
diff --git a/hphp/test/slow/array_object/offsetExists.php b/hphp/test/slow/array_object/offsetExists.php
index 8adc82fe8..d1116da31 100644
--- a/hphp/test/slow/array_object/offsetExists.php
+++ b/hphp/test/slow/array_object/offsetExists.php
@@ -1,4 +1,5 @@
 <?php
+
 $arrayobj = new ArrayObject(array('zero', 'one', 'example'=>'e.g.'));
 var_dump($arrayobj->offsetExists(1));
 var_dump($arrayobj->offsetExists('example'));
diff --git a/hphp/test/slow/array_object/offsetGet.php b/hphp/test/slow/array_object/offsetGet.php
index 4785abf9c..f0622a468 100644
--- a/hphp/test/slow/array_object/offsetGet.php
+++ b/hphp/test/slow/array_object/offsetGet.php
@@ -1,4 +1,5 @@
 <?php
+
 $arrayobj = new ArrayObject(array('zero', 7, 'example'=>'e.g.'));
 var_dump($arrayobj->offsetGet(1));
 var_dump($arrayobj->offsetGet('example'));
diff --git a/hphp/test/slow/array_object/offsetSet.php b/hphp/test/slow/array_object/offsetSet.php
index 4f817f955..21838450d 100644
--- a/hphp/test/slow/array_object/offsetSet.php
+++ b/hphp/test/slow/array_object/offsetSet.php
@@ -1,4 +1,5 @@
 <?php
+
 class Example {
   public $property = 'prop:public';
 }
diff --git a/hphp/test/slow/array_object/offsetUnset.php b/hphp/test/slow/array_object/offsetUnset.php
index 5bc2f76e7..b8391e3cc 100644
--- a/hphp/test/slow/array_object/offsetUnset.php
+++ b/hphp/test/slow/array_object/offsetUnset.php
@@ -1,4 +1,5 @@
 <?php
+
 $arrayobj = new ArrayObject(array(0=>'zero',2=>'two'));
 $arrayobj->offsetUnset(2);
 var_dump($arrayobj);
diff --git a/hphp/test/slow/array_object/serialize.php b/hphp/test/slow/array_object/serialize.php
index 9c33f5545..f05e4235c 100644
--- a/hphp/test/slow/array_object/serialize.php
+++ b/hphp/test/slow/array_object/serialize.php
@@ -1,4 +1,5 @@
 <?php
+
 $o = new ArrayObject();
 
 $s1 = serialize($o);
diff --git a/hphp/test/slow/array_object/setFlags.php b/hphp/test/slow/array_object/setFlags.php
index 39c5168ba..208153885 100644
--- a/hphp/test/slow/array_object/setFlags.php
+++ b/hphp/test/slow/array_object/setFlags.php
@@ -1,4 +1,5 @@
 <?php
+
 // Array of available fruits
 $fruits = array(
   "lemons" => 1,
diff --git a/hphp/test/slow/array_object/setIteratorClass.php b/hphp/test/slow/array_object/setIteratorClass.php
index ddaaf20b2..0c5f04a12 100644
--- a/hphp/test/slow/array_object/setIteratorClass.php
+++ b/hphp/test/slow/array_object/setIteratorClass.php
@@ -1,4 +1,5 @@
 <?php
+
 // Custom ArrayIterator (inherits from ArrayIterator)
 class MyArrayIterator extends ArrayIterator {
   // custom implementation
diff --git a/hphp/test/slow/array_object/uasort.php b/hphp/test/slow/array_object/uasort.php
index ef62687e6..1566011e9 100644
--- a/hphp/test/slow/array_object/uasort.php
+++ b/hphp/test/slow/array_object/uasort.php
@@ -1,4 +1,5 @@
 <?php
+
 // Comparison function
 function cmp($a, $b) {
     if ($a == $b) {
diff --git a/hphp/test/slow/array_object/uksort.php b/hphp/test/slow/array_object/uksort.php
index 4445e9864..e2edb449d 100644
--- a/hphp/test/slow/array_object/uksort.php
+++ b/hphp/test/slow/array_object/uksort.php
@@ -1,4 +1,5 @@
 <?php
+
 function cmp($a, $b) {
     $a = preg_replace('@^(a|an|the) @', '', $a);
     $b = preg_replace('@^(a|an|the) @', '', $b);
diff --git a/hphp/test/slow/array_object/unserialize.php b/hphp/test/slow/array_object/unserialize.php
index 95886e347..80b32f0b4 100644
--- a/hphp/test/slow/array_object/unserialize.php
+++ b/hphp/test/slow/array_object/unserialize.php
@@ -1,4 +1,5 @@
 <?php
+
 $a = new ArrayObject(array(1,2,3));
 $b = $a->serialize();
 $c = new ArrayObject;
diff --git a/hphp/test/slow/array_offset/418.php b/hphp/test/slow/array_offset/418.php
index b04919748..d885a03a2 100644
--- a/hphp/test/slow/array_offset/418.php
+++ b/hphp/test/slow/array_offset/418.php
@@ -1,3 +1,4 @@
 <?php
 
- $a['test_cache_2'] = 10; print $a['test_cache_26'];
\ No newline at end of file
+$a['test_cache_2'] = 10;
+ print $a['test_cache_26'];
diff --git a/hphp/test/slow/array_offset/419.php b/hphp/test/slow/array_offset/419.php
index e473047bb..ac820a953 100644
--- a/hphp/test/slow/array_offset/419.php
+++ b/hphp/test/slow/array_offset/419.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $b = $a[0]; var_dump($b);
\ No newline at end of file
+$a = array(10);
+ $b = $a[0];
+ var_dump($b);
diff --git a/hphp/test/slow/array_offset/420.php b/hphp/test/slow/array_offset/420.php
index 7b70a5efa..655b57798 100644
--- a/hphp/test/slow/array_offset/420.php
+++ b/hphp/test/slow/array_offset/420.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(10); $b = $a[0] + 15; var_dump($b);
\ No newline at end of file
+$a = array(10);
+ $b = $a[0] + 15;
+ var_dump($b);
diff --git a/hphp/test/slow/array_offset/421.php b/hphp/test/slow/array_offset/421.php
index 48490e92c..04b3ec378 100644
--- a/hphp/test/slow/array_offset/421.php
+++ b/hphp/test/slow/array_offset/421.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 1; $a = array($a); $a = array($a); var_dump($a);
\ No newline at end of file
+$a = 1;
+ $a = array($a);
+ $a = array($a);
+ var_dump($a);
diff --git a/hphp/test/slow/array_offset/422.php b/hphp/test/slow/array_offset/422.php
index 14b5d5e52..c4aeb2682 100644
--- a/hphp/test/slow/array_offset/422.php
+++ b/hphp/test/slow/array_offset/422.php
@@ -1,3 +1,4 @@
 <?php
 
- $a['A'] = array(1, 2); foreach ($a['A'] as $item) print $item;
\ No newline at end of file
+$a['A'] = array(1, 2);
+ foreach ($a['A'] as $item) print $item;
diff --git a/hphp/test/slow/array_offset/423.php b/hphp/test/slow/array_offset/423.php
index 3db26317e..f1e371b3f 100644
--- a/hphp/test/slow/array_offset/423.php
+++ b/hphp/test/slow/array_offset/423.php
@@ -1,3 +1,4 @@
 <?php
 
- $a['A']['B'] = 1; var_dump($a);
\ No newline at end of file
+$a['A']['B'] = 1;
+ var_dump($a);
diff --git a/hphp/test/slow/array_offset/424.php b/hphp/test/slow/array_offset/424.php
index 379e8a37e..80b2e81e4 100644
--- a/hphp/test/slow/array_offset/424.php
+++ b/hphp/test/slow/array_offset/424.php
@@ -1,3 +1,5 @@
 <?php
 
- $a['A'] = 10; $a['A']++; var_dump($a);
\ No newline at end of file
+$a['A'] = 10;
+ $a['A']++;
+ var_dump($a);
diff --git a/hphp/test/slow/array_offset/425.php b/hphp/test/slow/array_offset/425.php
index 473be603f..eda8be9e5 100644
--- a/hphp/test/slow/array_offset/425.php
+++ b/hphp/test/slow/array_offset/425.php
@@ -1,3 +1,5 @@
 <?php
 
- $a['A'] = 10; ++$a['A']; var_dump($a);
\ No newline at end of file
+$a['A'] = 10;
+ ++$a['A'];
+ var_dump($a);
diff --git a/hphp/test/slow/array_offset/426.php b/hphp/test/slow/array_offset/426.php
index 117d70ea3..797840dd0 100644
--- a/hphp/test/slow/array_offset/426.php
+++ b/hphp/test/slow/array_offset/426.php
@@ -1,3 +1,5 @@
 <?php
 
- $a['A'] = 10; $a['A'] .= 'test'; var_dump($a);
\ No newline at end of file
+$a['A'] = 10;
+ $a['A'] .= 'test';
+ var_dump($a);
diff --git a/hphp/test/slow/array_offset/427.php b/hphp/test/slow/array_offset/427.php
index bd320c28e..76c253903 100644
--- a/hphp/test/slow/array_offset/427.php
+++ b/hphp/test/slow/array_offset/427.php
@@ -1,3 +1,5 @@
 <?php
 
- $a['A'] = 10; $a['A'] += 25; var_dump($a);
\ No newline at end of file
+$a['A'] = 10;
+ $a['A'] += 25;
+ var_dump($a);
diff --git a/hphp/test/slow/array_offset/428.php b/hphp/test/slow/array_offset/428.php
index 492aab70b..37fe26251 100644
--- a/hphp/test/slow/array_offset/428.php
+++ b/hphp/test/slow/array_offset/428.php
@@ -1,3 +1,6 @@
 <?php
 
- $a[null] = 10;var_dump($a[null]);var_dump($a[""]);var_dump($a['']);
\ No newline at end of file
+$a[null] = 10;
+var_dump($a[null]);
+var_dump($a[""]);
+var_dump($a['']);
diff --git a/hphp/test/slow/array_offset/429.php b/hphp/test/slow/array_offset/429.php
index 79bba42f9..e392e04f5 100644
--- a/hphp/test/slow/array_offset/429.php
+++ b/hphp/test/slow/array_offset/429.php
@@ -1,3 +1,17 @@
 <?php
 
- $a = array();$a[0] = 1;$a[01] = 2;$a[007] = 3;$a[08] = 4;$a[0xa] = 5;var_dump($a);var_dump("$a[0]");var_dump("$a[1]");var_dump("$a[7]");var_dump("$a[10]");var_dump("$a[01]");var_dump("$a[007]");var_dump("$a[08]");var_dump("$a[0xa]");
\ No newline at end of file
+$a = array();
+$a[0] = 1;
+$a[01] = 2;
+$a[007] = 3;
+$a[08] = 4;
+$a[0xa] = 5;
+var_dump($a);
+var_dump("$a[0]");
+var_dump("$a[1]");
+var_dump("$a[7]");
+var_dump("$a[10]");
+var_dump("$a[01]");
+var_dump("$a[007]");
+var_dump("$a[08]");
+var_dump("$a[0xa]");
diff --git a/hphp/test/slow/array_offset/430.php b/hphp/test/slow/array_offset/430.php
index 0d862361b..061c1bc43 100644
--- a/hphp/test/slow/array_offset/430.php
+++ b/hphp/test/slow/array_offset/430.php
@@ -1,3 +1,19 @@
 <?php
 
- class A {  const i1= -1;  const i2= -2;  static $s = -4;};class B {  static $s = -5;};$attr=array();$attr[a::i1]='abc';$attr[a::i2]='def';$attr[-3]='ghi';$attr[a::$s]='jkl';$attr[b::$s]='mno';var_dump($attr);
\ No newline at end of file
+class A {
+  const i1= -1;
+  const i2= -2;
+  static $s = -4;
+}
+;
+class B {
+  static $s = -5;
+}
+;
+$attr=array();
+$attr[a::i1]='abc';
+$attr[a::i2]='def';
+$attr[-3]='ghi';
+$attr[a::$s]='jkl';
+$attr[b::$s]='mno';
+var_dump($attr);
diff --git a/hphp/test/slow/array_offset/431.php b/hphp/test/slow/array_offset/431.php
index 57982c14c..7fe4cce7b 100644
--- a/hphp/test/slow/array_offset/431.php
+++ b/hphp/test/slow/array_offset/431.php
@@ -1,3 +1,7 @@
 <?php
 
- function foo(&$a) {}foo($a[array()]);foo($a[new StdClass]);var_dump($a);
\ No newline at end of file
+function foo(&$a) {
+}
+foo($a[array()]);
+foo($a[new StdClass]);
+var_dump($a);
diff --git a/hphp/test/slow/array_offset/432.php b/hphp/test/slow/array_offset/432.php
index ed46d46af..316815615 100644
--- a/hphp/test/slow/array_offset/432.php
+++ b/hphp/test/slow/array_offset/432.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f(&$elem) {
 $elem = 44;
 }
diff --git a/hphp/test/slow/array_offset/433.php b/hphp/test/slow/array_offset/433.php
index c90ff9bf7..3157384b9 100644
--- a/hphp/test/slow/array_offset/433.php
+++ b/hphp/test/slow/array_offset/433.php
@@ -1,3 +1,15 @@
 <?php
 
- function foo($p) {  return $p;}$a = array(1, 2, 3, 4);$a[123] = 5;$a["0000"] = 6;var_dump(foo(__LINE__));var_dump(foo(array()));var_dump(foo(array(1, 2, 3)));var_dump(foo($a[123]));var_dump(foo($a[0000]));var_dump(foo("$a[123]"));var_dump(foo("$a[0000]"));
\ No newline at end of file
+function foo($p) {
+  return $p;
+}
+$a = array(1, 2, 3, 4);
+$a[123] = 5;
+$a["0000"] = 6;
+var_dump(foo(__LINE__));
+var_dump(foo(array()));
+var_dump(foo(array(1, 2, 3)));
+var_dump(foo($a[123]));
+var_dump(foo($a[0000]));
+var_dump(foo("$a[123]"));
+var_dump(foo("$a[0000]"));
diff --git a/hphp/test/slow/array_offset/433.php.expect b/hphp/test/slow/array_offset/433.php.expect
index 245d6853f..6a952a5c6 100644
--- a/hphp/test/slow/array_offset/433.php.expect
+++ b/hphp/test/slow/array_offset/433.php.expect
@@ -1,4 +1,4 @@
-int(3)
+int(9)
 array(0) {
 }
 array(3) {
diff --git a/hphp/test/slow/assert_options/1372.php b/hphp/test/slow/assert_options/1372.php
index 863e74254..a6a439d41 100644
--- a/hphp/test/slow/assert_options/1372.php
+++ b/hphp/test/slow/assert_options/1372.php
@@ -1,3 +1,17 @@
 <?php
 
- assert_options(ASSERT_ACTIVE, 0);assert_options(ASSERT_WARNING, 0);var_dump(assert(false));var_dump(assert_options(ASSERT_ACTIVE, 0));var_dump(assert_options(ASSERT_WARNING, 1));var_dump(assert(false));var_dump(assert_options(ASSERT_ACTIVE, 0));var_dump(assert_options(ASSERT_WARNING, 2));var_dump(assert(false));var_dump(assert_options(ASSERT_ACTIVE, 1));var_dump(assert_options(ASSERT_WARNING, 0));var_dump(assert(false));var_dump(assert_options(ASSERT_ACTIVE, 2));var_dump(assert_options(ASSERT_WARNING, 0));var_dump(assert(false));
\ No newline at end of file
+assert_options(ASSERT_ACTIVE, 0);
+assert_options(ASSERT_WARNING, 0);
+var_dump(assert(false));
+var_dump(assert_options(ASSERT_ACTIVE, 0));
+var_dump(assert_options(ASSERT_WARNING, 1));
+var_dump(assert(false));
+var_dump(assert_options(ASSERT_ACTIVE, 0));
+var_dump(assert_options(ASSERT_WARNING, 2));
+var_dump(assert(false));
+var_dump(assert_options(ASSERT_ACTIVE, 1));
+var_dump(assert_options(ASSERT_WARNING, 0));
+var_dump(assert(false));
+var_dump(assert_options(ASSERT_ACTIVE, 2));
+var_dump(assert_options(ASSERT_WARNING, 0));
+var_dump(assert(false));
diff --git a/hphp/test/slow/assignment/1703.php b/hphp/test/slow/assignment/1703.php
index c1c7fe32b..69ded42dd 100644
--- a/hphp/test/slow/assignment/1703.php
+++ b/hphp/test/slow/assignment/1703.php
@@ -1,3 +1,34 @@
 <?php
 
- function f($a) {  var_dump($a);}class ClassA {  var $val;  function foo() { f($val = 1); }  function bar() { f($this->val = 1); }  function goo() { f($val = 'val'); f($this->$val = 2); }  function zoo() {    var_dump($val); var_dump($this->val);  }}function foo() {  f($val2 = 1);}$obj = new ClassA();var_dump($obj);$obj->foo();var_dump($obj);$obj->bar();var_dump($obj);$obj->goo();var_dump($obj);$obj->zoo();
\ No newline at end of file
+function f($a) {
+  var_dump($a);
+}
+class ClassA {
+  var $val;
+  function foo() {
+ f($val = 1);
+ }
+  function bar() {
+ f($this->val = 1);
+ }
+  function goo() {
+ f($val = 'val');
+ f($this->$val = 2);
+ }
+  function zoo() {
+    var_dump($val);
+ var_dump($this->val);
+  }
+}
+function foo() {
+  f($val2 = 1);
+}
+$obj = new ClassA();
+var_dump($obj);
+$obj->foo();
+var_dump($obj);
+$obj->bar();
+var_dump($obj);
+$obj->goo();
+var_dump($obj);
+$obj->zoo();
diff --git a/hphp/test/slow/assignment/1704.php b/hphp/test/slow/assignment/1704.php
index ad72c07c2..25c915ffe 100644
--- a/hphp/test/slow/assignment/1704.php
+++ b/hphp/test/slow/assignment/1704.php
@@ -1,3 +1,27 @@
 <?php
 
- function f($a) {  var_dump($a);}class ClassA {  static $val = 1;  function foo() { f($val = 'val'); f($this->$val = 2); }  function foo2() { f($this->val = 3); }  function bar() {    var_dump($val); var_dump($this->val);  }}$obj = new ClassA();var_dump($obj);$obj->foo();var_dump($obj);$obj->bar();$obj->foo2();var_dump($obj);$obj->bar();
\ No newline at end of file
+function f($a) {
+  var_dump($a);
+}
+class ClassA {
+  static $val = 1;
+  function foo() {
+ f($val = 'val');
+ f($this->$val = 2);
+ }
+  function foo2() {
+ f($this->val = 3);
+ }
+  function bar() {
+    var_dump($val);
+ var_dump($this->val);
+  }
+}
+$obj = new ClassA();
+var_dump($obj);
+$obj->foo();
+var_dump($obj);
+$obj->bar();
+$obj->foo2();
+var_dump($obj);
+$obj->bar();
diff --git a/hphp/test/slow/assignment/1705.php b/hphp/test/slow/assignment/1705.php
index 247ee849e..1dec966fb 100644
--- a/hphp/test/slow/assignment/1705.php
+++ b/hphp/test/slow/assignment/1705.php
@@ -1,3 +1,14 @@
 <?php
 
- class X{  function __destruct() { var_dump('destruct'); }}function foo() {  $x = new X;  var_dump('before');  $x = null;  var_dump('after');}foo();
\ No newline at end of file
+class X{
+  function __destruct() {
+ var_dump('destruct');
+ }
+}
+function foo() {
+  $x = new X;
+  var_dump('before');
+  $x = null;
+  var_dump('after');
+}
+foo();
diff --git a/hphp/test/slow/assignment/1706.php b/hphp/test/slow/assignment/1706.php
index 28dbf4a94..cdacec1cf 100644
--- a/hphp/test/slow/assignment/1706.php
+++ b/hphp/test/slow/assignment/1706.php
@@ -1,3 +1,11 @@
 <?php
 
- function e() { return 'hello'; }function foo() {  $expected = e();  $list_expected = "[$expected,$expected]";  var_dump($expected, $list_expected);}foo();
\ No newline at end of file
+function e() {
+ return 'hello';
+ }
+function foo() {
+  $expected = e();
+  $list_expected = "[$expected,$expected]";
+  var_dump($expected, $list_expected);
+}
+foo();
diff --git a/hphp/test/slow/assignment/1707.php b/hphp/test/slow/assignment/1707.php
index 090a379aa..afe6b860e 100644
--- a/hphp/test/slow/assignment/1707.php
+++ b/hphp/test/slow/assignment/1707.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function g($key, $old, $new, $s = false) {
   $diff = array();
   if ($old !== $new) {
diff --git a/hphp/test/slow/assignment/1708.php b/hphp/test/slow/assignment/1708.php
index a9e25875e..3c2ee09dc 100644
--- a/hphp/test/slow/assignment/1708.php
+++ b/hphp/test/slow/assignment/1708.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 class dom {
   public $kid;
   public function __destruct() {
diff --git a/hphp/test/slow/bad_function_calls/1709.php b/hphp/test/slow/bad_function_calls/1709.php
index 054ba6ea7..663bd62eb 100644
--- a/hphp/test/slow/bad_function_calls/1709.php
+++ b/hphp/test/slow/bad_function_calls/1709.php
@@ -1,3 +1,8 @@
 <?php
 
- error_reporting(E_ALL & ~E_NOTICE);class A { function __construct() {}} $obj = new A(10);
\ No newline at end of file
+error_reporting(E_ALL & ~E_NOTICE);
+class A {
+ function __construct() {
+}
+}
+ $obj = new A(10);
diff --git a/hphp/test/slow/bad_function_calls/1710.php b/hphp/test/slow/bad_function_calls/1710.php
index 85b1475dd..ef4ef2ccc 100644
--- a/hphp/test/slow/bad_function_calls/1710.php
+++ b/hphp/test/slow/bad_function_calls/1710.php
@@ -1,3 +1,11 @@
 <?php
 
- error_reporting(E_ALL & ~E_NOTICE);function foo($a) { print $a;} class A { function __construct() {}} $obj = new A(foo(10));
\ No newline at end of file
+error_reporting(E_ALL & ~E_NOTICE);
+function foo($a) {
+ print $a;
+}
+ class A {
+ function __construct() {
+}
+}
+ $obj = new A(foo(10));
diff --git a/hphp/test/slow/bad_function_calls/1711.php b/hphp/test/slow/bad_function_calls/1711.php
index 1ae892537..0f41a63bf 100644
--- a/hphp/test/slow/bad_function_calls/1711.php
+++ b/hphp/test/slow/bad_function_calls/1711.php
@@ -1,3 +1,10 @@
 <?php
 
- error_reporting(E_ALL & ~E_NOTICE);function foo($a) { print $a;} function bar($a) { return $a;} foo('ok', bar('bad'));
\ No newline at end of file
+error_reporting(E_ALL & ~E_NOTICE);
+function foo($a) {
+ print $a;
+}
+ function bar($a) {
+ return $a;
+}
+ foo('ok', bar('bad'));
diff --git a/hphp/test/slow/bad_function_calls/1712.php b/hphp/test/slow/bad_function_calls/1712.php
index badc645d5..0a0cb2f18 100644
--- a/hphp/test/slow/bad_function_calls/1712.php
+++ b/hphp/test/slow/bad_function_calls/1712.php
@@ -1,3 +1,11 @@
 <?php
 
- error_reporting(E_ALL & ~E_NOTICE);function foo($x) {}function z() {  $yay = 1;  $snarf = 2;  foo(1,foo(1), $yay,$snarf);}z();
\ No newline at end of file
+error_reporting(E_ALL & ~E_NOTICE);
+function foo($x) {
+}
+function z() {
+  $yay = 1;
+  $snarf = 2;
+  foo(1,foo(1), $yay,$snarf);
+}
+z();
diff --git a/hphp/test/slow/bad_function_calls/1713.php b/hphp/test/slow/bad_function_calls/1713.php
index b2ec1a8cc..de4c20508 100644
--- a/hphp/test/slow/bad_function_calls/1713.php
+++ b/hphp/test/slow/bad_function_calls/1713.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f() {
   $a = array();
   array_push($a[] = 1);
diff --git a/hphp/test/slow/bad_function_calls/1714.php b/hphp/test/slow/bad_function_calls/1714.php
index e9a3aa219..809216ead 100644
--- a/hphp/test/slow/bad_function_calls/1714.php
+++ b/hphp/test/slow/bad_function_calls/1714.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f() {
   $a = 0;
   array_chunk($a = 1);
diff --git a/hphp/test/slow/bad_function_calls/1715.php b/hphp/test/slow/bad_function_calls/1715.php
index eb736a3ce..eb2688d29 100644
--- a/hphp/test/slow/bad_function_calls/1715.php
+++ b/hphp/test/slow/bad_function_calls/1715.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f() {
   $a = 0;
   $b = 0;
diff --git a/hphp/test/slow/bad_function_calls/1716.php b/hphp/test/slow/bad_function_calls/1716.php
index c653568ba..804707d1b 100644
--- a/hphp/test/slow/bad_function_calls/1716.php
+++ b/hphp/test/slow/bad_function_calls/1716.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f() {
   $arr = array();
   sort($arr[0]);
diff --git a/hphp/test/slow/bad_function_calls/1717.php b/hphp/test/slow/bad_function_calls/1717.php
index 97f16c494..ec9794970 100644
--- a/hphp/test/slow/bad_function_calls/1717.php
+++ b/hphp/test/slow/bad_function_calls/1717.php
@@ -1,11 +1,11 @@
 <?php
 
-
 $vals = array(null, 0, false, array(), 'test');
 foreach ($vals as $val) {
   try {
     $val->foo();
-  } catch (BadMethodCallException $e) {
+  }
+ catch (BadMethodCallException $e) {
     echo "BadMethodCallException thrown\n";
   }
 }
diff --git a/hphp/test/slow/bad_function_calls/1718.php b/hphp/test/slow/bad_function_calls/1718.php
index b8f0438ac..203b8c8f7 100644
--- a/hphp/test/slow/bad_function_calls/1718.php
+++ b/hphp/test/slow/bad_function_calls/1718.php
@@ -1,5 +1,4 @@
 <?php
 
-
 call_user_func(null, 'test');
-echo "test\n";
\ No newline at end of file
+echo "test\n";
diff --git a/hphp/test/slow/boolean/81.php b/hphp/test/slow/boolean/81.php
index 9fd4c2830..bcd0a65ca 100644
--- a/hphp/test/slow/boolean/81.php
+++ b/hphp/test/slow/boolean/81.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(true);
\ No newline at end of file
+var_dump(true);
diff --git a/hphp/test/slow/boolean/82.php b/hphp/test/slow/boolean/82.php
index 59e48e04e..c590d0970 100644
--- a/hphp/test/slow/boolean/82.php
+++ b/hphp/test/slow/boolean/82.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(false);
\ No newline at end of file
+var_dump(false);
diff --git a/hphp/test/slow/boolean/83.php b/hphp/test/slow/boolean/83.php
index f8b7392fe..d8045cc59 100644
--- a/hphp/test/slow/boolean/83.php
+++ b/hphp/test/slow/boolean/83.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 1; $b = ($a == 1); var_dump($b);
\ No newline at end of file
+$a = 1;
+ $b = ($a == 1);
+ var_dump($b);
diff --git a/hphp/test/slow/break_statement/1415.php b/hphp/test/slow/break_statement/1415.php
index 9de1d28b3..21302615f 100644
--- a/hphp/test/slow/break_statement/1415.php
+++ b/hphp/test/slow/break_statement/1415.php
@@ -1,3 +1,22 @@
 <?php
 
- $arr = array('one', 'two', 'three', 'four', 'stop', 'five');while (list(, $val) = each($arr)) {    if ($val == 'stop') {        break;    }    echo "$val\n";}$i = 0;while (++$i) {    switch ($i) {    case 5:        echo "At 5\n";        break 1;    case 10:        echo "At 10; quitting\n";        break 2;    default:        break;    }}
\ No newline at end of file
+$arr = array('one', 'two', 'three', 'four', 'stop', 'five');
+while (list(, $val) = each($arr)) {
+  if ($val == 'stop') {
+    break;
+  }
+  echo "$val\n";
+}
+$i = 0;
+while (++$i) {
+    switch ($i) {
+    case 5:
+      echo "At 5\n";
+      break 1;
+    case 10:
+      echo "At 10; quitting\n";
+      break 2;
+    default:
+      break;
+    }
+}
diff --git a/hphp/test/slow/call_static/1889.php b/hphp/test/slow/call_static/1889.php
index 54833abdc..d5e6df17e 100644
--- a/hphp/test/slow/call_static/1889.php
+++ b/hphp/test/slow/call_static/1889.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class c2 {
   public static function __callStatic($func, $args) {
     echo "c2::__callStatic
diff --git a/hphp/test/slow/call_static/1890.php b/hphp/test/slow/call_static/1890.php
index 30215338c..433eab755 100644
--- a/hphp/test/slow/call_static/1890.php
+++ b/hphp/test/slow/call_static/1890.php
@@ -1,11 +1,12 @@
 <?php
 
-
-class b2 { }
+class b2 {
+ }
 class c2 extends b2 {
   public static function __callStatic($func, $args) {
     echo "c2::__callStatic
-"; }
+";
+ }
 }
 class d2 extends c2 {
   public function __call($func, $args) {
@@ -17,6 +18,9 @@ class d2 extends c2 {
   }
 }
 set_error_handler('h');
-function h() { var_dump('errored');}$obj = new d2;
+function h() {
+ var_dump('errored');
+}
+$obj = new d2;
 $obj->test1a();
 var_dump('end');
diff --git a/hphp/test/slow/call_static/1891.php b/hphp/test/slow/call_static/1891.php
index 3114bd49f..744edc0cc 100644
--- a/hphp/test/slow/call_static/1891.php
+++ b/hphp/test/slow/call_static/1891.php
@@ -1,7 +1,7 @@
 <?php
 
-
-class b2 {}
+class b2 {
+}
 class c2 extends b2 {
   public function __call($func, $args) {
     echo "c2::__call
@@ -12,6 +12,9 @@ class c2 extends b2 {
   }
 }
 set_error_handler('h');
-function h() { var_dump('errored');}$obj = new c2;
+function h() {
+ var_dump('errored');
+}
+$obj = new c2;
 $obj->test1a();
 var_dump('end');
diff --git a/hphp/test/slow/call_static/1892.php b/hphp/test/slow/call_static/1892.php
index ccb511465..34efe6086 100644
--- a/hphp/test/slow/call_static/1892.php
+++ b/hphp/test/slow/call_static/1892.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class c3 {
   public function __call($func, $args) {
     echo "c3::__call
@@ -11,12 +10,14 @@ class c3 {
 ";
   }
   public function test1b() {
-    c3::foo(); // invokes c3::__callStatic
+    c3::foo();
+ // invokes c3::__callStatic
   }
 }
 class d3 extends c3 {
   public function test1b() {
-    c3::foo(); // invokes c3::__callStatic
+    c3::foo();
+ // invokes c3::__callStatic
   }
 }
 
diff --git a/hphp/test/slow/call_static/1893.php b/hphp/test/slow/call_static/1893.php
index fa00bd29c..cd27c9780 100644
--- a/hphp/test/slow/call_static/1893.php
+++ b/hphp/test/slow/call_static/1893.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class a1 {
   public function __call($func, $args) {
     var_dump('a1::__call');
diff --git a/hphp/test/slow/call_static/1894.php b/hphp/test/slow/call_static/1894.php
index c6d80c49b..912a0b081 100644
--- a/hphp/test/slow/call_static/1894.php
+++ b/hphp/test/slow/call_static/1894.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class a1 {
   public function __call($func, $args) {
     var_dump('a1::__call');
@@ -11,6 +10,10 @@ class b1 {
     a1::foo();
   }
 }
-set_error_handler('h'); function h() { var_dump('errored');}$obj = new b1;
+set_error_handler('h');
+ function h() {
+ var_dump('errored');
+}
+$obj = new b1;
 $obj->test();
 var_dump('end');
diff --git a/hphp/test/slow/call_static/1895.php b/hphp/test/slow/call_static/1895.php
index ed403ebdc..6a51dc59a 100644
--- a/hphp/test/slow/call_static/1895.php
+++ b/hphp/test/slow/call_static/1895.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class a2 {
   public function __call($func, $args) {
     var_dump('a2::__call');
diff --git a/hphp/test/slow/call_static/1896.php b/hphp/test/slow/call_static/1896.php
index 20469fe53..6161a352a 100644
--- a/hphp/test/slow/call_static/1896.php
+++ b/hphp/test/slow/call_static/1896.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class a1 {
   public function __call($func, $args) {
     var_dump('a1::__call');
diff --git a/hphp/test/slow/call_static/1897.php b/hphp/test/slow/call_static/1897.php
index a3b4056a5..d3d64f572 100644
--- a/hphp/test/slow/call_static/1897.php
+++ b/hphp/test/slow/call_static/1897.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class a2 {
   public function __call($func, $args) {
     var_dump('a2::__call');
diff --git a/hphp/test/slow/call_static/1898.php b/hphp/test/slow/call_static/1898.php
index ea163db07..9e6e0e864 100644
--- a/hphp/test/slow/call_static/1898.php
+++ b/hphp/test/slow/call_static/1898.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class a1 {
   public static function __callStatic($func, $args) {
     var_dump('a1::__callStatic');
diff --git a/hphp/test/slow/call_static/1899.php b/hphp/test/slow/call_static/1899.php
index 71eeb7fc3..70636aa9c 100644
--- a/hphp/test/slow/call_static/1899.php
+++ b/hphp/test/slow/call_static/1899.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class a2 {
   public static function __callStatic($func, $args) {
     var_dump('a2::__callStatic');
diff --git a/hphp/test/slow/call_static/1900.php b/hphp/test/slow/call_static/1900.php
index 8469e7a7e..cf6870a48 100644
--- a/hphp/test/slow/call_static/1900.php
+++ b/hphp/test/slow/call_static/1900.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class MethodTest {
     public function __call($name, $arguments) {
         var_dump($name, implode(', ', $arguments));
diff --git a/hphp/test/slow/call_static/1901.php b/hphp/test/slow/call_static/1901.php
index 784c1c202..6b9d04ece 100644
--- a/hphp/test/slow/call_static/1901.php
+++ b/hphp/test/slow/call_static/1901.php
@@ -1,4 +1,8 @@
 <?php
 
-
-abstract class BaseClass {  public static function __callStatic($name,  $arguments) {    echo "Calling static method '$name' "         . implode(', ', $arguments). "\n";  }}BaseClass::foo();
\ No newline at end of file
+abstract class BaseClass {
+  public static function __callStatic($name,  $arguments) {
+    echo "Calling static method '$name' "         . implode(', ', $arguments). "\n";
+  }
+}
+BaseClass::foo();
diff --git a/hphp/test/slow/call_static/1902.php b/hphp/test/slow/call_static/1902.php
index 96fda5a9e..144277c48 100644
--- a/hphp/test/slow/call_static/1902.php
+++ b/hphp/test/slow/call_static/1902.php
@@ -1,4 +1,10 @@
 <?php
 
-
-abstract class BaseClass {}class SubClass extends BaseClass {  public static function __callStatic($name,  $arguments) {    echo "Calling static method '$name' "         . implode(', ', $arguments). "\n";  }}SubClass::foo();
\ No newline at end of file
+abstract class BaseClass {
+}
+class SubClass extends BaseClass {
+  public static function __callStatic($name,  $arguments) {
+    echo "Calling static method '$name' "         . implode(', ', $arguments). "\n";
+  }
+}
+SubClass::foo();
diff --git a/hphp/test/slow/call_static/1903.php b/hphp/test/slow/call_static/1903.php
index 865011586..8fb486a98 100644
--- a/hphp/test/slow/call_static/1903.php
+++ b/hphp/test/slow/call_static/1903.php
@@ -1,4 +1,10 @@
 <?php
 
-
-abstract class BaseClass {  public static function __callStatic($name,  $arguments) {    echo "Calling static method '$name' "         . implode(', ', $arguments). "\n";  }}class SubClass extends BaseClass {}SubClass::foo();
\ No newline at end of file
+abstract class BaseClass {
+  public static function __callStatic($name,  $arguments) {
+    echo "Calling static method '$name' "         . implode(', ', $arguments). "\n";
+  }
+}
+class SubClass extends BaseClass {
+}
+SubClass::foo();
diff --git a/hphp/test/slow/call_static/1904.php b/hphp/test/slow/call_static/1904.php
index 7db393a33..4da997a8c 100644
--- a/hphp/test/slow/call_static/1904.php
+++ b/hphp/test/slow/call_static/1904.php
@@ -1,4 +1,14 @@
 <?php
 
-
-abstract class BaseClass {  public static function __callStatic($name,  $arguments) {    echo "Calling BaseClass static method '$name' "         . implode(', ', $arguments). "\n";  }}class SubClass extends BaseClass {  public static function __callStatic($name,  $arguments) {    echo "Calling SubClass static method '$name' "         . implode(', ', $arguments). "\n";  }}SubClass::foo();BaseClass::foo();
\ No newline at end of file
+abstract class BaseClass {
+  public static function __callStatic($name,  $arguments) {
+    echo "Calling BaseClass static method '$name' "         . implode(', ', $arguments). "\n";
+  }
+}
+class SubClass extends BaseClass {
+  public static function __callStatic($name,  $arguments) {
+    echo "Calling SubClass static method '$name' "         . implode(', ', $arguments). "\n";
+  }
+}
+SubClass::foo();
+BaseClass::foo();
diff --git a/hphp/test/slow/call_static/1905.php b/hphp/test/slow/call_static/1905.php
index 4743b08b1..21191dc24 100644
--- a/hphp/test/slow/call_static/1905.php
+++ b/hphp/test/slow/call_static/1905.php
@@ -1,4 +1,12 @@
 <?php
 
-
-class Base {  public static function __callStatic($method, $args) {    $klass = get_called_class();    echo "class $klass\n";  }}class Derived extends Base {}Base::foo();Derived::foo();
\ No newline at end of file
+class Base {
+  public static function __callStatic($method, $args) {
+    $klass = get_called_class();
+    echo "class $klass\n";
+  }
+}
+class Derived extends Base {
+}
+Base::foo();
+Derived::foo();
diff --git a/hphp/test/slow/class_constant/1604.php b/hphp/test/slow/class_constant/1604.php
index 0c43efc79..a16e79c79 100644
--- a/hphp/test/slow/class_constant/1604.php
+++ b/hphp/test/slow/class_constant/1604.php
@@ -1,3 +1,17 @@
 <?php
 
- class parent_c {  const ZERO   = 0;  const TWENTY = 20;  const FORTY  = 40;}class child_c extends parent_c {  const FIFTY = 50;}function foo($a = parent_c::ZERO, $b = child_c::FIFTY, $c = child_c::FORTY) {  echo $a;  echo $b;  echo $c;}foo();print parent_c::ZERO;
\ No newline at end of file
+class parent_c {
+  const ZERO   = 0;
+  const TWENTY = 20;
+  const FORTY  = 40;
+}
+class child_c extends parent_c {
+  const FIFTY = 50;
+}
+function foo($a = parent_c::ZERO, $b = child_c::FIFTY, $c = child_c::FORTY) {
+  echo $a;
+  echo $b;
+  echo $c;
+}
+foo();
+print parent_c::ZERO;
diff --git a/hphp/test/slow/class_constant/1605.php b/hphp/test/slow/class_constant/1605.php
index eea5c97ab..bd8d0a6e2 100644
--- a/hphp/test/slow/class_constant/1605.php
+++ b/hphp/test/slow/class_constant/1605.php
@@ -1,3 +1,26 @@
 <?php
 
- class FooConstants {  const ZERO        = 0;  const TWENTY_FOUR3 = FooConstants::TWENTY_FOUR2;  const TWENTY_FOUR2 = FooConstants::TWENTY_FOUR;  const TWENTY_FOUR = 24;  const FORTY_EIGHT = 48;}class BarConstants {  const ZERO        = FooConstants::ZERO;  const TWENTY_FOUR = FooConstants::TWENTY_FOUR;  const FORTY_EIGHT = FooConstants::FORTY_EIGHT;}class GooConstants {  const ZERO        = BarConstants::ZERO;  const TWENTY_FOUR = BarConstants::TWENTY_FOUR;  const FORTY_EIGHT = BarConstants::FORTY_EIGHT;}function a_better_pickle() {  return FooConstants::ZERO;}a_better_pickle();print GooConstants::ZERO;print FooConstants::TWENTY_FOUR2;print FooConstants::TWENTY_FOUR3;
\ No newline at end of file
+class FooConstants {
+  const ZERO        = 0;
+  const TWENTY_FOUR3 = FooConstants::TWENTY_FOUR2;
+  const TWENTY_FOUR2 = FooConstants::TWENTY_FOUR;
+  const TWENTY_FOUR = 24;
+  const FORTY_EIGHT = 48;
+}
+class BarConstants {
+  const ZERO        = FooConstants::ZERO;
+  const TWENTY_FOUR = FooConstants::TWENTY_FOUR;
+  const FORTY_EIGHT = FooConstants::FORTY_EIGHT;
+}
+class GooConstants {
+  const ZERO        = BarConstants::ZERO;
+  const TWENTY_FOUR = BarConstants::TWENTY_FOUR;
+  const FORTY_EIGHT = BarConstants::FORTY_EIGHT;
+}
+function a_better_pickle() {
+  return FooConstants::ZERO;
+}
+a_better_pickle();
+print GooConstants::ZERO;
+print FooConstants::TWENTY_FOUR2;
+print FooConstants::TWENTY_FOUR3;
diff --git a/hphp/test/slow/class_constant/1606.php b/hphp/test/slow/class_constant/1606.php
index 5592f0e80..a0ac33e33 100644
--- a/hphp/test/slow/class_constant/1606.php
+++ b/hphp/test/slow/class_constant/1606.php
@@ -1,3 +1,24 @@
 <?php
 
- define('FOO', 3);define('BAR', true);define('GOO', FOO + 4);define('HOO', FOO);var_dump(FOO);var_dump(BAR);var_dump(GOO);var_dump(HOO);class A {  const C1 = 1;  const C2 = '2';  const C3 = FOO;  const C4 = BAR;  const C5 = GOO;  const C6 = HOO;}var_dump(a::C1);var_dump(a::C2);var_dump(a::C3);var_dump(a::C4);var_dump(a::C5);var_dump(a::C6);
\ No newline at end of file
+define('FOO', 3);
+define('BAR', true);
+define('GOO', FOO + 4);
+define('HOO', FOO);
+var_dump(FOO);
+var_dump(BAR);
+var_dump(GOO);
+var_dump(HOO);
+class A {
+  const C1 = 1;
+  const C2 = '2';
+  const C3 = FOO;
+  const C4 = BAR;
+  const C5 = GOO;
+  const C6 = HOO;
+}
+var_dump(a::C1);
+var_dump(a::C2);
+var_dump(a::C3);
+var_dump(a::C4);
+var_dump(a::C5);
+var_dump(a::C6);
diff --git a/hphp/test/slow/class_constant/1607.php b/hphp/test/slow/class_constant/1607.php
index 9fed8bdf8..f2f241ed2 100644
--- a/hphp/test/slow/class_constant/1607.php
+++ b/hphp/test/slow/class_constant/1607.php
@@ -1,3 +1,7 @@
 <?php
 
- define('FOO', 3);function foo($a = FOO) {  echo $a;}foo();
\ No newline at end of file
+define('FOO', 3);
+function foo($a = FOO) {
+  echo $a;
+}
+foo();
diff --git a/hphp/test/slow/class_constant/1608.php b/hphp/test/slow/class_constant/1608.php
index e17b02173..db7e3599e 100644
--- a/hphp/test/slow/class_constant/1608.php
+++ b/hphp/test/slow/class_constant/1608.php
@@ -1,3 +1,6 @@
 <?php
 
- class c {  function foo($x = self::BLAH) {}}
\ No newline at end of file
+class c {
+  function foo($x = self::BLAH) {
+}
+}
diff --git a/hphp/test/slow/class_constant/1609.php b/hphp/test/slow/class_constant/1609.php
index 206870f43..66e678911 100644
--- a/hphp/test/slow/class_constant/1609.php
+++ b/hphp/test/slow/class_constant/1609.php
@@ -1,3 +1,20 @@
 <?php
 
- interface X {  const A=1;}class Y {  const B = 2;}class Z extends Y implements X {  function x() {    print self::A;    print self::B;    print Z::A;    print Z::B;    print X::A;    print Y::B;  }}$z = new Z;$z->x();
\ No newline at end of file
+interface X {
+  const A=1;
+}
+class Y {
+  const B = 2;
+}
+class Z extends Y implements X {
+  function x() {
+    print self::A;
+    print self::B;
+    print Z::A;
+    print Z::B;
+    print X::A;
+    print Y::B;
+  }
+}
+$z = new Z;
+$z->x();
diff --git a/hphp/test/slow/class_constant/1610.php b/hphp/test/slow/class_constant/1610.php
index 248329f78..2bd7501cb 100644
--- a/hphp/test/slow/class_constant/1610.php
+++ b/hphp/test/slow/class_constant/1610.php
@@ -1,3 +1,20 @@
 <?php
 
- class Dummy {}class foo {  public static $v = array(Dummy::c => 'foo');}interface A {  const CONSTANT = 'CONSTANT';}class B implements A { }class C {  static $A_CONSTANT = A::CONSTANT;  static $B_CONSTANT = B::CONSTANT;}var_dump(A::CONSTANT);var_dump(B::CONSTANT);var_dump(C::$A_CONSTANT);var_dump(C::$B_CONSTANT);
\ No newline at end of file
+class Dummy {
+}
+class foo {
+  public static $v = array(Dummy::c => 'foo');
+}
+interface A {
+  const CONSTANT = 'CONSTANT';
+}
+class B implements A {
+ }
+class C {
+  static $A_CONSTANT = A::CONSTANT;
+  static $B_CONSTANT = B::CONSTANT;
+}
+var_dump(A::CONSTANT);
+var_dump(B::CONSTANT);
+var_dump(C::$A_CONSTANT);
+var_dump(C::$B_CONSTANT);
diff --git a/hphp/test/slow/class_constant/1611.php b/hphp/test/slow/class_constant/1611.php
index 57384a328..63fac4a35 100644
--- a/hphp/test/slow/class_constant/1611.php
+++ b/hphp/test/slow/class_constant/1611.php
@@ -1,3 +1,16 @@
 <?php
 
- abstract class TB {  const PARAM_A = 'aaa';  const PARAM_B = 'bbb';  const PARAM_C = 'ccc';  const PARAM_D = 'ddd';}abstract class ATB extends TB {}class ABCD extends ATB {  static public function foo() {    return array(      'a_ids'   => array(        ATB::PARAM_A => true,        ATB::PARAM_C   => array(          array('tcks', 'none'),          array('tcks', 'ids'),          ),        ATB::PARAM_B     =>          'aaaa',      ),      'user_id'   => array(        ATB::PARAM_A => true,        ATB::PARAM_C   => array(          array('tcks', 'none'),          array('tcks', 'id'),          ),        ATB::PARAM_B     =>          'bbbb',      ),    );  }}var_dump(ABCD::foo());
\ No newline at end of file
+abstract class TB {
+  const PARAM_A = 'aaa';
+  const PARAM_B = 'bbb';
+  const PARAM_C = 'ccc';
+  const PARAM_D = 'ddd';
+}
+abstract class ATB extends TB {
+}
+class ABCD extends ATB {
+  static public function foo() {
+    return array(      'a_ids'   => array(        ATB::PARAM_A => true,        ATB::PARAM_C   => array(          array('tcks', 'none'),          array('tcks', 'ids'),          ),        ATB::PARAM_B     =>          'aaaa',      ),      'user_id'   => array(        ATB::PARAM_A => true,        ATB::PARAM_C   => array(          array('tcks', 'none'),          array('tcks', 'id'),          ),        ATB::PARAM_B     =>          'bbbb',      ),    );
+  }
+}
+var_dump(ABCD::foo());
diff --git a/hphp/test/slow/class_constant/1612.php b/hphp/test/slow/class_constant/1612.php
index de8696adf..c5b00563c 100644
--- a/hphp/test/slow/class_constant/1612.php
+++ b/hphp/test/slow/class_constant/1612.php
@@ -1,3 +1,12 @@
 <?php
 
- function __autoload($x) { var_dump('AUTOLOAD:'.$x); }class X {  public $foo = Y::FOO;  function foo() {    var_dump(__METHOD__, $this);  }}X::foo();
\ No newline at end of file
+function __autoload($x) {
+ var_dump('AUTOLOAD:'.$x);
+ }
+class X {
+  public $foo = Y::FOO;
+  function foo() {
+    var_dump(__METHOD__, $this);
+  }
+}
+X::foo();
diff --git a/hphp/test/slow/class_constant/1613.php b/hphp/test/slow/class_constant/1613.php
index 94182ec24..f3cbbf424 100644
--- a/hphp/test/slow/class_constant/1613.php
+++ b/hphp/test/slow/class_constant/1613.php
@@ -1,6 +1,9 @@
 <?php
 
-
-class A { const A = 'a'; }
-class B extends A { const B = 'b'; }
+class A {
+ const A = 'a';
+ }
+class B extends A {
+ const B = 'b';
+ }
 var_dump(get_class_constants('B'));
diff --git a/hphp/test/slow/class_constant/1614.php b/hphp/test/slow/class_constant/1614.php
index 0109c15f3..ec3fa4463 100644
--- a/hphp/test/slow/class_constant/1614.php
+++ b/hphp/test/slow/class_constant/1614.php
@@ -1,7 +1,9 @@
 <?php
 
-
-interface I { const X = 'x'; }
-class A implements I { }
+interface I {
+ const X = 'x';
+ }
+class A implements I {
+ }
 var_dump(A::X);
 var_dump(get_class_constants('A'));
diff --git a/hphp/test/slow/class_constant/1615.php b/hphp/test/slow/class_constant/1615.php
index 2fb0704aa..4d02c71d6 100644
--- a/hphp/test/slow/class_constant/1615.php
+++ b/hphp/test/slow/class_constant/1615.php
@@ -1,7 +1,10 @@
 <?php
 
-
-class B { const X = 'old'; }
-class A extends B { const X = 'new'; }
+class B {
+ const X = 'old';
+ }
+class A extends B {
+ const X = 'new';
+ }
 var_dump(A::X);
 var_dump(get_class_constants('A'));
diff --git a/hphp/test/slow/class_constant/1616.php b/hphp/test/slow/class_constant/1616.php
index 5bac9eafd..e43e95dbe 100644
--- a/hphp/test/slow/class_constant/1616.php
+++ b/hphp/test/slow/class_constant/1616.php
@@ -1,4 +1,3 @@
 <?php
 
-
 var_dump(get_class_constants('C'));
diff --git a/hphp/test/slow/class_constant/1617.php b/hphp/test/slow/class_constant/1617.php
index 05e5875cc..68cb8dc36 100644
--- a/hphp/test/slow/class_constant/1617.php
+++ b/hphp/test/slow/class_constant/1617.php
@@ -1,6 +1,9 @@
 <?php
 
-
-class B { const X='xxx'; }
-class C { const Y=B::X; }
+class B {
+ const X='xxx';
+ }
+class C {
+ const Y=B::X;
+ }
 var_dump(get_class_constants('C'));
diff --git a/hphp/test/slow/class_constant/1618.php b/hphp/test/slow/class_constant/1618.php
index d1a368c74..800b646f2 100644
--- a/hphp/test/slow/class_constant/1618.php
+++ b/hphp/test/slow/class_constant/1618.php
@@ -1,3 +1,34 @@
 <?php
 
- if (isset($g)) {  interface I { const FOO = 1; }  class C { const FOO = 3; }} else {  interface I { const FOO = 2; }  class C { const FOO = 4; }}class X {  function foo($x = C::FOO, $y = I::FOO) {}}function test() {  $x = new ReflectionMethod('X', 'foo');  foreach ($x->getParameters() as $p) {    var_dump($p->getDefaultValue());  }}function fiz($c) {  var_dump($c::FOO);}fiz('I');fiz('C');test();
\ No newline at end of file
+if (isset($g)) {
+  interface I {
+ const FOO = 1;
+ }
+  class C {
+ const FOO = 3;
+ }
+}
+ else {
+  interface I {
+ const FOO = 2;
+ }
+  class C {
+ const FOO = 4;
+ }
+}
+class X {
+  function foo($x = C::FOO, $y = I::FOO) {
+}
+}
+function test() {
+  $x = new ReflectionMethod('X', 'foo');
+  foreach ($x->getParameters() as $p) {
+    var_dump($p->getDefaultValue());
+  }
+}
+function fiz($c) {
+  var_dump($c::FOO);
+}
+fiz('I');
+fiz('C');
+test();
diff --git a/hphp/test/slow/class_constant/1619.php b/hphp/test/slow/class_constant/1619.php
index a4bb73311..d5f81b2d0 100644
--- a/hphp/test/slow/class_constant/1619.php
+++ b/hphp/test/slow/class_constant/1619.php
@@ -1,3 +1,20 @@
 <?php
 
- interface ITest {  const ITestConst = 42;}class Test implements ITest {  public function foo($y = 'Test', $x = self::ITestConst) {    var_dump($y::ITestConst);    var_dump(static::ITestConst);    var_dump(self::ITestConst);    var_dump($x);  }}$t = new Test();$t->foo();$rc = new ReflectionClass('Test');$method = $rc->getMethod('foo');foreach ($method->getParameters() as $param) {  var_dump($param->getDefaultValue());}
\ No newline at end of file
+interface ITest {
+  const ITestConst = 42;
+}
+class Test implements ITest {
+  public function foo($y = 'Test', $x = self::ITestConst) {
+    var_dump($y::ITestConst);
+    var_dump(static::ITestConst);
+    var_dump(self::ITestConst);
+    var_dump($x);
+  }
+}
+$t = new Test();
+$t->foo();
+$rc = new ReflectionClass('Test');
+$method = $rc->getMethod('foo');
+foreach ($method->getParameters() as $param) {
+  var_dump($param->getDefaultValue());
+}
diff --git a/hphp/test/slow/class_constant/1620.php b/hphp/test/slow/class_constant/1620.php
index 800a7c456..573457850 100644
--- a/hphp/test/slow/class_constant/1620.php
+++ b/hphp/test/slow/class_constant/1620.php
@@ -1,3 +1,25 @@
 <?php
 
- class W {  const FOO = 0;}class X extends W {  const FOO = 1;  static function foo() {    var_dump(constant('self::FOO'));    var_dump(constant('parent::FOO'));    var_dump(constant('static::FOO'));    var_dump(defined('self::FOO'));    var_dump(defined('parent::FOO'));    var_dump(defined('static::FOO'));    var_dump(defined('self::BAR'));    var_dump(defined('parent::BAR'));    var_dump(defined('static::BAR')); }}class Y extends X {  const FOO = 2;  const BAR = 1;}X::foo();Y::foo();
\ No newline at end of file
+class W {
+  const FOO = 0;
+}
+class X extends W {
+  const FOO = 1;
+  static function foo() {
+    var_dump(constant('self::FOO'));
+    var_dump(constant('parent::FOO'));
+    var_dump(constant('static::FOO'));
+    var_dump(defined('self::FOO'));
+    var_dump(defined('parent::FOO'));
+    var_dump(defined('static::FOO'));
+    var_dump(defined('self::BAR'));
+    var_dump(defined('parent::BAR'));
+    var_dump(defined('static::BAR'));
+ }
+}
+class Y extends X {
+  const FOO = 2;
+  const BAR = 1;
+}
+X::foo();
+Y::foo();
diff --git a/hphp/test/slow/class_method/738.php b/hphp/test/slow/class_method/738.php
index 72ff31980..8cc96fc5d 100644
--- a/hphp/test/slow/class_method/738.php
+++ b/hphp/test/slow/class_method/738.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Foo {
   static function Bar() {
     if (isset($this) && isset($this->bar)) {
@@ -8,4 +7,7 @@ class Foo {
     }
     var_dump($this);
   }
-} Foo::Bar(); $obj = new Foo(); $obj->Bar();
+}
+ Foo::Bar();
+ $obj = new Foo();
+ $obj->Bar();
diff --git a/hphp/test/slow/class_method/739.php b/hphp/test/slow/class_method/739.php
index 754db4eab..7ffa22fa3 100644
--- a/hphp/test/slow/class_method/739.php
+++ b/hphp/test/slow/class_method/739.php
@@ -1,11 +1,11 @@
 <?php
 
-
 class Example {
    function whatever() {
       if (isset($this)) {
           var_dump('static method call');
-      } else {
+      }
+ else {
           var_dump('non-static method call');
       }
    }
diff --git a/hphp/test/slow/class_method/740.php b/hphp/test/slow/class_method/740.php
index c844e01ec..cd780332b 100644
--- a/hphp/test/slow/class_method/740.php
+++ b/hphp/test/slow/class_method/740.php
@@ -1,10 +1,12 @@
 <?php
 
-
 if (true) {
-  class c extends AppendIterator {}
-} else {
-  class c {}
+  class c extends AppendIterator {
+}
+}
+ else {
+  class c {
+}
 }
 class d extends c {
   public function rewind() {
@@ -12,4 +14,5 @@ class d extends c {
   }
 }
 $obj = new d;
-foreach ($obj as $k => $v) {}
+foreach ($obj as $k => $v) {
+}
diff --git a/hphp/test/slow/class_method/741.php b/hphp/test/slow/class_method/741.php
index a2840b971..6e35351a3 100644
--- a/hphp/test/slow/class_method/741.php
+++ b/hphp/test/slow/class_method/741.php
@@ -1,3 +1,12 @@
 <?php
 
- $error = 'fatal error';echo AdsConsoleRenderer::getInstance()->writeMsg('error', $error);class AdsConsoleRenderer {  public static function getInstance() {    return new AdsConsoleRenderer();  }  function writeMsg($classname = '', $s = '') {    echo $classname . "::" . $s;  }}
\ No newline at end of file
+$error = 'fatal error';
+echo AdsConsoleRenderer::getInstance()->writeMsg('error', $error);
+class AdsConsoleRenderer {
+  public static function getInstance() {
+    return new AdsConsoleRenderer();
+  }
+  function writeMsg($classname = '', $s = '') {
+    echo $classname . "::" . $s;
+  }
+}
diff --git a/hphp/test/slow/class_method/742.php b/hphp/test/slow/class_method/742.php
index 63bc4c29c..bfae5f93b 100644
--- a/hphp/test/slow/class_method/742.php
+++ b/hphp/test/slow/class_method/742.php
@@ -1,3 +1,12 @@
 <?php
 
- class A {   function f() { return "hello" ;}}; $g = new A(); echo $g->{'f'}();
\ No newline at end of file
+class A {
+   function f() {
+ return "hello" ;
+}
+}
+;
+ $g = new A();
+ echo $g->{
+'f'}
+();
diff --git a/hphp/test/slow/class_method/743.php b/hphp/test/slow/class_method/743.php
index 90112abdb..6c234087a 100644
--- a/hphp/test/slow/class_method/743.php
+++ b/hphp/test/slow/class_method/743.php
@@ -1,3 +1,13 @@
 <?php
 
- $a = 'self';class A {  public static function f($value) {    $filter = 'g';    return call_user_func(array($GLOBALS['a'], $filter), $value);  }  public static function g($value) {    return $value;  }}var_dump(A::f('test'));
\ No newline at end of file
+$a = 'self';
+class A {
+  public static function f($value) {
+    $filter = 'g';
+    return call_user_func(array($GLOBALS['a'], $filter), $value);
+  }
+  public static function g($value) {
+    return $value;
+  }
+}
+var_dump(A::f('test'));
diff --git a/hphp/test/slow/class_method/744.php b/hphp/test/slow/class_method/744.php
index b9547471b..941840a6a 100644
--- a/hphp/test/slow/class_method/744.php
+++ b/hphp/test/slow/class_method/744.php
@@ -1,3 +1,15 @@
 <?php
 
- interface I {  public function foo($x);}abstract class B implements I {  abstract public function foo($x);}class C extends B {  public function foo($x){ echo "$x \n";}}$obj = new C;$obj->foo(1);
\ No newline at end of file
+interface I {
+  public function foo($x);
+}
+abstract class B implements I {
+  abstract public function foo($x);
+}
+class C extends B {
+  public function foo($x){
+ echo "$x \n";
+}
+}
+$obj = new C;
+$obj->foo(1);
diff --git a/hphp/test/slow/class_method/745.php b/hphp/test/slow/class_method/745.php
index 3444f90d7..1252628b8 100644
--- a/hphp/test/slow/class_method/745.php
+++ b/hphp/test/slow/class_method/745.php
@@ -1,3 +1,12 @@
 <?php
 
-class AB {  static function foo() {    var_dump('foo');  }}function f($x) {  $a = $x.'B';  $a::foo();}f('A');
\ No newline at end of file
+class AB {
+  static function foo() {
+    var_dump('foo');
+  }
+}
+function f($x) {
+  $a = $x.'B';
+  $a::foo();
+}
+f('A');
diff --git a/hphp/test/slow/clone/1497.php b/hphp/test/slow/clone/1497.php
index 12bfca7af..e98444c56 100644
--- a/hphp/test/slow/clone/1497.php
+++ b/hphp/test/slow/clone/1497.php
@@ -1,4 +1,31 @@
 <?php
 
- class A {  public $foo = 0;  public $fooref = 1;  private $foopriv = 2;  function __clone() {    echo "clone
-";  }}$a1 = new A;$p = 8;$q = 9;$a1->foo = 'foo';$a1->fooref = &$p;$a1->dyn = 'dyn';$a1->dynref = &$q;var_dump($a1);$a2 = clone $a1;var_dump($a1);var_dump($a2);$a2->foo = 'a2foo';$a2->fooref = 'a2fooref';$a2->dyn = 'a2dyn';$a2->dynref = 'a2dynref';$a2->dynref2 = 'dynref2';var_dump($a1);var_dump($a2);var_dump($p);var_dump($q);
\ No newline at end of file
+class A {
+  public $foo = 0;
+  public $fooref = 1;
+  private $foopriv = 2;
+  function __clone() {
+    echo "clone
+";
+  }
+}
+$a1 = new A;
+$p = 8;
+$q = 9;
+$a1->foo = 'foo';
+$a1->fooref = &$p;
+$a1->dyn = 'dyn';
+$a1->dynref = &$q;
+var_dump($a1);
+$a2 = clone $a1;
+var_dump($a1);
+var_dump($a2);
+$a2->foo = 'a2foo';
+$a2->fooref = 'a2fooref';
+$a2->dyn = 'a2dyn';
+$a2->dynref = 'a2dynref';
+$a2->dynref2 = 'dynref2';
+var_dump($a1);
+var_dump($a2);
+var_dump($p);
+var_dump($q);
diff --git a/hphp/test/slow/clone/1498.php b/hphp/test/slow/clone/1498.php
index f8ee401dd..4e822692f 100644
--- a/hphp/test/slow/clone/1498.php
+++ b/hphp/test/slow/clone/1498.php
@@ -1,3 +1,18 @@
 <?php
 
- class c {  protected $cm = 'get';  function x() {    var_dump($this->cm);  }}class c2 extends c {}$y = new c;$y->x();$z = clone $y;$z->x();$y = new c2;$y->x();$z = clone $y;$z->x();
\ No newline at end of file
+class c {
+  protected $cm = 'get';
+  function x() {
+    var_dump($this->cm);
+  }
+}
+class c2 extends c {
+}
+$y = new c;
+$y->x();
+$z = clone $y;
+$z->x();
+$y = new c2;
+$y->x();
+$z = clone $y;
+$z->x();
diff --git a/hphp/test/slow/closure/1918.php b/hphp/test/slow/closure/1918.php
index a58dd5a44..07f1b3f55 100644
--- a/hphp/test/slow/closure/1918.php
+++ b/hphp/test/slow/closure/1918.php
@@ -1,4 +1,9 @@
 <?php
 
- $a = function ($v) { return $v > 2; }; echo $a(4)."
-"; echo call_user_func_array($a, array(4));
\ No newline at end of file
+$a = function ($v) {
+ return $v > 2;
+ }
+;
+ echo $a(4)."
+";
+ echo call_user_func_array($a, array(4));
diff --git a/hphp/test/slow/closure/1919.php b/hphp/test/slow/closure/1919.php
index 899e0a411..655aed32d 100644
--- a/hphp/test/slow/closure/1919.php
+++ b/hphp/test/slow/closure/1919.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = function ($a) { return $a;}; var_dump($a(123));
\ No newline at end of file
+$a = function ($a) {
+ return $a;
+}
+;
+ var_dump($a(123));
diff --git a/hphp/test/slow/closure/1920.php b/hphp/test/slow/closure/1920.php
index 5f4cdb802..c1845b959 100644
--- a/hphp/test/slow/closure/1920.php
+++ b/hphp/test/slow/closure/1920.php
@@ -1,3 +1,8 @@
 <?php
 
- $abc = 123; $a = function () use ($abc) { var_dump($abc);}; $a();
\ No newline at end of file
+$abc = 123;
+ $a = function () use ($abc) {
+ var_dump($abc);
+}
+;
+ $a();
diff --git a/hphp/test/slow/closure/1921.php b/hphp/test/slow/closure/1921.php
index b84216dcb..5d765a6e0 100644
--- a/hphp/test/slow/closure/1921.php
+++ b/hphp/test/slow/closure/1921.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo() {
   $var = 123;
   $ref = 456;
@@ -8,7 +7,8 @@ function foo() {
   $a = function () use ($var, &$ref) {
     var_dump($abc, $var, $ref);
     $abc = $var = $ref = 333;
-  };
+  }
+;
   var_dump($a());
   var_dump($abc, $var, $ref);
 }
diff --git a/hphp/test/slow/closure/1922.php b/hphp/test/slow/closure/1922.php
index a4a0f3f88..f42350a22 100644
--- a/hphp/test/slow/closure/1922.php
+++ b/hphp/test/slow/closure/1922.php
@@ -1,7 +1,9 @@
 <?php
 
-
 $x = false;
-$f = function ($arg0) use (&$x) { $x = $arg0; };
+$f = function ($arg0) use (&$x) {
+ $x = $arg0;
+ }
+;
 $f(32);
 var_dump($x);
diff --git a/hphp/test/slow/closure/1923.php b/hphp/test/slow/closure/1923.php
index d91632960..5407ec8c3 100644
--- a/hphp/test/slow/closure/1923.php
+++ b/hphp/test/slow/closure/1923.php
@@ -1,11 +1,11 @@
 <?php
 
-
 function f() {
   $test = false;
   $f = function ($p) use (&$test) {
     if ($p) $test = true;
-  };
+  }
+;
   $f(true);
   var_dump($test);
 }
diff --git a/hphp/test/slow/closure/1924.php b/hphp/test/slow/closure/1924.php
index 272c74983..f39e318c2 100644
--- a/hphp/test/slow/closure/1924.php
+++ b/hphp/test/slow/closure/1924.php
@@ -1,12 +1,12 @@
 <?php
 
-
 class Foo {
   function bar() {
     $abc = 123;
     $a = function ($abc) use ($abc) {
       var_dump($abc);
-    };
+    }
+;
     return $a;
   }
 }
diff --git a/hphp/test/slow/closure/1925.php b/hphp/test/slow/closure/1925.php
index 7f3613d9e..4fe4eda5a 100644
--- a/hphp/test/slow/closure/1925.php
+++ b/hphp/test/slow/closure/1925.php
@@ -1,12 +1,12 @@
 <?php
 
-
 class Foo {
   function bar() {
     $abc = 123;
     $a = function ($abc) use ($abc, $abc) {
       var_dump($abc);
-    };
+    }
+;
     return $a;
   }
 }
diff --git a/hphp/test/slow/closure/1926.php b/hphp/test/slow/closure/1926.php
index 7afb6b30c..9b92bdeb5 100644
--- a/hphp/test/slow/closure/1926.php
+++ b/hphp/test/slow/closure/1926.php
@@ -1,12 +1,12 @@
 <?php
 
-
 class Foo {
   function bar() {
     $abc = 123;
     $a = function ($abc) use (&$abc, &$abc) {
       var_dump($abc);
-    };
+    }
+;
     return $a;
   }
 }
diff --git a/hphp/test/slow/closure/1927.php b/hphp/test/slow/closure/1927.php
index d58005254..3970b3e63 100644
--- a/hphp/test/slow/closure/1927.php
+++ b/hphp/test/slow/closure/1927.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Foo {
   function bar() {
     $abc = 123;
@@ -8,7 +7,8 @@ class Foo {
       $n = func_num_args();
       $args = func_get_args();
       var_dump($n, $args);
-    };
+    }
+;
     return $a;
   }
 
diff --git a/hphp/test/slow/closure/1928.php b/hphp/test/slow/closure/1928.php
index 9ed0bd114..93046821c 100644
--- a/hphp/test/slow/closure/1928.php
+++ b/hphp/test/slow/closure/1928.php
@@ -1,9 +1,11 @@
 <?php
 
-
 class Foo {
   function bar() {
-    $a = function () { var_dump(__CLASS__, __FUNCTION__);};
+    $a = function () {
+ var_dump(__CLASS__, __FUNCTION__);
+}
+;
     $a();
   }
 }
diff --git a/hphp/test/slow/closure/1929.php b/hphp/test/slow/closure/1929.php
index 10b9e6e06..f373a323e 100644
--- a/hphp/test/slow/closure/1929.php
+++ b/hphp/test/slow/closure/1929.php
@@ -1,9 +1,11 @@
 <?php
 
-
 function h() {
   return array_filter(array(1, 2, 3),
-                      function($e) { return !($e & 1); });
+                      function($e) {
+ return !($e & 1);
+ }
+);
 }
 h();
 var_dump(h());
diff --git a/hphp/test/slow/closure/1930.php b/hphp/test/slow/closure/1930.php
index 65aa52276..dbe00e565 100644
--- a/hphp/test/slow/closure/1930.php
+++ b/hphp/test/slow/closure/1930.php
@@ -1,4 +1,17 @@
 <?php
 
-
-$v=5;call_user_func(  function() use($v)   { echo $v; });$f = function() use($v) { echo $v; };call_user_func($f);call_user_func_array(  function() use($v)   { echo $v; }, array());call_user_func($f, array());
\ No newline at end of file
+$v=5;
+call_user_func(  function() use($v)   {
+ echo $v;
+ }
+);
+$f = function() use($v) {
+ echo $v;
+ }
+;
+call_user_func($f);
+call_user_func_array(  function() use($v)   {
+ echo $v;
+ }
+, array());
+call_user_func($f, array());
diff --git a/hphp/test/slow/closure/1931.php b/hphp/test/slow/closure/1931.php
index 8e5608906..063d3ebc2 100644
--- a/hphp/test/slow/closure/1931.php
+++ b/hphp/test/slow/closure/1931.php
@@ -1,4 +1,12 @@
 <?php
 
-
-$myfunc = function() {  echo "hello, world!\n";};$myfunc();call_user_func($myfunc);call_user_func_array($myfunc, array());$isc = is_callable($myfunc, false, &$p);echo "is_callable(\$myfunc) = $isc\n";var_dump($p);
\ No newline at end of file
+$myfunc = function() {
+  echo "hello, world!\n";
+}
+;
+$myfunc();
+call_user_func($myfunc);
+call_user_func_array($myfunc, array());
+$isc = is_callable($myfunc, false, &$p);
+echo "is_callable(\$myfunc) = $isc\n";
+var_dump($p);
diff --git a/hphp/test/slow/closure/1932.php b/hphp/test/slow/closure/1932.php
index 897ab24ae..e3ac5dd51 100644
--- a/hphp/test/slow/closure/1932.php
+++ b/hphp/test/slow/closure/1932.php
@@ -1,4 +1,13 @@
 <?php
 
-
-function f() {$someVar = 456;$closure = function($param) use ($someVar) {echo $param . ' ' . $someVar . "\n";};return $closure;}$x = f();$x(2);call_user_func($x, 2);
\ No newline at end of file
+function f() {
+$someVar = 456;
+$closure = function($param) use ($someVar) {
+echo $param . ' ' . $someVar . "\n";
+}
+;
+return $closure;
+}
+$x = f();
+$x(2);
+call_user_func($x, 2);
diff --git a/hphp/test/slow/closure/1933.php b/hphp/test/slow/closure/1933.php
index c0213ba0d..7e9f32f73 100644
--- a/hphp/test/slow/closure/1933.php
+++ b/hphp/test/slow/closure/1933.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $my_array = array(7, 1, 5, 6);
 $some_value = 6;
 usort($my_array,
@@ -8,10 +7,12 @@ usort($my_array,
     if ($a === $some_value) {
       if ($b === $some_value) {
         return 0;
-      } else {
+      }
+ else {
         return -1;
       }
-    } else if ($b === $some_value) {
+    }
+ else if ($b === $some_value) {
       return 1;
     }
     if ($a < $b) return -1;
diff --git a/hphp/test/slow/closure/1934.php b/hphp/test/slow/closure/1934.php
index a8d7bec29..5574df052 100644
--- a/hphp/test/slow/closure/1934.php
+++ b/hphp/test/slow/closure/1934.php
@@ -1,4 +1,15 @@
 <?php
 
-
-function f() {  $someVar = 456;  $closure = function($param) use (&$someVar) {      echo $param . ' ' . $someVar . "\n";      $param = 7;      $someVar = 11;    };  return $closure;}$x = f();$x(2);$x(2);
\ No newline at end of file
+function f() {
+  $someVar = 456;
+  $closure = function($param) use (&$someVar) {
+      echo $param . ' ' . $someVar . "\n";
+      $param = 7;
+      $someVar = 11;
+    }
+;
+  return $closure;
+}
+$x = f();
+$x(2);
+$x(2);
diff --git a/hphp/test/slow/closure/1935.php b/hphp/test/slow/closure/1935.php
index c360b7f32..d221bfda6 100644
--- a/hphp/test/slow/closure/1935.php
+++ b/hphp/test/slow/closure/1935.php
@@ -1,4 +1,15 @@
 <?php
 
-
-function f() {  $someVar = 456;  $closure = function($param) use ($someVar) {      echo $param . ' ' . $someVar . "\n";      $param = 7;      $someVar = 11;    };  return $closure;}$x = f();$x(2);$x(2);
\ No newline at end of file
+function f() {
+  $someVar = 456;
+  $closure = function($param) use ($someVar) {
+      echo $param . ' ' . $someVar . "\n";
+      $param = 7;
+      $someVar = 11;
+    }
+;
+  return $closure;
+}
+$x = f();
+$x(2);
+$x(2);
diff --git a/hphp/test/slow/closure/1936.php b/hphp/test/slow/closure/1936.php
index 1bc5287b0..0aa5d1978 100644
--- a/hphp/test/slow/closure/1936.php
+++ b/hphp/test/slow/closure/1936.php
@@ -1,3 +1,12 @@
 <?php
 
- function test($x) {  $s_path = serialize($x);  $filter = function ($rel) use ($s_path) {    return $s_path;  };  var_dump($filter(0));}test('hello');test(array(1,2,'foo'=>'bar'));
\ No newline at end of file
+function test($x) {
+  $s_path = serialize($x);
+  $filter = function ($rel) use ($s_path) {
+    return $s_path;
+  }
+;
+  var_dump($filter(0));
+}
+test('hello');
+test(array(1,2,'foo'=>'bar'));
diff --git a/hphp/test/slow/closure/1937.php b/hphp/test/slow/closure/1937.php
index bd32d8c67..85a977b01 100644
--- a/hphp/test/slow/closure/1937.php
+++ b/hphp/test/slow/closure/1937.php
@@ -1,3 +1,9 @@
 <?php
 
- function test($a, $b) {  return array_map(function (array $x) use ($b) {      var_dump($x,$b);    }, $a);}test(array(array(1), array(2)), 5);
\ No newline at end of file
+function test($a, $b) {
+  return array_map(function (array $x) use ($b) {
+      var_dump($x,$b);
+    }
+, $a);
+}
+test(array(array(1), array(2)), 5);
diff --git a/hphp/test/slow/closure/1938.php b/hphp/test/slow/closure/1938.php
index d92bab3d4..30533c947 100644
--- a/hphp/test/slow/closure/1938.php
+++ b/hphp/test/slow/closure/1938.php
@@ -1,11 +1,16 @@
 <?php
 
-
 function f(&$u0) {
-  return function () use (&$u0, $u0) { $u0++; };
+  return function () use (&$u0, $u0) {
+ $u0++;
+ }
+;
 }
 function g(&$u0) {
-  return function () use ($u0, &$u0) { $u0++; };
+  return function () use ($u0, &$u0) {
+ $u0++;
+ }
+;
 }
 $x1 = 0;
 $f = f($x1);
diff --git a/hphp/test/slow/closure/1939.php b/hphp/test/slow/closure/1939.php
index 2d6ac4476..c850ca845 100644
--- a/hphp/test/slow/closure/1939.php
+++ b/hphp/test/slow/closure/1939.php
@@ -1,14 +1,22 @@
 <?php
 
-
-function get() { return true; }
+function get() {
+ return true;
+ }
 if (get()) {
   function f($x) {
-    return function () use ($x) { return $x; };
+    return function () use ($x) {
+ return $x;
+ }
+;
   }
-} else {
+}
+ else {
   function f($x) {
-    return function () use ($x) { return $x + 1; };
+    return function () use ($x) {
+ return $x + 1;
+ }
+;
   }
 }
 $f = f(32);
diff --git a/hphp/test/slow/closure/1940.php b/hphp/test/slow/closure/1940.php
index 3680dc40d..c9853c469 100644
--- a/hphp/test/slow/closure/1940.php
+++ b/hphp/test/slow/closure/1940.php
@@ -1,11 +1,11 @@
 <?php
 
-
 function mkC() {
   return function () {
     static $x = 0;
     return $x++;
-  };
+  }
+;
 }
 $c0 = mkC();
 var_dump($c0());
diff --git a/hphp/test/slow/closure/1941.php b/hphp/test/slow/closure/1941.php
index 017e5118d..cf40c8c30 100644
--- a/hphp/test/slow/closure/1941.php
+++ b/hphp/test/slow/closure/1941.php
@@ -1,4 +1,21 @@
 <?php
 
-
-class A {  public function foo() {    $values = array(1, 2, 3);    $values = array_map(function($p) use ($this) {      return $this->goo($p);    }, $values);    var_dump($values);  }  public function bar() { return $this; }  public function goo($p) { return $p; }}$obj = new A;var_dump($obj->bar());$obj->foo();
\ No newline at end of file
+class A {
+  public function foo() {
+    $values = array(1, 2, 3);
+    $values = array_map(function($p) use ($this) {
+      return $this->goo($p);
+    }
+, $values);
+    var_dump($values);
+  }
+  public function bar() {
+ return $this;
+ }
+  public function goo($p) {
+ return $p;
+ }
+}
+$obj = new A;
+var_dump($obj->bar());
+$obj->foo();
diff --git a/hphp/test/slow/collection_classes/802.php b/hphp/test/slow/collection_classes/802.php
index 4ce15554d..252bf07d7 100644
--- a/hphp/test/slow/collection_classes/802.php
+++ b/hphp/test/slow/collection_classes/802.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $arr = array(null, false, true, 0, 1, 0.0, 1.0, '', '0', '1',
              '0.0', '1.0', '0 ', 'foo');
 $vec = Vector::fromArray($arr);
@@ -18,7 +17,8 @@ $mp = Map::fromArray($arr);
 foreach ($arr as $k => $v) {
   var_dump($mp[$k]);
   var_dump(isset($mp[$k]));
-  var_dump(empty($mp[$k])); 
+  var_dump(empty($mp[$k]));
+
   echo "\n";
 }
 $new_arr = array();
diff --git a/hphp/test/slow/collection_classes/803.php b/hphp/test/slow/collection_classes/803.php
index 952fc0a05..a1652d6dc 100644
--- a/hphp/test/slow/collection_classes/803.php
+++ b/hphp/test/slow/collection_classes/803.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $v = new Vector;
 $v[] = 123;
 var_dump($v->toArray());
diff --git a/hphp/test/slow/collection_classes/804.php b/hphp/test/slow/collection_classes/804.php
index 81de0bea7..f62402fea 100644
--- a/hphp/test/slow/collection_classes/804.php
+++ b/hphp/test/slow/collection_classes/804.php
@@ -1,17 +1,18 @@
 <?php
 
-
 try {
   $v = new Vector();
   $v->contains(1);
   try {
     $v->contains('foo');
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     echo 'A';
   }
   try {
     $v->contains(1.0);
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     echo 'B';
   }
   $methods = Vector::fromArray(array('contains','remove','discard'));
@@ -21,7 +22,8 @@ try {
     $m->$method('foo');
     try {
       $m->$method(1.0);
-    } catch (Exception $e) {
+    }
+ catch (Exception $e) {
       echo 'C';
     }
     $s = new StableMap();
@@ -29,11 +31,13 @@ try {
     $s->$method('foo');
     try {
       $s->$method(1.0);
-    } catch (Exception $e) {
+    }
+ catch (Exception $e) {
       echo 'D';
     }
     echo "\n";
   }
-} catch (Exception $e) {
+}
+ catch (Exception $e) {
   echo "Test failed\n";
 }
diff --git a/hphp/test/slow/collection_classes/805.php b/hphp/test/slow/collection_classes/805.php
index 69f20f570..a20f8f6ca 100644
--- a/hphp/test/slow/collection_classes/805.php
+++ b/hphp/test/slow/collection_classes/805.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $classes = array('Vector','Map','StableMap');
 $i = 0;
 try {
@@ -10,7 +9,8 @@ try {
       $x = $obj->foo;
       echo "get: ";
       var_dump($x);
-    } catch (RuntimeException $e) {
+    }
+ catch (RuntimeException $e) {
       echo "get throws, i = ";
       var_dump($i);
     }
@@ -18,19 +18,22 @@ try {
       $x = isset($obj->foo);
       echo "isset: ";
       var_dump($x);
-    } catch (RuntimeException $e) {
+    }
+ catch (RuntimeException $e) {
       echo "isset throws, i = ";
       var_dump($i);
     }
     try {
       $obj->foo = 123;
-    } catch (RuntimeException $e) {
+    }
+ catch (RuntimeException $e) {
       echo "set throws, i = ";
       var_dump($i);
     }
     ++$i;
   }
-} catch (Exception $e) {
+}
+ catch (Exception $e) {
   echo "Fail!\n";
 }
 echo "Done\n";
diff --git a/hphp/test/slow/collection_classes/806.php b/hphp/test/slow/collection_classes/806.php
index ae5175f91..214645288 100644
--- a/hphp/test/slow/collection_classes/806.php
+++ b/hphp/test/slow/collection_classes/806.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $v = new Vector;
 $v[] = 7;
 $v[] = 'foo';
@@ -10,8 +9,10 @@ echo "------------------------\n";
 var_dump($v);
 print_r($v);
 echo json_encode($v) . "\n";
-var_export($v); echo "\n";
+var_export($v);
+ echo "\n";
 var_dump($v2);
 print_r($v2);
 echo json_encode($v2) . "\n";
-var_export($v2); echo "\n";
+var_export($v2);
+ echo "\n";
diff --git a/hphp/test/slow/collection_classes/807.php b/hphp/test/slow/collection_classes/807.php
index 17ed9e2e1..058af5c42 100644
--- a/hphp/test/slow/collection_classes/807.php
+++ b/hphp/test/slow/collection_classes/807.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $m = new Map;
 $m[3] = 'foo';
 var_dump(serialize($m));
@@ -9,11 +8,13 @@ echo "------------------------\n";
 var_dump($m);
 print_r($m);
 echo json_encode($m) . "\n";
-var_export($m); echo "\n";
+var_export($m);
+ echo "\n";
 var_dump($m2);
 print_r($m2);
 echo json_encode($m2) . "\n";
-var_export($m2); echo "\n";
+var_export($m2);
+ echo "\n";
 echo "------------------------\n";
 $m = new Map;
 $m['bar'] = 7;
@@ -23,8 +24,10 @@ echo "------------------------\n";
 var_dump($m);
 print_r($m);
 echo json_encode($m) . "\n";
-var_export($m); echo "\n";
+var_export($m);
+ echo "\n";
 var_dump($m2);
 print_r($m2);
 echo json_encode($m2) . "\n";
-var_export($m2); echo "\n";
+var_export($m2);
+ echo "\n";
diff --git a/hphp/test/slow/collection_classes/808.php b/hphp/test/slow/collection_classes/808.php
index 6dcff3a40..d26aa4026 100644
--- a/hphp/test/slow/collection_classes/808.php
+++ b/hphp/test/slow/collection_classes/808.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $m = new StableMap;
 $m[3] = 'foo';
 $m['bar'] = 7;
@@ -10,11 +9,13 @@ echo "------------------------\n";
 var_dump($m);
 print_r($m);
 echo json_encode($m) . "\n";
-var_export($m); echo "\n";
+var_export($m);
+ echo "\n";
 var_dump($m2);
 print_r($m2);
 echo json_encode($m2) . "\n";
-var_export($m2); echo "\n";
+var_export($m2);
+ echo "\n";
 echo "------------------------\n";
 $m = new StableMap;
 $m['bar'] = 7;
@@ -25,8 +26,10 @@ echo "------------------------\n";
 var_dump($m);
 print_r($m);
 echo json_encode($m) . "\n";
-var_export($m); echo "\n";
+var_export($m);
+ echo "\n";
 var_dump($m2);
 print_r($m2);
 echo json_encode($m2) . "\n";
-var_export($m2); echo "\n";
+var_export($m2);
+ echo "\n";
diff --git a/hphp/test/slow/collection_classes/809.php b/hphp/test/slow/collection_classes/809.php
index e865b311d..fd749e7ba 100644
--- a/hphp/test/slow/collection_classes/809.php
+++ b/hphp/test/slow/collection_classes/809.php
@@ -1,7 +1,16 @@
 <?php
 
-
 var_dump(unserialize(
-  "K:8:\"stdClass\":2:{i:0;i:0;i:1;i:1;}"));
+  "K:8:\"stdClass\":2:{
+i:0;
+i:0;
+i:1;
+i:1;
+}
+"));
 var_dump(unserialize(
-  "O:6:\"Vector\":1:{s:3:\"foo\";i:7;}"));
+  "O:6:\"Vector\":1:{
+s:3:\"foo\";
+i:7;
+}
+"));
diff --git a/hphp/test/slow/collection_classes/810.php b/hphp/test/slow/collection_classes/810.php
index 03b8771a5..28b56f421 100644
--- a/hphp/test/slow/collection_classes/810.php
+++ b/hphp/test/slow/collection_classes/810.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $m = new Map();
 $m['foo'] = new Map();
 $m['foo'][123] = new Vector();
diff --git a/hphp/test/slow/collection_classes/811.php b/hphp/test/slow/collection_classes/811.php
index ecdb1071e..2982f7cdf 100644
--- a/hphp/test/slow/collection_classes/811.php
+++ b/hphp/test/slow/collection_classes/811.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $v = Vector::fromArray(array('foo'));
 var_dump($v[0]);
 var_dump($v->at(0));
diff --git a/hphp/test/slow/collection_classes/812.php b/hphp/test/slow/collection_classes/812.php
index 34b835bb1..ca1a2b317 100644
--- a/hphp/test/slow/collection_classes/812.php
+++ b/hphp/test/slow/collection_classes/812.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $m = Map::fromArray(array('a' => 'foo'));
 var_dump($m['a']);
 var_dump($m->at('a'));
diff --git a/hphp/test/slow/collection_classes/813.php b/hphp/test/slow/collection_classes/813.php
index 1bbf4a088..1fa6aa91c 100644
--- a/hphp/test/slow/collection_classes/813.php
+++ b/hphp/test/slow/collection_classes/813.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $v = new Vector;
 $v[] = 'c';
 $v[] = 'a';
diff --git a/hphp/test/slow/collection_classes/814.php b/hphp/test/slow/collection_classes/814.php
index ebf996c7b..abc0e26e9 100644
--- a/hphp/test/slow/collection_classes/814.php
+++ b/hphp/test/slow/collection_classes/814.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function cmp($x, $y) {
   if ($x < $y) return 1;
   if ($x > $y) return -1;
diff --git a/hphp/test/slow/collection_classes/815.php b/hphp/test/slow/collection_classes/815.php
index 3be40bd3a..4e408e916 100644
--- a/hphp/test/slow/collection_classes/815.php
+++ b/hphp/test/slow/collection_classes/815.php
@@ -1,13 +1,29 @@
 <?hh
 function f() {
-  var_dump(Vector {});
-  var_dump(Map {});
-  var_dump(Vector {1, 2});
-  var_dump(StableMap {'a' => 1, 'b' => 2});
+  var_dump(Vector {
+}
+);
+  var_dump(Map {
+}
+);
+  var_dump(Vector {
+1, 2}
+);
+  var_dump(StableMap {
+'a' => 1, 'b' => 2}
+);
 
-  var_dump(Vector<int> {});
-  var_dump(Map<string,int> {});
-  var_dump(Vector<int> {1, 2});
-  var_dump(StableMap<string,int> {'a' => 1, 'b' => 2});
+  var_dump(Vector<int> {
+}
+);
+  var_dump(Map<string,int> {
+}
+);
+  var_dump(Vector<int> {
+1, 2}
+);
+  var_dump(StableMap<string,int> {
+'a' => 1, 'b' => 2}
+);
 }
 f();
diff --git a/hphp/test/slow/collection_classes/816.php b/hphp/test/slow/collection_classes/816.php
index 6d9677073..ccfc309e8 100644
--- a/hphp/test/slow/collection_classes/816.php
+++ b/hphp/test/slow/collection_classes/816.php
@@ -1,11 +1,14 @@
 <?php
 
-
 function f($x1, $x2, $x3, $x4) {
-  return Vector {$x1, $x2, $x3, $x4};
+  return Vector {
+$x1, $x2, $x3, $x4}
+;
 }
 function g($k1, $v1, $k2, $v2) {
-  $m = Map {$k1 => $v1, $k2 => $v2};
+  $m = Map {
+$k1 => $v1, $k2 => $v2}
+;
   return $m;
 }
 var_dump(f(42, 123.456, 'blah', array(3, 5, 7)));
diff --git a/hphp/test/slow/collection_classes/817.php b/hphp/test/slow/collection_classes/817.php
index 23f435558..cb4dcb181 100644
--- a/hphp/test/slow/collection_classes/817.php
+++ b/hphp/test/slow/collection_classes/817.php
@@ -1,23 +1,25 @@
 <?php
 
-
 $ctypes = array('Vector', 'Map', 'StableMap');
 foreach ($ctypes as $ctype) {
   echo "=== $ctype ===\n";
   $c = new $ctype();
   try {
     $c[0];
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     var_dump($e->getMessage());
   }
   try {
     $c[PHP_INT_MAX];
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     var_dump($e->getMessage());
   }
   try {
     $c[~PHP_INT_MAX];
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     var_dump($e->getMessage());
   }
   if ($ctype === 'Vector') {
@@ -25,25 +27,31 @@ foreach ($ctypes as $ctype) {
   }
   try {
     $c['abc'];
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     var_dump($e->getMessage());
   }
   try {
     $c['abcdefghijklmnopqrst'];
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     var_dump($e->getMessage());
   }
   try {
     $c['abcdefghijklmnopqrstu'];
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     var_dump($e->getMessage());
   }
   try {
     $c["abcdefghij\000klmnopqrst"];
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     $str = $e->getMessage();
     $i = 0;
-    for (;;) {
+    for (;
+;
+) {
       echo(ord($str[$i]));
       ++$i;
       if ($i >= strlen($str)) {
@@ -51,7 +59,8 @@ foreach ($ctypes as $ctype) {
       }
       if (($i % 8) === 0) {
         echo "\n";
-      } else {
+      }
+ else {
         echo ' ';
       }
     }
diff --git a/hphp/test/slow/collection_classes/818.php b/hphp/test/slow/collection_classes/818.php
index 32daf9219..e8e778ee5 100644
--- a/hphp/test/slow/collection_classes/818.php
+++ b/hphp/test/slow/collection_classes/818.php
@@ -1,8 +1,9 @@
 <?php
 
-
 function f() {
-  $x = StableMap {'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4};
+  $x = StableMap {
+'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4}
+;
   unset($x['a']);
   unset($x['c']);
   foreach ($x as $k => $v) {
diff --git a/hphp/test/slow/collection_classes/819.php b/hphp/test/slow/collection_classes/819.php
index 353502814..44392498e 100644
--- a/hphp/test/slow/collection_classes/819.php
+++ b/hphp/test/slow/collection_classes/819.php
@@ -1,8 +1,11 @@
 <?php
 
-
-$v1 = Vector {5};
-$v2 = Vector {5};
+$v1 = Vector {
+5}
+;
+$v2 = Vector {
+5}
+;
 var_dump($v1 === $v2);
 var_dump($v1 == $v2);
 $v1[] = "123";
@@ -13,14 +16,18 @@ var_dump($v1 == $v2);
 $v2[] = 74;
 var_dump($v1 == $v2);
 echo "------------------------\n";
-$v = Vector {};
+$v = Vector {
+}
+;
 var_dump($v == null);
 var_dump($v == false);
 var_dump($v == true);
 var_dump($v == 1);
 var_dump($v == "Vector");
 echo "------------------------\n";
-$v = Vector {7};
+$v = Vector {
+7}
+;
 var_dump($v == null);
 var_dump($v == false);
 var_dump($v == true);
diff --git a/hphp/test/slow/collection_classes/820.php b/hphp/test/slow/collection_classes/820.php
index d8e4728d0..3b761e13b 100644
--- a/hphp/test/slow/collection_classes/820.php
+++ b/hphp/test/slow/collection_classes/820.php
@@ -1,8 +1,11 @@
 <?php
 
-
-$m1 = Map {};
-$m2 = Map {};
+$m1 = Map {
+}
+;
+$m2 = Map {
+}
+;
 var_dump($m1 == $m2);
 $m1['a'] = "123";
 $m1['b'] = 73;
@@ -12,10 +15,14 @@ var_dump($m1 == $m2);
 $m1['c'] = 0;
 var_dump($m1 == $m2);
 echo "------------------------\n";
-$m1 = Map {'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4};
+$m1 = Map {
+'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4}
+;
 $m1->remove('a');
 $m1->remove('c');
-$m2 = Map {'b' => 2, 'd' => 4};
+$m2 = Map {
+'b' => 2, 'd' => 4}
+;
 var_dump($m1 == $m2);
 $m1->remove('d');
 var_dump($m1 == $m2);
@@ -26,14 +33,18 @@ var_dump($m1 == $m2);
 $m2['d'] = 4;
 var_dump($m1 == $m2);
 echo "------------------------\n";
-$m = Map {};
+$m = Map {
+}
+;
 var_dump($m == null);
 var_dump($m == false);
 var_dump($m == true);
 var_dump($m == 1);
 var_dump($m == "Map");
 echo "------------------------\n";
-$m = Map {'x' => 7};
+$m = Map {
+'x' => 7}
+;
 var_dump($m == null);
 var_dump($m == false);
 var_dump($m == true);
diff --git a/hphp/test/slow/collection_classes/821.php b/hphp/test/slow/collection_classes/821.php
index bb333f0fc..aa50065a6 100644
--- a/hphp/test/slow/collection_classes/821.php
+++ b/hphp/test/slow/collection_classes/821.php
@@ -1,8 +1,11 @@
 <?php
 
-
-$s1 = StableMap {'a' => 1, 'b' => 2};
-$s2 = StableMap {'b' => 2, 'a' => 1};
+$s1 = StableMap {
+'a' => 1, 'b' => 2}
+;
+$s2 = StableMap {
+'b' => 2, 'a' => 1}
+;
 var_dump($s1 == $s2);
 $s2->remove('b');
 $s2['b'] = 2;
@@ -12,14 +15,18 @@ var_dump($s1 == $s2);
 $s1['b'] = 3;
 var_dump($s1 == $s2);
 echo "------------------------\n";
-$m = StableMap {};
+$m = StableMap {
+}
+;
 var_dump($m == null);
 var_dump($m == false);
 var_dump($m == true);
 var_dump($m == 1);
 var_dump($m == "StableMap");
 echo "------------------------\n";
-$m = StableMap {'x' => 7};
+$m = StableMap {
+'x' => 7}
+;
 var_dump($m == null);
 var_dump($m == false);
 var_dump($m == true);
diff --git a/hphp/test/slow/collection_classes/822.php b/hphp/test/slow/collection_classes/822.php
index f5e71fcf9..07cd3a904 100644
--- a/hphp/test/slow/collection_classes/822.php
+++ b/hphp/test/slow/collection_classes/822.php
@@ -1,15 +1,18 @@
 <?php
 
-
 function f() {
-  $v = Vector {'a', 'b', 'c'};
+  $v = Vector {
+'a', 'b', 'c'}
+;
   $m = new Map($v);
   var_dump($m);
   $sm = new StableMap($m);
   var_dump($sm);
 }
 function g() {
-  $m = Map {'a' => 1, 2 => 'b'};
+  $m = Map {
+'a' => 1, 2 => 'b'}
+;
   $v = new Vector($m);
   var_dump($v);
 }
diff --git a/hphp/test/slow/collection_classes/823.php b/hphp/test/slow/collection_classes/823.php
index f50028a4c..ee04b4b56 100644
--- a/hphp/test/slow/collection_classes/823.php
+++ b/hphp/test/slow/collection_classes/823.php
@@ -1,6 +1,8 @@
 <?hh
 class C {
-  public $t = Pair {'foo', 42};
+  public $t = Pair {
+'foo', 42}
+;
 }
 function f() {
   $c = new C;
diff --git a/hphp/test/slow/collection_classes/824.php b/hphp/test/slow/collection_classes/824.php
index 199f22d7b..897095d57 100644
--- a/hphp/test/slow/collection_classes/824.php
+++ b/hphp/test/slow/collection_classes/824.php
@@ -1,11 +1,14 @@
 <?php
 
-
-$v = Vector {11, 42, 73};
+$v = Vector {
+11, 42, 73}
+;
 foreach ($v->keys() as $x) {
   var_dump($x);
 }
-$mp = StableMap {'a' => 1, 2 => 'b', 'z' => 9};
+$mp = StableMap {
+'a' => 1, 2 => 'b', 'z' => 9}
+;
 foreach ($mp->keys() as $x) {
   var_dump($x);
 }
diff --git a/hphp/test/slow/collection_classes/825.php b/hphp/test/slow/collection_classes/825.php
index b2f5f2164..f2b3437bf 100644
--- a/hphp/test/slow/collection_classes/825.php
+++ b/hphp/test/slow/collection_classes/825.php
@@ -1,11 +1,14 @@
 <?php
 
-
-$vec1 = Vector {11, 42, 73};
+$vec1 = Vector {
+11, 42, 73}
+;
 foreach ($vec1->items() as $x) {
   var_dump($x);
 }
-$mp1 = StableMap {'a' => 1, 2 => 'b', 'z' => 9};
+$mp1 = StableMap {
+'a' => 1, 2 => 'b', 'z' => 9}
+;
 foreach ($mp1->items() as $t) {
   var_dump($t[0], $t[1]);
 }
@@ -16,6 +19,14 @@ var_dump($vec2);
 $mp2 = StableMap::fromItems($mp1->items());
 var_dump($mp2);
 echo "------------------------\n";
-$tuples = Vector {Pair {'a', 1}, Pair {2, 'b'}, Pair {'z', 9}};
+$tuples = Vector {
+Pair {
+'a', 1}
+, Pair {
+2, 'b'}
+, Pair {
+'z', 9}
+}
+;
 $mp3 = StableMap::fromItems($tuples);
 var_dump($mp3);
diff --git a/hphp/test/slow/collection_classes/826.php b/hphp/test/slow/collection_classes/826.php
index 0fb9964fa..895f66da7 100644
--- a/hphp/test/slow/collection_classes/826.php
+++ b/hphp/test/slow/collection_classes/826.php
@@ -1,23 +1,30 @@
 <?php
 
-
 function f() {
-  $vec = Vector {1, 'b'};
+  $vec = Vector {
+1, 'b'}
+;
   var_dump($vec->containsKey(0));
   var_dump($vec->containsKey(1));
   var_dump($vec->containsKey(2));
   echo "------------------------\n";
-  $mp = Map {'a' => 1, 2 => 'b'};
+  $mp = Map {
+'a' => 1, 2 => 'b'}
+;
   var_dump($mp->containsKey('a'));
   var_dump($mp->containsKey(2));
   var_dump($mp->containsKey('b'));
   echo "------------------------\n";
-  $smp = StableMap {'a' => 1, 2 => 'b'};
+  $smp = StableMap {
+'a' => 1, 2 => 'b'}
+;
   var_dump($smp->containsKey('a'));
   var_dump($smp->containsKey(2));
   var_dump($smp->containsKey('b'));
   echo "------------------------\n";
-  $pair = Pair {1, 'b'};
+  $pair = Pair {
+1, 'b'}
+;
   var_dump($pair->containsKey(0));
   var_dump($pair->containsKey(1));
   var_dump($pair->containsKey(2));
diff --git a/hphp/test/slow/collection_classes/827.php b/hphp/test/slow/collection_classes/827.php
index 5a53b15bc..d55010d11 100644
--- a/hphp/test/slow/collection_classes/827.php
+++ b/hphp/test/slow/collection_classes/827.php
@@ -1,10 +1,15 @@
 <?php
 
-
 function f() {
-  $mp1 = StableMap {'a' => 1, 2 => 'b', 'c' => array()};
-  $mp2 = StableMap {};
-  $mp3 = StableMap {};
+  $mp1 = StableMap {
+'a' => 1, 2 => 'b', 'c' => array()}
+;
+  $mp2 = StableMap {
+}
+;
+  $mp3 = StableMap {
+}
+;
   foreach ($mp1->items() as $t) {
     $mp2->add($t);
   }
diff --git a/hphp/test/slow/collection_classes/828.php b/hphp/test/slow/collection_classes/828.php
index f5e52e34d..800ced33d 100644
--- a/hphp/test/slow/collection_classes/828.php
+++ b/hphp/test/slow/collection_classes/828.php
@@ -1,24 +1,31 @@
 <?php
 
-
 function f() {
   $obj = new stdClass();
-  $a = Vector {$obj, $obj};
+  $a = Vector {
+$obj, $obj}
+;
   $a = unserialize(serialize($a));
   $a[0]->prop = 11;
   var_dump($a[1]->prop);
   $obj = new stdClass();
-  $a = Map {'a' => $obj, 'b' => $obj};
+  $a = Map {
+'a' => $obj, 'b' => $obj}
+;
   $a = unserialize(serialize($a));
   $a['a']->prop = 22;
   var_dump($a['b']->prop);
   $obj = new stdClass();
-  $a = StableMap {'a' => $obj, 'b' => $obj};
+  $a = StableMap {
+'a' => $obj, 'b' => $obj}
+;
   $a = unserialize(serialize($a));
   $a['a']->prop = 33;
   var_dump($a['b']->prop);
   $obj = new stdClass();
-  $a = Pair {$obj, $obj};
+  $a = Pair {
+$obj, $obj}
+;
   $a = unserialize(serialize($a));
   $a[0]->prop = 44;
   var_dump($a[1]->prop);
diff --git a/hphp/test/slow/collection_classes/829.php b/hphp/test/slow/collection_classes/829.php
index b92b49959..b53968986 100644
--- a/hphp/test/slow/collection_classes/829.php
+++ b/hphp/test/slow/collection_classes/829.php
@@ -1,24 +1,37 @@
 <?php
 
-
-$mapFn = function ($v) { return $v+1; };
-$filtFn = function ($v) { return $v % 2 == 0; };
-$vec = Vector {0, 3, 6, 9};
+$mapFn = function ($v) {
+ return $v+1;
+ }
+;
+$filtFn = function ($v) {
+ return $v % 2 == 0;
+ }
+;
+$vec = Vector {
+0, 3, 6, 9}
+;
 foreach ($vec->map($mapFn)->filter($filtFn) as $k => $v) {
   var_dump($k, $v);
 }
 echo "------------------------\n";
-$mp = Map {'a' => 0, 'b' => 3, 'c' => 6};
+$mp = Map {
+'a' => 0, 'b' => 3, 'c' => 6}
+;
 foreach ($mp->map($mapFn)->filter($filtFn) as $k => $v) {
   var_dump($k, $v);
 }
 echo "------------------------\n";
-$smp = StableMap {'a' => 0, 'b' => 3, 'c' => 6, 'd' => 9};
+$smp = StableMap {
+'a' => 0, 'b' => 3, 'c' => 6, 'd' => 9}
+;
 foreach ($smp->map($mapFn)->filter($filtFn) as $k => $v) {
   var_dump($k, $v);
 }
 echo "------------------------\n";
-$pair = Pair {0, 3};
+$pair = Pair {
+0, 3}
+;
 foreach ($pair->map($mapFn)->filter($filtFn) as $k => $v) {
   var_dump($k, $v);
 }
diff --git a/hphp/test/slow/collection_classes/830.php b/hphp/test/slow/collection_classes/830.php
index 636d69170..f305f181f 100644
--- a/hphp/test/slow/collection_classes/830.php
+++ b/hphp/test/slow/collection_classes/830.php
@@ -1,24 +1,37 @@
 <?php
 
-
-$mapFn = function ($v) { return $v+1; };
-$filtFn = function ($v) { return $v % 2 == 0; };
-$vec = Vector {0, 3, 6, 9};
+$mapFn = function ($v) {
+ return $v+1;
+ }
+;
+$filtFn = function ($v) {
+ return $v % 2 == 0;
+ }
+;
+$vec = Vector {
+0, 3, 6, 9}
+;
 foreach ($vec->view()->map($mapFn)->filter($filtFn) as $k => $v) {
   var_dump($k, $v);
 }
 echo "------------------------\n";
-$mp = Map {'a' => 0, 'b' => 3, 'c' => 6};
+$mp = Map {
+'a' => 0, 'b' => 3, 'c' => 6}
+;
 foreach ($mp->view()->map($mapFn)->filter($filtFn) as $k => $v) {
   var_dump($k, $v);
 }
 echo "------------------------\n";
-$smp = StableMap {'a' => 0, 'b' => 3, 'c' => 6, 'd' => 9};
+$smp = StableMap {
+'a' => 0, 'b' => 3, 'c' => 6, 'd' => 9}
+;
 foreach ($smp->view()->map($mapFn)->filter($filtFn) as $k => $v) {
   var_dump($k, $v);
 }
 echo "------------------------\n";
-$pair = Pair {0, 3};
+$pair = Pair {
+0, 3}
+;
 foreach ($pair->view()->map($mapFn)->filter($filtFn) as $k => $v) {
   var_dump($k, $v);
 }
diff --git a/hphp/test/slow/collection_classes/831.php b/hphp/test/slow/collection_classes/831.php
index 7f831a310..37cefe14e 100644
--- a/hphp/test/slow/collection_classes/831.php
+++ b/hphp/test/slow/collection_classes/831.php
@@ -1,23 +1,35 @@
 <?php
 
-
-$mapFn = function ($t) { return Pair {$t[0]*3+1, $t[1]}; };
-$vec = Vector {'a', 'b', 'c', 'd'};
+$mapFn = function ($t) {
+ return Pair {
+$t[0]*3+1, $t[1]}
+;
+ }
+;
+$vec = Vector {
+'a', 'b', 'c', 'd'}
+;
 foreach ($vec->kvzip()->map($mapFn) as $t) {
   var_dump($t[0], $t[1]);
 }
 echo "------------------------\n";
-$mp = Map {2 => 'a'};
+$mp = Map {
+2 => 'a'}
+;
 foreach ($mp->kvzip()->map($mapFn) as $t) {
   var_dump($t[0], $t[1]);
 }
 echo "------------------------\n";
-$smp = StableMap {2 => 'a', 4 => 'b', 6 => 'c', 8 => 'd'};
+$smp = StableMap {
+2 => 'a', 4 => 'b', 6 => 'c', 8 => 'd'}
+;
 foreach ($smp->kvzip()->map($mapFn) as $t) {
   var_dump($t[0], $t[1]);
 }
 echo "------------------------\n";
-$pair = Pair {'a', 'b'};
+$pair = Pair {
+'a', 'b'}
+;
 foreach ($pair->kvzip()->map($mapFn) as $t) {
   var_dump($t[0], $t[1]);
 }
diff --git a/hphp/test/slow/collection_classes/832.php b/hphp/test/slow/collection_classes/832.php
index 30d2ed269..497e95057 100644
--- a/hphp/test/slow/collection_classes/832.php
+++ b/hphp/test/slow/collection_classes/832.php
@@ -1,19 +1,32 @@
 <?php
 
-
-$mapFn = function ($x) { return $x*3+1; };
-$vec = Vector {2, 4, 6, 8};
+$mapFn = function ($x) {
+ return $x*3+1;
+ }
+;
+$vec = Vector {
+2, 4, 6, 8}
+;
 foreach ($vec->items()->map($mapFn) as $x) {
   var_dump($x);
 }
 echo "------------------------\n";
-$mapFn = function ($t) { return Pair {$t[0]*3+1, $t[1]}; };
-$mp = Map {2 => 'a'};
+$mapFn = function ($t) {
+ return Pair {
+$t[0]*3+1, $t[1]}
+;
+ }
+;
+$mp = Map {
+2 => 'a'}
+;
 foreach ($mp->items()->map($mapFn) as $t) {
   var_dump($t[0], $t[1]);
 }
 echo "------------------------\n";
-$smp = StableMap {2 => 'a', 4 => 'b', 6 => 'c', 8 => 'd'};
+$smp = StableMap {
+2 => 'a', 4 => 'b', 6 => 'c', 8 => 'd'}
+;
 foreach ($smp->items()->map($mapFn) as $t) {
   var_dump($t[0], $t[1]);
 }
diff --git a/hphp/test/slow/collection_classes/833.php b/hphp/test/slow/collection_classes/833.php
index 6022c6b38..88e39fe44 100644
--- a/hphp/test/slow/collection_classes/833.php
+++ b/hphp/test/slow/collection_classes/833.php
@@ -1,26 +1,45 @@
 <?php
 
-
-$mapFn = function ($v) { return $v+1; };
-$filtFn = function ($v) { return $v % 2 == 0; };
-$vec = Vector {0, 3, 6, 9};
+$mapFn = function ($v) {
+ return $v+1;
+ }
+;
+$filtFn = function ($v) {
+ return $v % 2 == 0;
+ }
+;
+$vec = Vector {
+0, 3, 6, 9}
+;
 foreach ($vec->keys()->map($mapFn)->filter($filtFn) as $x) {
   var_dump($x);
 }
 echo "------------------------\n";
-$mp = Map {0 => 'a', 3 => 'b', 6 => 'c'};
+$mp = Map {
+0 => 'a', 3 => 'b', 6 => 'c'}
+;
 foreach ($mp->keys()->map($mapFn)->filter($filtFn) as $x) {
   var_dump($x);
 }
 echo "------------------------\n";
-$smp = StableMap {0 => 'a', 3 => 'b', 6 => 'c', 9 => 'd'};
+$smp = StableMap {
+0 => 'a', 3 => 'b', 6 => 'c', 9 => 'd'}
+;
 foreach ($smp->keys()->map($mapFn)->filter($filtFn) as $x) {
   var_dump($x);
 }
 echo "------------------------\n";
-$v = Vector {0, 1, 2, 3, 4};
-$iterable = $v->map(function ($x) { return $x+1; })
-              ->filter(function ($x) { return $x % 2 == 0; });
+$v = Vector {
+0, 1, 2, 3, 4}
+;
+$iterable = $v->map(function ($x) {
+ return $x+1;
+ }
+)
+              ->filter(function ($x) {
+ return $x % 2 == 0;
+ }
+);
 foreach ($iterable as $v1) {
   foreach ($iterable as $v2) {
     echo "$v1 $v2\n";
diff --git a/hphp/test/slow/collection_classes/834.php b/hphp/test/slow/collection_classes/834.php
index 92dc9f2e5..198e92ea8 100644
--- a/hphp/test/slow/collection_classes/834.php
+++ b/hphp/test/slow/collection_classes/834.php
@@ -1,27 +1,46 @@
 <?php
 
-
-$mapFn = function ($v) { return $v+1; };
-$filtFn = function ($v) { return $v % 2 == 0; };
-$vec = Vector {0, 3, 6, 9};
+$mapFn = function ($v) {
+ return $v+1;
+ }
+;
+$filtFn = function ($v) {
+ return $v % 2 == 0;
+ }
+;
+$vec = Vector {
+0, 3, 6, 9}
+;
 foreach ($vec->view()->keys()->map($mapFn)->filter($filtFn) as $x) {
   var_dump($x);
 }
 echo "------------------------\n";
-$mp = Map {0 => 'a', 3 => 'b', 6 => 'c'};
+$mp = Map {
+0 => 'a', 3 => 'b', 6 => 'c'}
+;
 foreach ($mp->view()->keys()->map($mapFn)->filter($filtFn) as $x) {
   var_dump($x);
 }
 echo "------------------------\n";
-$smp = StableMap {0 => 'a', 3 => 'b', 6 => 'c', 9 => 'd'};
+$smp = StableMap {
+0 => 'a', 3 => 'b', 6 => 'c', 9 => 'd'}
+;
 foreach ($smp->view()->keys()->map($mapFn)->filter($filtFn) as $x) {
   var_dump($x);
 }
 echo "------------------------\n";
-$v = Vector {0, 1, 2, 3, 4};
+$v = Vector {
+0, 1, 2, 3, 4}
+;
 $iterable = $v->view()
-              ->map(function ($x) { return $x+1; })
-              ->filter(function ($x) { return $x % 2 == 0; });
+              ->map(function ($x) {
+ return $x+1;
+ }
+)
+              ->filter(function ($x) {
+ return $x % 2 == 0;
+ }
+);
 foreach ($iterable as $v1) {
   foreach ($iterable as $v2) {
     echo "$v1 $v2\n";
diff --git a/hphp/test/slow/collection_classes/835.php b/hphp/test/slow/collection_classes/835.php
index 5c06d07f8..4ead6c4b9 100644
--- a/hphp/test/slow/collection_classes/835.php
+++ b/hphp/test/slow/collection_classes/835.php
@@ -1,20 +1,31 @@
 <?php
 
-
-$c1 = StableMap {'a' => 0, 'b' => 3, 'c' => 6, 'd' => 9};
-$c2 = Vector {1, 4, 7};
+$c1 = StableMap {
+'a' => 0, 'b' => 3, 'c' => 6, 'd' => 9}
+;
+$c2 = Vector {
+1, 4, 7}
+;
 foreach ($c1->zip($c2) as $k => $v) {
   var_dump($k, $v);
 }
 echo "------------------------\n";
-$c1 = Vector {1, 4, 7, 10};
-$c2 = StableMap {'a' => 0, 'b' => 3, 'c' => 6};
+$c1 = Vector {
+1, 4, 7, 10}
+;
+$c2 = StableMap {
+'a' => 0, 'b' => 3, 'c' => 6}
+;
 foreach ($c1->zip($c2) as $k => $v) {
   var_dump($k, $v);
 }
 echo "------------------------\n";
-$c1 = Pair {1, 4};
-$c2 = StableMap {'a' => 0, 'b' => 3, 'c' => 6};
+$c1 = Pair {
+1, 4}
+;
+$c2 = StableMap {
+'a' => 0, 'b' => 3, 'c' => 6}
+;
 foreach ($c1->zip($c2) as $k => $v) {
   var_dump($k, $v);
 }
diff --git a/hphp/test/slow/collection_classes/836.php b/hphp/test/slow/collection_classes/836.php
index 547599c51..bce327590 100644
--- a/hphp/test/slow/collection_classes/836.php
+++ b/hphp/test/slow/collection_classes/836.php
@@ -1,5 +1,8 @@
 <?php
-$x = Set {1, 2, 3};
+
+$x = Set {
+1, 2, 3}
+;
 var_dump($x);
 echo print_r($x, true);
 debug_zval_dump($x);
diff --git a/hphp/test/slow/collection_classes/837.php b/hphp/test/slow/collection_classes/837.php
index a98b88e74..1d80231a3 100644
--- a/hphp/test/slow/collection_classes/837.php
+++ b/hphp/test/slow/collection_classes/837.php
@@ -1,12 +1,23 @@
 <?php
-$mapFn = function ($v) { return $v+1; };
-$filtFn = function ($v) { return $v % 2 == 0; };
-$st = Set {0, 3};
+
+$mapFn = function ($v) {
+ return $v+1;
+ }
+;
+$filtFn = function ($v) {
+ return $v % 2 == 0;
+ }
+;
+$st = Set {
+0, 3}
+;
 var_dump($st->map($mapFn)->filter($filtFn));
 foreach ($st->view()->map($mapFn)->filter($filtFn) as $v) {
   var_dump($v);
 }
-$st = new Set(Vector {6, 9});
+$st = new Set(Vector {
+6, 9}
+);
 var_dump($st->map($mapFn)->filter($filtFn));
 foreach ($st->items()->map($mapFn)->filter($filtFn) as $v) {
   var_dump($v);
diff --git a/hphp/test/slow/collection_classes/838.php b/hphp/test/slow/collection_classes/838.php
index 499f8eae3..a00ae8169 100644
--- a/hphp/test/slow/collection_classes/838.php
+++ b/hphp/test/slow/collection_classes/838.php
@@ -1,6 +1,11 @@
 <?php
-$s1 = Set {};
-$s2 = Set {};
+
+$s1 = Set {
+}
+;
+$s2 = Set {
+}
+;
 var_dump($s1 == $s2);
 $s1->add('a');
 var_dump($s1 == $s2);
@@ -13,10 +18,14 @@ var_dump($s1 == $s2);
 $s1[] = 'c';
 var_dump($s1 == $s2);
 echo "============\n";
-$s1 = Set {'a', 'b', 'c', 'd'};
+$s1 = Set {
+'a', 'b', 'c', 'd'}
+;
 $s1->remove('a');
 $s1->remove('c');
-$s2 = Set {'b', 'd'};
+$s2 = Set {
+'b', 'd'}
+;
 var_dump($s1 == $s2);
 $s1->remove('d');
 var_dump($s1 == $s2);
@@ -27,14 +36,18 @@ var_dump($s1 == $s2);
 $s2->add('d');
 var_dump($s1 == $s2);
 echo "============\n";
-$m = Set {};
+$m = Set {
+}
+;
 var_dump($m == null);
 var_dump($m == false);
 var_dump($m == true);
 var_dump($m == 1);
 var_dump($m == "Set");
 echo "============\n";
-$m = Set {7};
+$m = Set {
+7}
+;
 var_dump($m == null);
 var_dump($m == false);
 var_dump($m == true);
diff --git a/hphp/test/slow/collection_classes/839.php b/hphp/test/slow/collection_classes/839.php
index c821dbc40..20715e4f2 100644
--- a/hphp/test/slow/collection_classes/839.php
+++ b/hphp/test/slow/collection_classes/839.php
@@ -1,21 +1,30 @@
 <?php
+
 $obj = new stdclass();
-$x0 = Vector {1, $obj, "foo", $obj};
+$x0 = Vector {
+1, $obj, "foo", $obj}
+;
 apc_store('x0', $x0);
 $x1 = apc_fetch('x0');
 var_dump($x1);
 echo "========\n";
-$x0 = Map {'a' => 1, 'b' => $obj, 33 => "foo", 44 => $obj};
+$x0 = Map {
+'a' => 1, 'b' => $obj, 33 => "foo", 44 => $obj}
+;
 apc_store('x0', $x0);
 $x1 = apc_fetch('x0');
 var_dump($x1);
 echo "========\n";
-$x0 = StableMap {'a' => 1, 'b' => $obj, 33 => "foo", 44 => $obj};
+$x0 = StableMap {
+'a' => 1, 'b' => $obj, 33 => "foo", 44 => $obj}
+;
 apc_store('x0', $x0);
 $x1 = apc_fetch('x0');
 var_dump($x1);
 echo "========\n";
-$x0 = Set {1, "foo"};
+$x0 = Set {
+1, "foo"}
+;
 apc_store('x0', $x0);
 $x1 = apc_fetch('x0');
 var_dump($x1);
diff --git a/hphp/test/slow/collection_classes/840.php b/hphp/test/slow/collection_classes/840.php
index 6af604d1c..9c485a724 100644
--- a/hphp/test/slow/collection_classes/840.php
+++ b/hphp/test/slow/collection_classes/840.php
@@ -1,6 +1,17 @@
 <?php
-$m = StableMap {'d' => 4};
-$x0 = Vector {Map {'a' => 1}, Map {'b' => 2}, Set {'c'}, $m, $m};
+
+$m = StableMap {
+'d' => 4}
+;
+$x0 = Vector {
+Map {
+'a' => 1}
+, Map {
+'b' => 2}
+, Set {
+'c'}
+, $m, $m}
+;
 apc_store('x0', $x0);
 $x1 = apc_fetch('x0');
 $x1[3]['e'] = 5;
diff --git a/hphp/test/slow/collection_classes/841.php b/hphp/test/slow/collection_classes/841.php
index 1e951b7c7..44c2c2727 100644
--- a/hphp/test/slow/collection_classes/841.php
+++ b/hphp/test/slow/collection_classes/841.php
@@ -1,6 +1,9 @@
 <?php
+
 function f() {
-  $m = Map {1 => 'a', '2' => 'b'};
+  $m = Map {
+1 => 'a', '2' => 'b'}
+;
   var_dump(array_key_exists(1, $m));
   var_dump(array_key_exists('1', $m));
   var_dump(array_key_exists(2, $m));
diff --git a/hphp/test/slow/comparisons/1000.php b/hphp/test/slow/comparisons/1000.php
index 1a9dba008..b882e2fb5 100644
--- a/hphp/test/slow/comparisons/1000.php
+++ b/hphp/test/slow/comparisons/1000.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1001.php b/hphp/test/slow/comparisons/1001.php
index bccdbe3ea..1cb57f075 100644
--- a/hphp/test/slow/comparisons/1001.php
+++ b/hphp/test/slow/comparisons/1001.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1002.php b/hphp/test/slow/comparisons/1002.php
index 13c0843fa..27e24fa8d 100644
--- a/hphp/test/slow/comparisons/1002.php
+++ b/hphp/test/slow/comparisons/1002.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > true	"; print "\n"; print ++$i; print "\t"; print ('php'>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > false	"; print "\n"; print ++$i; print "\t"; print ('php'>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > 1	"; print "\n"; print ++$i; print "\t"; print ('php'>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > 0	"; print "\n"; print ++$i; print "\t"; print ('php'>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > -1	"; print "\n"; print ++$i; print "\t"; print ('php'>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > '1'	"; print "\n"; print ++$i; print "\t"; print ('php'>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > '0'	"; print "\n"; print ++$i; print "\t"; print ('php'>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array()	"; print "\n"; print ++$i; print "\t"; print ('php'>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'php' > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1003.php b/hphp/test/slow/comparisons/1003.php
index 8e4fb48a8..3bd6514c1 100644
--- a/hphp/test/slow/comparisons/1003.php
+++ b/hphp/test/slow/comparisons/1003.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > true	"; print "\n"; print ++$i; print "\t"; print (''>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > false	"; print "\n"; print ++$i; print "\t"; print (''>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > 1	"; print "\n"; print ++$i; print "\t"; print (''>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > 0	"; print "\n"; print ++$i; print "\t"; print (''>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > -1	"; print "\n"; print ++$i; print "\t"; print (''>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > '1'	"; print "\n"; print ++$i; print "\t"; print (''>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > '0'	"; print "\n"; print ++$i; print "\t"; print (''>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > '-1'	"; print "\n"; print ++$i; print "\t"; print (''>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > nullptr	"; print "\n"; print ++$i; print "\t"; print (''>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array()	"; print "\n"; print ++$i; print "\t"; print (''>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array(1)	"; print "\n"; print ++$i; print "\t"; print (''>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array(2)	"; print "\n"; print ++$i; print "\t"; print (''>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array('1')	"; print "\n"; print ++$i; print "\t"; print (''>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array('a')	"; print "\n"; print ++$i; print "\t"; print (''>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > 'php'	"; print "\n"; print ++$i; print "\t"; print (''>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'' > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1004.php b/hphp/test/slow/comparisons/1004.php
index abcf4deb6..35ed52ff4 100644
--- a/hphp/test/slow/comparisons/1004.php
+++ b/hphp/test/slow/comparisons/1004.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= true	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= false	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1005.php b/hphp/test/slow/comparisons/1005.php
index 5e9f58fb8..24e62b71d 100644
--- a/hphp/test/slow/comparisons/1005.php
+++ b/hphp/test/slow/comparisons/1005.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= true	"; print "\n"; print ++$i; print "\t"; print (true<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= false	"; print "\n"; print ++$i; print "\t"; print (true<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= 1	"; print "\n"; print ++$i; print "\t"; print (true<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= 0	"; print "\n"; print ++$i; print "\t"; print (true<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= -1	"; print "\n"; print ++$i; print "\t"; print (true<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= '1'	"; print "\n"; print ++$i; print "\t"; print (true<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= '0'	"; print "\n"; print ++$i; print "\t"; print (true<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= '-1'	"; print "\n"; print ++$i; print "\t"; print (true<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= nullptr	"; print "\n"; print ++$i; print "\t"; print (true<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array()	"; print "\n"; print ++$i; print "\t"; print (true<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array(1)	"; print "\n"; print ++$i; print "\t"; print (true<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array(2)	"; print "\n"; print ++$i; print "\t"; print (true<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array('1')	"; print "\n"; print ++$i; print "\t"; print (true<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array('a')	"; print "\n"; print ++$i; print "\t"; print (true<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= 'php'	"; print "\n"; print ++$i; print "\t"; print (true<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "true <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1006.php b/hphp/test/slow/comparisons/1006.php
index 4dc30418d..b3e0a60a7 100644
--- a/hphp/test/slow/comparisons/1006.php
+++ b/hphp/test/slow/comparisons/1006.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= true	"; print "\n"; print ++$i; print "\t"; print (false<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= false	"; print "\n"; print ++$i; print "\t"; print (false<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= 1	"; print "\n"; print ++$i; print "\t"; print (false<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= 0	"; print "\n"; print ++$i; print "\t"; print (false<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= -1	"; print "\n"; print ++$i; print "\t"; print (false<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= '1'	"; print "\n"; print ++$i; print "\t"; print (false<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= '0'	"; print "\n"; print ++$i; print "\t"; print (false<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= '-1'	"; print "\n"; print ++$i; print "\t"; print (false<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= nullptr	"; print "\n"; print ++$i; print "\t"; print (false<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array()	"; print "\n"; print ++$i; print "\t"; print (false<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array(1)	"; print "\n"; print ++$i; print "\t"; print (false<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array(2)	"; print "\n"; print ++$i; print "\t"; print (false<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array('1')	"; print "\n"; print ++$i; print "\t"; print (false<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array('a')	"; print "\n"; print ++$i; print "\t"; print (false<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= 'php'	"; print "\n"; print ++$i; print "\t"; print (false<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "false <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1007.php b/hphp/test/slow/comparisons/1007.php
index fd5f9f777..1bbdd5081 100644
--- a/hphp/test/slow/comparisons/1007.php
+++ b/hphp/test/slow/comparisons/1007.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= true	"; print "\n"; print ++$i; print "\t"; print (1<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= false	"; print "\n"; print ++$i; print "\t"; print (1<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= 1	"; print "\n"; print ++$i; print "\t"; print (1<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= 0	"; print "\n"; print ++$i; print "\t"; print (1<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= -1	"; print "\n"; print ++$i; print "\t"; print (1<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= '1'	"; print "\n"; print ++$i; print "\t"; print (1<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= '0'	"; print "\n"; print ++$i; print "\t"; print (1<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= '-1'	"; print "\n"; print ++$i; print "\t"; print (1<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= nullptr	"; print "\n"; print ++$i; print "\t"; print (1<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array()	"; print "\n"; print ++$i; print "\t"; print (1<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array(1)	"; print "\n"; print ++$i; print "\t"; print (1<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array(2)	"; print "\n"; print ++$i; print "\t"; print (1<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array('1')	"; print "\n"; print ++$i; print "\t"; print (1<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array('a')	"; print "\n"; print ++$i; print "\t"; print (1<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= 'php'	"; print "\n"; print ++$i; print "\t"; print (1<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "1 <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1008.php b/hphp/test/slow/comparisons/1008.php
index 1d672d104..34385fd42 100644
--- a/hphp/test/slow/comparisons/1008.php
+++ b/hphp/test/slow/comparisons/1008.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= true	"; print "\n"; print ++$i; print "\t"; print (0<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= false	"; print "\n"; print ++$i; print "\t"; print (0<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= 1	"; print "\n"; print ++$i; print "\t"; print (0<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= 0	"; print "\n"; print ++$i; print "\t"; print (0<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= -1	"; print "\n"; print ++$i; print "\t"; print (0<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= '1'	"; print "\n"; print ++$i; print "\t"; print (0<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= '0'	"; print "\n"; print ++$i; print "\t"; print (0<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= '-1'	"; print "\n"; print ++$i; print "\t"; print (0<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= nullptr	"; print "\n"; print ++$i; print "\t"; print (0<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array()	"; print "\n"; print ++$i; print "\t"; print (0<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array(1)	"; print "\n"; print ++$i; print "\t"; print (0<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array(2)	"; print "\n"; print ++$i; print "\t"; print (0<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array('1')	"; print "\n"; print ++$i; print "\t"; print (0<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array('a')	"; print "\n"; print ++$i; print "\t"; print (0<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= 'php'	"; print "\n"; print ++$i; print "\t"; print (0<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "0 <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1009.php b/hphp/test/slow/comparisons/1009.php
index b9dc918c0..5531d3653 100644
--- a/hphp/test/slow/comparisons/1009.php
+++ b/hphp/test/slow/comparisons/1009.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= true	"; print "\n"; print ++$i; print "\t"; print (-1<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= false	"; print "\n"; print ++$i; print "\t"; print (-1<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= 1	"; print "\n"; print ++$i; print "\t"; print (-1<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= 0	"; print "\n"; print ++$i; print "\t"; print (-1<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= -1	"; print "\n"; print ++$i; print "\t"; print (-1<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= '1'	"; print "\n"; print ++$i; print "\t"; print (-1<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= '0'	"; print "\n"; print ++$i; print "\t"; print (-1<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= '-1'	"; print "\n"; print ++$i; print "\t"; print (-1<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= nullptr	"; print "\n"; print ++$i; print "\t"; print (-1<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array()	"; print "\n"; print ++$i; print "\t"; print (-1<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array(1)	"; print "\n"; print ++$i; print "\t"; print (-1<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array(2)	"; print "\n"; print ++$i; print "\t"; print (-1<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array('1')	"; print "\n"; print ++$i; print "\t"; print (-1<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array('a')	"; print "\n"; print ++$i; print "\t"; print (-1<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= 'php'	"; print "\n"; print ++$i; print "\t"; print (-1<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "-1 <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1010.php b/hphp/test/slow/comparisons/1010.php
index 9178d0b98..f6876ce98 100644
--- a/hphp/test/slow/comparisons/1010.php
+++ b/hphp/test/slow/comparisons/1010.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= true	"; print "\n"; print ++$i; print "\t"; print ('1'<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= false	"; print "\n"; print ++$i; print "\t"; print ('1'<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= 1	"; print "\n"; print ++$i; print "\t"; print ('1'<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= 0	"; print "\n"; print ++$i; print "\t"; print ('1'<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= -1	"; print "\n"; print ++$i; print "\t"; print ('1'<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= '1'	"; print "\n"; print ++$i; print "\t"; print ('1'<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= '0'	"; print "\n"; print ++$i; print "\t"; print ('1'<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array()	"; print "\n"; print ++$i; print "\t"; print ('1'<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'1' <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1011.php b/hphp/test/slow/comparisons/1011.php
index e246d57d4..86e8eea1b 100644
--- a/hphp/test/slow/comparisons/1011.php
+++ b/hphp/test/slow/comparisons/1011.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= true	"; print "\n"; print ++$i; print "\t"; print ('0'<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= false	"; print "\n"; print ++$i; print "\t"; print ('0'<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= 1	"; print "\n"; print ++$i; print "\t"; print ('0'<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= 0	"; print "\n"; print ++$i; print "\t"; print ('0'<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= -1	"; print "\n"; print ++$i; print "\t"; print ('0'<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= '1'	"; print "\n"; print ++$i; print "\t"; print ('0'<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= '0'	"; print "\n"; print ++$i; print "\t"; print ('0'<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array()	"; print "\n"; print ++$i; print "\t"; print ('0'<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'0' <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1012.php b/hphp/test/slow/comparisons/1012.php
index 118953eaf..6a9a94eff 100644
--- a/hphp/test/slow/comparisons/1012.php
+++ b/hphp/test/slow/comparisons/1012.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= true	"; print "\n"; print ++$i; print "\t"; print ('-1'<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= false	"; print "\n"; print ++$i; print "\t"; print ('-1'<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= 1	"; print "\n"; print ++$i; print "\t"; print ('-1'<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= 0	"; print "\n"; print ++$i; print "\t"; print ('-1'<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= -1	"; print "\n"; print ++$i; print "\t"; print ('-1'<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array()	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'-1' <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1013.php b/hphp/test/slow/comparisons/1013.php
index 8504e2815..b115fec64 100644
--- a/hphp/test/slow/comparisons/1013.php
+++ b/hphp/test/slow/comparisons/1013.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= true	"; print "\n"; print ++$i; print "\t"; print (nullptr<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= false	"; print "\n"; print ++$i; print "\t"; print (nullptr<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= 1	"; print "\n"; print ++$i; print "\t"; print (nullptr<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= 0	"; print "\n"; print ++$i; print "\t"; print (nullptr<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= -1	"; print "\n"; print ++$i; print "\t"; print (nullptr<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array()	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "nullptr <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1014.php b/hphp/test/slow/comparisons/1014.php
index 94aaa8aaf..d300baf58 100644
--- a/hphp/test/slow/comparisons/1014.php
+++ b/hphp/test/slow/comparisons/1014.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= true	"; print "\n"; print ++$i; print "\t"; print (array()<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= false	"; print "\n"; print ++$i; print "\t"; print (array()<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= 1	"; print "\n"; print ++$i; print "\t"; print (array()<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= 0	"; print "\n"; print ++$i; print "\t"; print (array()<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= -1	"; print "\n"; print ++$i; print "\t"; print (array()<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= '1'	"; print "\n"; print ++$i; print "\t"; print (array()<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= '0'	"; print "\n"; print ++$i; print "\t"; print (array()<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array()<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array()<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array()	"; print "\n"; print ++$i; print "\t"; print (array()<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array()<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array()<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array()<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array()<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array()<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array() <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1015.php b/hphp/test/slow/comparisons/1015.php
index b670a5b45..7381d73f5 100644
--- a/hphp/test/slow/comparisons/1015.php
+++ b/hphp/test/slow/comparisons/1015.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= true	"; print "\n"; print ++$i; print "\t"; print (array(1)<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= false	"; print "\n"; print ++$i; print "\t"; print (array(1)<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= 1	"; print "\n"; print ++$i; print "\t"; print (array(1)<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= 0	"; print "\n"; print ++$i; print "\t"; print (array(1)<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= -1	"; print "\n"; print ++$i; print "\t"; print (array(1)<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array()	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(1) <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1016.php b/hphp/test/slow/comparisons/1016.php
index d95836ec7..4543fac4f 100644
--- a/hphp/test/slow/comparisons/1016.php
+++ b/hphp/test/slow/comparisons/1016.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= true	"; print "\n"; print ++$i; print "\t"; print (array(2)<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= false	"; print "\n"; print ++$i; print "\t"; print (array(2)<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= 1	"; print "\n"; print ++$i; print "\t"; print (array(2)<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= 0	"; print "\n"; print ++$i; print "\t"; print (array(2)<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= -1	"; print "\n"; print ++$i; print "\t"; print (array(2)<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array()	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(2) <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1017.php b/hphp/test/slow/comparisons/1017.php
index a668e7892..75802a11e 100644
--- a/hphp/test/slow/comparisons/1017.php
+++ b/hphp/test/slow/comparisons/1017.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= true	"; print "\n"; print ++$i; print "\t"; print (array('1')<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= false	"; print "\n"; print ++$i; print "\t"; print (array('1')<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= 1	"; print "\n"; print ++$i; print "\t"; print (array('1')<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= 0	"; print "\n"; print ++$i; print "\t"; print (array('1')<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= -1	"; print "\n"; print ++$i; print "\t"; print (array('1')<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array()	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('1') <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1018.php b/hphp/test/slow/comparisons/1018.php
index a8da32e33..a2c2c79e4 100644
--- a/hphp/test/slow/comparisons/1018.php
+++ b/hphp/test/slow/comparisons/1018.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1019.php b/hphp/test/slow/comparisons/1019.php
index 63dc889ff..1b2ac9875 100644
--- a/hphp/test/slow/comparisons/1019.php
+++ b/hphp/test/slow/comparisons/1019.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= true	"; print "\n"; print ++$i; print "\t"; print (array('a')<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= false	"; print "\n"; print ++$i; print "\t"; print (array('a')<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= 1	"; print "\n"; print ++$i; print "\t"; print (array('a')<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= 0	"; print "\n"; print ++$i; print "\t"; print (array('a')<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= -1	"; print "\n"; print ++$i; print "\t"; print (array('a')<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array()	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a') <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1020.php b/hphp/test/slow/comparisons/1020.php
index 1c2bb1db6..7c13662c4 100644
--- a/hphp/test/slow/comparisons/1020.php
+++ b/hphp/test/slow/comparisons/1020.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1021.php b/hphp/test/slow/comparisons/1021.php
index db0228660..5d73eb3c8 100644
--- a/hphp/test/slow/comparisons/1021.php
+++ b/hphp/test/slow/comparisons/1021.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1022.php b/hphp/test/slow/comparisons/1022.php
index 21e40aa6d..e1f0aa47f 100644
--- a/hphp/test/slow/comparisons/1022.php
+++ b/hphp/test/slow/comparisons/1022.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1023.php b/hphp/test/slow/comparisons/1023.php
index fe1f284e9..f99ee6475 100644
--- a/hphp/test/slow/comparisons/1023.php
+++ b/hphp/test/slow/comparisons/1023.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1024.php b/hphp/test/slow/comparisons/1024.php
index a92567fd6..cd3f10fd2 100644
--- a/hphp/test/slow/comparisons/1024.php
+++ b/hphp/test/slow/comparisons/1024.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1025.php b/hphp/test/slow/comparisons/1025.php
index aef860155..0a5faa092 100644
--- a/hphp/test/slow/comparisons/1025.php
+++ b/hphp/test/slow/comparisons/1025.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= true	"; print "\n"; print ++$i; print "\t"; print ('php'<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= false	"; print "\n"; print ++$i; print "\t"; print ('php'<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= 1	"; print "\n"; print ++$i; print "\t"; print ('php'<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= 0	"; print "\n"; print ++$i; print "\t"; print ('php'<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= -1	"; print "\n"; print ++$i; print "\t"; print ('php'<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= '1'	"; print "\n"; print ++$i; print "\t"; print ('php'<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= '0'	"; print "\n"; print ++$i; print "\t"; print ('php'<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array()	"; print "\n"; print ++$i; print "\t"; print ('php'<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'php' <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1026.php b/hphp/test/slow/comparisons/1026.php
index 2ca534af1..9ab4c2530 100644
--- a/hphp/test/slow/comparisons/1026.php
+++ b/hphp/test/slow/comparisons/1026.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''<=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= true	"; print "\n"; print ++$i; print "\t"; print (''<=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= false	"; print "\n"; print ++$i; print "\t"; print (''<=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= 1	"; print "\n"; print ++$i; print "\t"; print (''<=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= 0	"; print "\n"; print ++$i; print "\t"; print (''<=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= -1	"; print "\n"; print ++$i; print "\t"; print (''<='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= '1'	"; print "\n"; print ++$i; print "\t"; print (''<='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= '0'	"; print "\n"; print ++$i; print "\t"; print (''<='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= '-1'	"; print "\n"; print ++$i; print "\t"; print (''<=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= nullptr	"; print "\n"; print ++$i; print "\t"; print (''<=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array()	"; print "\n"; print ++$i; print "\t"; print (''<=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array(1)	"; print "\n"; print ++$i; print "\t"; print (''<=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array(2)	"; print "\n"; print ++$i; print "\t"; print (''<=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array('1')	"; print "\n"; print ++$i; print "\t"; print (''<=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''<=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array('a')	"; print "\n"; print ++$i; print "\t"; print (''<=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''<=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''<=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''<=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''<='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= 'php'	"; print "\n"; print ++$i; print "\t"; print (''<='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''<=$b) ? 'Y' : 'N'; print ($a <=$b) ? 'Y' : 'N'; print "\t"; print "'' <= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''<=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''<=$b) ? 'Y' : 'N';
+ print ($a <=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1027.php b/hphp/test/slow/comparisons/1027.php
index 4b36d9669..1ffd431f0 100644
--- a/hphp/test/slow/comparisons/1027.php
+++ b/hphp/test/slow/comparisons/1027.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= true	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= false	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1028.php b/hphp/test/slow/comparisons/1028.php
index ae8becb75..ed73a82db 100644
--- a/hphp/test/slow/comparisons/1028.php
+++ b/hphp/test/slow/comparisons/1028.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= true	"; print "\n"; print ++$i; print "\t"; print (true>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= false	"; print "\n"; print ++$i; print "\t"; print (true>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= 1	"; print "\n"; print ++$i; print "\t"; print (true>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= 0	"; print "\n"; print ++$i; print "\t"; print (true>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= -1	"; print "\n"; print ++$i; print "\t"; print (true>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= '1'	"; print "\n"; print ++$i; print "\t"; print (true>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= '0'	"; print "\n"; print ++$i; print "\t"; print (true>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= '-1'	"; print "\n"; print ++$i; print "\t"; print (true>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= nullptr	"; print "\n"; print ++$i; print "\t"; print (true>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array()	"; print "\n"; print ++$i; print "\t"; print (true>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array(1)	"; print "\n"; print ++$i; print "\t"; print (true>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array(2)	"; print "\n"; print ++$i; print "\t"; print (true>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array('1')	"; print "\n"; print ++$i; print "\t"; print (true>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array('a')	"; print "\n"; print ++$i; print "\t"; print (true>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= 'php'	"; print "\n"; print ++$i; print "\t"; print (true>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "true >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1029.php b/hphp/test/slow/comparisons/1029.php
index 3740736df..1b59539db 100644
--- a/hphp/test/slow/comparisons/1029.php
+++ b/hphp/test/slow/comparisons/1029.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= true	"; print "\n"; print ++$i; print "\t"; print (false>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= false	"; print "\n"; print ++$i; print "\t"; print (false>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= 1	"; print "\n"; print ++$i; print "\t"; print (false>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= 0	"; print "\n"; print ++$i; print "\t"; print (false>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= -1	"; print "\n"; print ++$i; print "\t"; print (false>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= '1'	"; print "\n"; print ++$i; print "\t"; print (false>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= '0'	"; print "\n"; print ++$i; print "\t"; print (false>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= '-1'	"; print "\n"; print ++$i; print "\t"; print (false>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= nullptr	"; print "\n"; print ++$i; print "\t"; print (false>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array()	"; print "\n"; print ++$i; print "\t"; print (false>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array(1)	"; print "\n"; print ++$i; print "\t"; print (false>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array(2)	"; print "\n"; print ++$i; print "\t"; print (false>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array('1')	"; print "\n"; print ++$i; print "\t"; print (false>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array('a')	"; print "\n"; print ++$i; print "\t"; print (false>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= 'php'	"; print "\n"; print ++$i; print "\t"; print (false>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "false >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1030.php b/hphp/test/slow/comparisons/1030.php
index cd1423418..df74be79b 100644
--- a/hphp/test/slow/comparisons/1030.php
+++ b/hphp/test/slow/comparisons/1030.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= true	"; print "\n"; print ++$i; print "\t"; print (1>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= false	"; print "\n"; print ++$i; print "\t"; print (1>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= 1	"; print "\n"; print ++$i; print "\t"; print (1>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= 0	"; print "\n"; print ++$i; print "\t"; print (1>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= -1	"; print "\n"; print ++$i; print "\t"; print (1>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= '1'	"; print "\n"; print ++$i; print "\t"; print (1>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= '0'	"; print "\n"; print ++$i; print "\t"; print (1>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= '-1'	"; print "\n"; print ++$i; print "\t"; print (1>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= nullptr	"; print "\n"; print ++$i; print "\t"; print (1>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array()	"; print "\n"; print ++$i; print "\t"; print (1>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array(1)	"; print "\n"; print ++$i; print "\t"; print (1>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array(2)	"; print "\n"; print ++$i; print "\t"; print (1>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array('1')	"; print "\n"; print ++$i; print "\t"; print (1>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array('a')	"; print "\n"; print ++$i; print "\t"; print (1>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= 'php'	"; print "\n"; print ++$i; print "\t"; print (1>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "1 >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1031.php b/hphp/test/slow/comparisons/1031.php
index 036685714..fb9b65a71 100644
--- a/hphp/test/slow/comparisons/1031.php
+++ b/hphp/test/slow/comparisons/1031.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= true	"; print "\n"; print ++$i; print "\t"; print (0>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= false	"; print "\n"; print ++$i; print "\t"; print (0>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= 1	"; print "\n"; print ++$i; print "\t"; print (0>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= 0	"; print "\n"; print ++$i; print "\t"; print (0>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= -1	"; print "\n"; print ++$i; print "\t"; print (0>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= '1'	"; print "\n"; print ++$i; print "\t"; print (0>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= '0'	"; print "\n"; print ++$i; print "\t"; print (0>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= '-1'	"; print "\n"; print ++$i; print "\t"; print (0>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= nullptr	"; print "\n"; print ++$i; print "\t"; print (0>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array()	"; print "\n"; print ++$i; print "\t"; print (0>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array(1)	"; print "\n"; print ++$i; print "\t"; print (0>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array(2)	"; print "\n"; print ++$i; print "\t"; print (0>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array('1')	"; print "\n"; print ++$i; print "\t"; print (0>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array('a')	"; print "\n"; print ++$i; print "\t"; print (0>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= 'php'	"; print "\n"; print ++$i; print "\t"; print (0>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "0 >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1032.php b/hphp/test/slow/comparisons/1032.php
index 0c3cded22..3b1d51a7b 100644
--- a/hphp/test/slow/comparisons/1032.php
+++ b/hphp/test/slow/comparisons/1032.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= true	"; print "\n"; print ++$i; print "\t"; print (-1>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= false	"; print "\n"; print ++$i; print "\t"; print (-1>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= 1	"; print "\n"; print ++$i; print "\t"; print (-1>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= 0	"; print "\n"; print ++$i; print "\t"; print (-1>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= -1	"; print "\n"; print ++$i; print "\t"; print (-1>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= '1'	"; print "\n"; print ++$i; print "\t"; print (-1>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= '0'	"; print "\n"; print ++$i; print "\t"; print (-1>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= '-1'	"; print "\n"; print ++$i; print "\t"; print (-1>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= nullptr	"; print "\n"; print ++$i; print "\t"; print (-1>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array()	"; print "\n"; print ++$i; print "\t"; print (-1>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array(1)	"; print "\n"; print ++$i; print "\t"; print (-1>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array(2)	"; print "\n"; print ++$i; print "\t"; print (-1>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array('1')	"; print "\n"; print ++$i; print "\t"; print (-1>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array('a')	"; print "\n"; print ++$i; print "\t"; print (-1>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= 'php'	"; print "\n"; print ++$i; print "\t"; print (-1>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "-1 >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1033.php b/hphp/test/slow/comparisons/1033.php
index b4ce12b71..20b151c43 100644
--- a/hphp/test/slow/comparisons/1033.php
+++ b/hphp/test/slow/comparisons/1033.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= true	"; print "\n"; print ++$i; print "\t"; print ('1'>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= false	"; print "\n"; print ++$i; print "\t"; print ('1'>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= 1	"; print "\n"; print ++$i; print "\t"; print ('1'>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= 0	"; print "\n"; print ++$i; print "\t"; print ('1'>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= -1	"; print "\n"; print ++$i; print "\t"; print ('1'>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= '1'	"; print "\n"; print ++$i; print "\t"; print ('1'>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= '0'	"; print "\n"; print ++$i; print "\t"; print ('1'>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array()	"; print "\n"; print ++$i; print "\t"; print ('1'>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'1' >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1034.php b/hphp/test/slow/comparisons/1034.php
index 8ae3ade70..312551bb0 100644
--- a/hphp/test/slow/comparisons/1034.php
+++ b/hphp/test/slow/comparisons/1034.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= true	"; print "\n"; print ++$i; print "\t"; print ('0'>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= false	"; print "\n"; print ++$i; print "\t"; print ('0'>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= 1	"; print "\n"; print ++$i; print "\t"; print ('0'>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= 0	"; print "\n"; print ++$i; print "\t"; print ('0'>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= -1	"; print "\n"; print ++$i; print "\t"; print ('0'>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= '1'	"; print "\n"; print ++$i; print "\t"; print ('0'>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= '0'	"; print "\n"; print ++$i; print "\t"; print ('0'>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array()	"; print "\n"; print ++$i; print "\t"; print ('0'>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'0' >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1035.php b/hphp/test/slow/comparisons/1035.php
index 025b316a7..e3e521bb5 100644
--- a/hphp/test/slow/comparisons/1035.php
+++ b/hphp/test/slow/comparisons/1035.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= true	"; print "\n"; print ++$i; print "\t"; print ('-1'>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= false	"; print "\n"; print ++$i; print "\t"; print ('-1'>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= 1	"; print "\n"; print ++$i; print "\t"; print ('-1'>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= 0	"; print "\n"; print ++$i; print "\t"; print ('-1'>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= -1	"; print "\n"; print ++$i; print "\t"; print ('-1'>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array()	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'-1' >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1036.php b/hphp/test/slow/comparisons/1036.php
index 6b298d910..c58dc95d1 100644
--- a/hphp/test/slow/comparisons/1036.php
+++ b/hphp/test/slow/comparisons/1036.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= true	"; print "\n"; print ++$i; print "\t"; print (nullptr>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= false	"; print "\n"; print ++$i; print "\t"; print (nullptr>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= 1	"; print "\n"; print ++$i; print "\t"; print (nullptr>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= 0	"; print "\n"; print ++$i; print "\t"; print (nullptr>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= -1	"; print "\n"; print ++$i; print "\t"; print (nullptr>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array()	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "nullptr >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1037.php b/hphp/test/slow/comparisons/1037.php
index fe86fde45..1e10cba66 100644
--- a/hphp/test/slow/comparisons/1037.php
+++ b/hphp/test/slow/comparisons/1037.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= true	"; print "\n"; print ++$i; print "\t"; print (array()>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= false	"; print "\n"; print ++$i; print "\t"; print (array()>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= 1	"; print "\n"; print ++$i; print "\t"; print (array()>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= 0	"; print "\n"; print ++$i; print "\t"; print (array()>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= -1	"; print "\n"; print ++$i; print "\t"; print (array()>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= '1'	"; print "\n"; print ++$i; print "\t"; print (array()>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= '0'	"; print "\n"; print ++$i; print "\t"; print (array()>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array()>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array()>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array()	"; print "\n"; print ++$i; print "\t"; print (array()>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array()>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array()>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array()>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array()>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array()>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array() >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1038.php b/hphp/test/slow/comparisons/1038.php
index 2b0801a9a..bb253dbb6 100644
--- a/hphp/test/slow/comparisons/1038.php
+++ b/hphp/test/slow/comparisons/1038.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= true	"; print "\n"; print ++$i; print "\t"; print (array(1)>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= false	"; print "\n"; print ++$i; print "\t"; print (array(1)>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= 1	"; print "\n"; print ++$i; print "\t"; print (array(1)>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= 0	"; print "\n"; print ++$i; print "\t"; print (array(1)>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= -1	"; print "\n"; print ++$i; print "\t"; print (array(1)>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array()	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(1) >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1039.php b/hphp/test/slow/comparisons/1039.php
index b07b1d859..9e4e524b8 100644
--- a/hphp/test/slow/comparisons/1039.php
+++ b/hphp/test/slow/comparisons/1039.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= true	"; print "\n"; print ++$i; print "\t"; print (array(2)>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= false	"; print "\n"; print ++$i; print "\t"; print (array(2)>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= 1	"; print "\n"; print ++$i; print "\t"; print (array(2)>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= 0	"; print "\n"; print ++$i; print "\t"; print (array(2)>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= -1	"; print "\n"; print ++$i; print "\t"; print (array(2)>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array()	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(2) >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1040.php b/hphp/test/slow/comparisons/1040.php
index b2035b418..9dd2bd3c9 100644
--- a/hphp/test/slow/comparisons/1040.php
+++ b/hphp/test/slow/comparisons/1040.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= true	"; print "\n"; print ++$i; print "\t"; print (array('1')>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= false	"; print "\n"; print ++$i; print "\t"; print (array('1')>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= 1	"; print "\n"; print ++$i; print "\t"; print (array('1')>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= 0	"; print "\n"; print ++$i; print "\t"; print (array('1')>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= -1	"; print "\n"; print ++$i; print "\t"; print (array('1')>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array()	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('1') >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1041.php b/hphp/test/slow/comparisons/1041.php
index c74860f46..6ba8bf5a5 100644
--- a/hphp/test/slow/comparisons/1041.php
+++ b/hphp/test/slow/comparisons/1041.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1042.php b/hphp/test/slow/comparisons/1042.php
index 5ecae0a59..c18d3b2c0 100644
--- a/hphp/test/slow/comparisons/1042.php
+++ b/hphp/test/slow/comparisons/1042.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= true	"; print "\n"; print ++$i; print "\t"; print (array('a')>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= false	"; print "\n"; print ++$i; print "\t"; print (array('a')>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= 1	"; print "\n"; print ++$i; print "\t"; print (array('a')>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= 0	"; print "\n"; print ++$i; print "\t"; print (array('a')>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= -1	"; print "\n"; print ++$i; print "\t"; print (array('a')>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array()	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a') >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1043.php b/hphp/test/slow/comparisons/1043.php
index f5bc6a054..a51c970ea 100644
--- a/hphp/test/slow/comparisons/1043.php
+++ b/hphp/test/slow/comparisons/1043.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1044.php b/hphp/test/slow/comparisons/1044.php
index 2d0df2637..cbad4f770 100644
--- a/hphp/test/slow/comparisons/1044.php
+++ b/hphp/test/slow/comparisons/1044.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1045.php b/hphp/test/slow/comparisons/1045.php
index 79cfe2cd8..15593cfd8 100644
--- a/hphp/test/slow/comparisons/1045.php
+++ b/hphp/test/slow/comparisons/1045.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1046.php b/hphp/test/slow/comparisons/1046.php
index 0a2676d3f..5ecf2e983 100644
--- a/hphp/test/slow/comparisons/1046.php
+++ b/hphp/test/slow/comparisons/1046.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1047.php b/hphp/test/slow/comparisons/1047.php
index d33ec40dd..5772f0908 100644
--- a/hphp/test/slow/comparisons/1047.php
+++ b/hphp/test/slow/comparisons/1047.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1048.php b/hphp/test/slow/comparisons/1048.php
index bc0a4d759..621881f3e 100644
--- a/hphp/test/slow/comparisons/1048.php
+++ b/hphp/test/slow/comparisons/1048.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= true	"; print "\n"; print ++$i; print "\t"; print ('php'>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= false	"; print "\n"; print ++$i; print "\t"; print ('php'>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= 1	"; print "\n"; print ++$i; print "\t"; print ('php'>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= 0	"; print "\n"; print ++$i; print "\t"; print ('php'>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= -1	"; print "\n"; print ++$i; print "\t"; print ('php'>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= '1'	"; print "\n"; print ++$i; print "\t"; print ('php'>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= '0'	"; print "\n"; print ++$i; print "\t"; print ('php'>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array()	"; print "\n"; print ++$i; print "\t"; print ('php'>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'php' >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1049.php b/hphp/test/slow/comparisons/1049.php
index 6f37b7079..06dbacc3a 100644
--- a/hphp/test/slow/comparisons/1049.php
+++ b/hphp/test/slow/comparisons/1049.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''>=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= true	"; print "\n"; print ++$i; print "\t"; print (''>=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= false	"; print "\n"; print ++$i; print "\t"; print (''>=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= 1	"; print "\n"; print ++$i; print "\t"; print (''>=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= 0	"; print "\n"; print ++$i; print "\t"; print (''>=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= -1	"; print "\n"; print ++$i; print "\t"; print (''>='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= '1'	"; print "\n"; print ++$i; print "\t"; print (''>='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= '0'	"; print "\n"; print ++$i; print "\t"; print (''>='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= '-1'	"; print "\n"; print ++$i; print "\t"; print (''>=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= nullptr	"; print "\n"; print ++$i; print "\t"; print (''>=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array()	"; print "\n"; print ++$i; print "\t"; print (''>=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array(1)	"; print "\n"; print ++$i; print "\t"; print (''>=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array(2)	"; print "\n"; print ++$i; print "\t"; print (''>=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array('1')	"; print "\n"; print ++$i; print "\t"; print (''>=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''>=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array('a')	"; print "\n"; print ++$i; print "\t"; print (''>=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''>=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''>=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''>=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''>='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= 'php'	"; print "\n"; print ++$i; print "\t"; print (''>='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a >='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''>=$b) ? 'Y' : 'N'; print ($a >=$b) ? 'Y' : 'N'; print "\t"; print "'' >= ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''>=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''>='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a >='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''>=$b) ? 'Y' : 'N';
+ print ($a >=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' >= ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/1050.php b/hphp/test/slow/comparisons/1050.php
index 220185ebf..af69345b4 100644
--- a/hphp/test/slow/comparisons/1050.php
+++ b/hphp/test/slow/comparisons/1050.php
@@ -1,3 +1,10 @@
 <?php
 
- class c {  public $x = 0;}$x = new c;$x->x = 1;$y = new c;var_dump($x > $y);var_dump(array($x) == array($y));
\ No newline at end of file
+class c {
+  public $x = 0;
+}
+$x = new c;
+$x->x = 1;
+$y = new c;
+var_dump($x > $y);
+var_dump(array($x) == array($y));
diff --git a/hphp/test/slow/comparisons/1051.php b/hphp/test/slow/comparisons/1051.php
index b44c0d10d..42e835d69 100644
--- a/hphp/test/slow/comparisons/1051.php
+++ b/hphp/test/slow/comparisons/1051.php
@@ -1,3 +1,20 @@
 <?php
 
- function foo($p) {  if ($p) {    $a = 'foo';  }  if ('' < $a) {    echo 'yes';  } else {    echo 'no';  }  if ($a > '') {    echo 'yes';  } else {    echo 'no';  }}foo(false);
\ No newline at end of file
+function foo($p) {
+  if ($p) {
+    $a = 'foo';
+  }
+  if ('' < $a) {
+    echo 'yes';
+  }
+ else {
+    echo 'no';
+  }
+  if ($a > '') {
+    echo 'yes';
+  }
+ else {
+    echo 'no';
+  }
+}
+foo(false);
diff --git a/hphp/test/slow/comparisons/1052.php b/hphp/test/slow/comparisons/1052.php
index 64396e8d5..4f651b4b9 100644
--- a/hphp/test/slow/comparisons/1052.php
+++ b/hphp/test/slow/comparisons/1052.php
@@ -1,3 +1,4 @@
 <?php
 
- $part = ' 1';var_dump(trim($part) !== $part);
\ No newline at end of file
+$part = ' 1';
+var_dump(trim($part) !== $part);
diff --git a/hphp/test/slow/comparisons/1053.php b/hphp/test/slow/comparisons/1053.php
index 5f5d08634..cd4de0fa7 100644
--- a/hphp/test/slow/comparisons/1053.php
+++ b/hphp/test/slow/comparisons/1053.php
@@ -1,3 +1,14 @@
 <?php
 
- class C { }function foo($p) {  if ($p) {    $obj = new C;  } else {    $a = array(1);  }  var_dump($obj == $a);}foo(false);
\ No newline at end of file
+class C {
+ }
+function foo($p) {
+  if ($p) {
+    $obj = new C;
+  }
+ else {
+    $a = array(1);
+  }
+  var_dump($obj == $a);
+}
+foo(false);
diff --git a/hphp/test/slow/comparisons/1054.php b/hphp/test/slow/comparisons/1054.php
index 9e7dcc1a4..cb17862c1 100644
--- a/hphp/test/slow/comparisons/1054.php
+++ b/hphp/test/slow/comparisons/1054.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $x = (object)null;
 var_dump ($x == 1 && 1 == $x);
 var_dump ($x == 1.0 && 1.0 == $x);
diff --git a/hphp/test/slow/comparisons/1055.php b/hphp/test/slow/comparisons/1055.php
index 4bcabcdea..2b8d025ea 100644
--- a/hphp/test/slow/comparisons/1055.php
+++ b/hphp/test/slow/comparisons/1055.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array();
 $b = new stdClass();
 $b->foo = 2;
diff --git a/hphp/test/slow/comparisons/836.php b/hphp/test/slow/comparisons/836.php
index c1cb6af09..da8a4eb44 100644
--- a/hphp/test/slow/comparisons/836.php
+++ b/hphp/test/slow/comparisons/836.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array(1 => 1, 2 => 1) ==  array(2 => 1, 1 => 1));
\ No newline at end of file
+var_dump(array(1 => 1, 2 => 1) ==  array(2 => 1, 1 => 1));
diff --git a/hphp/test/slow/comparisons/837.php b/hphp/test/slow/comparisons/837.php
index d31ff6ebf..90a8579df 100644
--- a/hphp/test/slow/comparisons/837.php
+++ b/hphp/test/slow/comparisons/837.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array(1 => 1, 2 => 1) === array(2 => 1, 1 => 1));
\ No newline at end of file
+var_dump(array(1 => 1, 2 => 1) === array(2 => 1, 1 => 1));
diff --git a/hphp/test/slow/comparisons/838.php b/hphp/test/slow/comparisons/838.php
index 753f4231d..3d7d99ee2 100644
--- a/hphp/test/slow/comparisons/838.php
+++ b/hphp/test/slow/comparisons/838.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array('a'=>1,'b'=> 1) ==  array('b'=>1,'a'=> 1));
\ No newline at end of file
+var_dump(array('a'=>1,'b'=> 1) ==  array('b'=>1,'a'=> 1));
diff --git a/hphp/test/slow/comparisons/839.php b/hphp/test/slow/comparisons/839.php
index 44d56c18d..12fd8685a 100644
--- a/hphp/test/slow/comparisons/839.php
+++ b/hphp/test/slow/comparisons/839.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array('a'=>1,'b'=> 1) === array('b'=>1,'a'=> 1));
\ No newline at end of file
+var_dump(array('a'=>1,'b'=> 1) === array('b'=>1,'a'=> 1));
diff --git a/hphp/test/slow/comparisons/840.php b/hphp/test/slow/comparisons/840.php
index 94b8b9572..013a5893f 100644
--- a/hphp/test/slow/comparisons/840.php
+++ b/hphp/test/slow/comparisons/840.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = '05/17'; $b = '05/18'; var_dump($a == $b);
\ No newline at end of file
+$a = '05/17';
+ $b = '05/18';
+ var_dump($a == $b);
diff --git a/hphp/test/slow/comparisons/841.php b/hphp/test/slow/comparisons/841.php
index bc9513b18..e90d25976 100644
--- a/hphp/test/slow/comparisons/841.php
+++ b/hphp/test/slow/comparisons/841.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump('05/17' == '05/18');
\ No newline at end of file
+var_dump('05/17' == '05/18');
diff --git a/hphp/test/slow/comparisons/842.php b/hphp/test/slow/comparisons/842.php
index c7e52fbc8..9392d2cd0 100644
--- a/hphp/test/slow/comparisons/842.php
+++ b/hphp/test/slow/comparisons/842.php
@@ -1,3 +1,23 @@
 <?php
 
- var_dump('1.0' == '1');var_dump('1.0E2' == '10E1');var_dump('1' === '1');var_dump('1.0' === '1.0');var_dump('1' === '1.0');var_dump('1.0' === '1.00');var_dump(1.0 === 1.00);var_dump('1' == '1');var_dump('1.0' == '1.0');var_dump('1' == '1.0');var_dump('1.0' == '1.00');var_dump(1.0 == 1.00);function foo($a, $b) {  $s = (string)$a;  $t = (string)$b;  var_dump($s === $t);}foo('1.00', '1.0');foo('1.0', '1.0');foo('1.', '1.0');foo('1', '1.0');
\ No newline at end of file
+var_dump('1.0' == '1');
+var_dump('1.0E2' == '10E1');
+var_dump('1' === '1');
+var_dump('1.0' === '1.0');
+var_dump('1' === '1.0');
+var_dump('1.0' === '1.00');
+var_dump(1.0 === 1.00);
+var_dump('1' == '1');
+var_dump('1.0' == '1.0');
+var_dump('1' == '1.0');
+var_dump('1.0' == '1.00');
+var_dump(1.0 == 1.00);
+function foo($a, $b) {
+  $s = (string)$a;
+  $t = (string)$b;
+  var_dump($s === $t);
+}
+foo('1.00', '1.0');
+foo('1.0', '1.0');
+foo('1.', '1.0');
+foo('1', '1.0');
diff --git a/hphp/test/slow/comparisons/843.php b/hphp/test/slow/comparisons/843.php
index b540d3d14..efd6c94e0 100644
--- a/hphp/test/slow/comparisons/843.php
+++ b/hphp/test/slow/comparisons/843.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == true	"; print "\n"; print ++$i; print "\t"; print ('1.2'==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == false	"; print "\n"; print ++$i; print "\t"; print ('1.2'==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/844.php b/hphp/test/slow/comparisons/844.php
index 3ba8532ce..753ef2258 100644
--- a/hphp/test/slow/comparisons/844.php
+++ b/hphp/test/slow/comparisons/844.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == true	"; print "\n"; print ++$i; print "\t"; print (true==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == false	"; print "\n"; print ++$i; print "\t"; print (true==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == 1	"; print "\n"; print ++$i; print "\t"; print (true==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == 0	"; print "\n"; print ++$i; print "\t"; print (true==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == -1	"; print "\n"; print ++$i; print "\t"; print (true=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == '1'	"; print "\n"; print ++$i; print "\t"; print (true=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == '0'	"; print "\n"; print ++$i; print "\t"; print (true=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == '-1'	"; print "\n"; print ++$i; print "\t"; print (true==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == nullptr	"; print "\n"; print ++$i; print "\t"; print (true==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array()	"; print "\n"; print ++$i; print "\t"; print (true==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array(1)	"; print "\n"; print ++$i; print "\t"; print (true==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array(2)	"; print "\n"; print ++$i; print "\t"; print (true==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array('1')	"; print "\n"; print ++$i; print "\t"; print (true==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array('a')	"; print "\n"; print ++$i; print "\t"; print (true==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == 'php'	"; print "\n"; print ++$i; print "\t"; print (true=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "true == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/845.php b/hphp/test/slow/comparisons/845.php
index df2bd8412..d21905fdd 100644
--- a/hphp/test/slow/comparisons/845.php
+++ b/hphp/test/slow/comparisons/845.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == true	"; print "\n"; print ++$i; print "\t"; print (false==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == false	"; print "\n"; print ++$i; print "\t"; print (false==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == 1	"; print "\n"; print ++$i; print "\t"; print (false==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == 0	"; print "\n"; print ++$i; print "\t"; print (false==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == -1	"; print "\n"; print ++$i; print "\t"; print (false=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == '1'	"; print "\n"; print ++$i; print "\t"; print (false=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == '0'	"; print "\n"; print ++$i; print "\t"; print (false=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == '-1'	"; print "\n"; print ++$i; print "\t"; print (false==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == nullptr	"; print "\n"; print ++$i; print "\t"; print (false==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array()	"; print "\n"; print ++$i; print "\t"; print (false==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array(1)	"; print "\n"; print ++$i; print "\t"; print (false==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array(2)	"; print "\n"; print ++$i; print "\t"; print (false==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array('1')	"; print "\n"; print ++$i; print "\t"; print (false==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array('a')	"; print "\n"; print ++$i; print "\t"; print (false==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == 'php'	"; print "\n"; print ++$i; print "\t"; print (false=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "false == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/846.php b/hphp/test/slow/comparisons/846.php
index 746f18905..65d2245cc 100644
--- a/hphp/test/slow/comparisons/846.php
+++ b/hphp/test/slow/comparisons/846.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == true	"; print "\n"; print ++$i; print "\t"; print (1==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == false	"; print "\n"; print ++$i; print "\t"; print (1==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == 1	"; print "\n"; print ++$i; print "\t"; print (1==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == 0	"; print "\n"; print ++$i; print "\t"; print (1==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == -1	"; print "\n"; print ++$i; print "\t"; print (1=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == '1'	"; print "\n"; print ++$i; print "\t"; print (1=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == '0'	"; print "\n"; print ++$i; print "\t"; print (1=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == '-1'	"; print "\n"; print ++$i; print "\t"; print (1==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == nullptr	"; print "\n"; print ++$i; print "\t"; print (1==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array()	"; print "\n"; print ++$i; print "\t"; print (1==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array(1)	"; print "\n"; print ++$i; print "\t"; print (1==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array(2)	"; print "\n"; print ++$i; print "\t"; print (1==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array('1')	"; print "\n"; print ++$i; print "\t"; print (1==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array('a')	"; print "\n"; print ++$i; print "\t"; print (1==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == 'php'	"; print "\n"; print ++$i; print "\t"; print (1=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "1 == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/847.php b/hphp/test/slow/comparisons/847.php
index 39c997768..a0dbb0baf 100644
--- a/hphp/test/slow/comparisons/847.php
+++ b/hphp/test/slow/comparisons/847.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == true	"; print "\n"; print ++$i; print "\t"; print (0==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == false	"; print "\n"; print ++$i; print "\t"; print (0==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == 1	"; print "\n"; print ++$i; print "\t"; print (0==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == 0	"; print "\n"; print ++$i; print "\t"; print (0==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == -1	"; print "\n"; print ++$i; print "\t"; print (0=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == '1'	"; print "\n"; print ++$i; print "\t"; print (0=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == '0'	"; print "\n"; print ++$i; print "\t"; print (0=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == '-1'	"; print "\n"; print ++$i; print "\t"; print (0==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == nullptr	"; print "\n"; print ++$i; print "\t"; print (0==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array()	"; print "\n"; print ++$i; print "\t"; print (0==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array(1)	"; print "\n"; print ++$i; print "\t"; print (0==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array(2)	"; print "\n"; print ++$i; print "\t"; print (0==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array('1')	"; print "\n"; print ++$i; print "\t"; print (0==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array('a')	"; print "\n"; print ++$i; print "\t"; print (0==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == 'php'	"; print "\n"; print ++$i; print "\t"; print (0=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "0 == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/848.php b/hphp/test/slow/comparisons/848.php
index eab40337e..d080da8fc 100644
--- a/hphp/test/slow/comparisons/848.php
+++ b/hphp/test/slow/comparisons/848.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == true	"; print "\n"; print ++$i; print "\t"; print (-1==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == false	"; print "\n"; print ++$i; print "\t"; print (-1==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == 1	"; print "\n"; print ++$i; print "\t"; print (-1==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == 0	"; print "\n"; print ++$i; print "\t"; print (-1==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == -1	"; print "\n"; print ++$i; print "\t"; print (-1=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == '1'	"; print "\n"; print ++$i; print "\t"; print (-1=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == '0'	"; print "\n"; print ++$i; print "\t"; print (-1=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == '-1'	"; print "\n"; print ++$i; print "\t"; print (-1==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == nullptr	"; print "\n"; print ++$i; print "\t"; print (-1==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array()	"; print "\n"; print ++$i; print "\t"; print (-1==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array(1)	"; print "\n"; print ++$i; print "\t"; print (-1==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array(2)	"; print "\n"; print ++$i; print "\t"; print (-1==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array('1')	"; print "\n"; print ++$i; print "\t"; print (-1==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array('a')	"; print "\n"; print ++$i; print "\t"; print (-1==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == 'php'	"; print "\n"; print ++$i; print "\t"; print (-1=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "-1 == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/849.php b/hphp/test/slow/comparisons/849.php
index a02898450..d9828b86d 100644
--- a/hphp/test/slow/comparisons/849.php
+++ b/hphp/test/slow/comparisons/849.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == true	"; print "\n"; print ++$i; print "\t"; print ('1'==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == false	"; print "\n"; print ++$i; print "\t"; print ('1'==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == 1	"; print "\n"; print ++$i; print "\t"; print ('1'==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == 0	"; print "\n"; print ++$i; print "\t"; print ('1'==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == -1	"; print "\n"; print ++$i; print "\t"; print ('1'=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == '1'	"; print "\n"; print ++$i; print "\t"; print ('1'=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == '0'	"; print "\n"; print ++$i; print "\t"; print ('1'=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array()	"; print "\n"; print ++$i; print "\t"; print ('1'==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'1' == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/850.php b/hphp/test/slow/comparisons/850.php
index cce743f2a..66ff3fd3b 100644
--- a/hphp/test/slow/comparisons/850.php
+++ b/hphp/test/slow/comparisons/850.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == true	"; print "\n"; print ++$i; print "\t"; print ('0'==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == false	"; print "\n"; print ++$i; print "\t"; print ('0'==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == 1	"; print "\n"; print ++$i; print "\t"; print ('0'==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == 0	"; print "\n"; print ++$i; print "\t"; print ('0'==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == -1	"; print "\n"; print ++$i; print "\t"; print ('0'=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == '1'	"; print "\n"; print ++$i; print "\t"; print ('0'=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == '0'	"; print "\n"; print ++$i; print "\t"; print ('0'=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array()	"; print "\n"; print ++$i; print "\t"; print ('0'==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'0' == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/851.php b/hphp/test/slow/comparisons/851.php
index a4479014a..2520ab3ac 100644
--- a/hphp/test/slow/comparisons/851.php
+++ b/hphp/test/slow/comparisons/851.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == true	"; print "\n"; print ++$i; print "\t"; print ('-1'==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == false	"; print "\n"; print ++$i; print "\t"; print ('-1'==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == 1	"; print "\n"; print ++$i; print "\t"; print ('-1'==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == 0	"; print "\n"; print ++$i; print "\t"; print ('-1'==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == -1	"; print "\n"; print ++$i; print "\t"; print ('-1'=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array()	"; print "\n"; print ++$i; print "\t"; print ('-1'==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'-1' == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/852.php b/hphp/test/slow/comparisons/852.php
index 447877cd8..cc0476eaf 100644
--- a/hphp/test/slow/comparisons/852.php
+++ b/hphp/test/slow/comparisons/852.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == true	"; print "\n"; print ++$i; print "\t"; print (nullptr==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == false	"; print "\n"; print ++$i; print "\t"; print (nullptr==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == 1	"; print "\n"; print ++$i; print "\t"; print (nullptr==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == 0	"; print "\n"; print ++$i; print "\t"; print (nullptr==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == -1	"; print "\n"; print ++$i; print "\t"; print (nullptr=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array()	"; print "\n"; print ++$i; print "\t"; print (nullptr==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "nullptr == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/853.php b/hphp/test/slow/comparisons/853.php
index 5870fa75c..e04eb0966 100644
--- a/hphp/test/slow/comparisons/853.php
+++ b/hphp/test/slow/comparisons/853.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == true	"; print "\n"; print ++$i; print "\t"; print (array()==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == false	"; print "\n"; print ++$i; print "\t"; print (array()==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == 1	"; print "\n"; print ++$i; print "\t"; print (array()==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == 0	"; print "\n"; print ++$i; print "\t"; print (array()==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == -1	"; print "\n"; print ++$i; print "\t"; print (array()=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == '1'	"; print "\n"; print ++$i; print "\t"; print (array()=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == '0'	"; print "\n"; print ++$i; print "\t"; print (array()=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == '-1'	"; print "\n"; print ++$i; print "\t"; print (array()==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == nullptr	"; print "\n"; print ++$i; print "\t"; print (array()==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array()	"; print "\n"; print ++$i; print "\t"; print (array()==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array(1)	"; print "\n"; print ++$i; print "\t"; print (array()==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array(2)	"; print "\n"; print ++$i; print "\t"; print (array()==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array('1')	"; print "\n"; print ++$i; print "\t"; print (array()==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array('a')	"; print "\n"; print ++$i; print "\t"; print (array()==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == 'php'	"; print "\n"; print ++$i; print "\t"; print (array()=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array() == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/854.php b/hphp/test/slow/comparisons/854.php
index ec2747a16..2e664061c 100644
--- a/hphp/test/slow/comparisons/854.php
+++ b/hphp/test/slow/comparisons/854.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == true	"; print "\n"; print ++$i; print "\t"; print (array(1)==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == false	"; print "\n"; print ++$i; print "\t"; print (array(1)==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == 1	"; print "\n"; print ++$i; print "\t"; print (array(1)==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == 0	"; print "\n"; print ++$i; print "\t"; print (array(1)==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == -1	"; print "\n"; print ++$i; print "\t"; print (array(1)=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array()	"; print "\n"; print ++$i; print "\t"; print (array(1)==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(1) == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/855.php b/hphp/test/slow/comparisons/855.php
index 945c5245c..325b80d2d 100644
--- a/hphp/test/slow/comparisons/855.php
+++ b/hphp/test/slow/comparisons/855.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == true	"; print "\n"; print ++$i; print "\t"; print (array(2)==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == false	"; print "\n"; print ++$i; print "\t"; print (array(2)==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == 1	"; print "\n"; print ++$i; print "\t"; print (array(2)==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == 0	"; print "\n"; print ++$i; print "\t"; print (array(2)==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == -1	"; print "\n"; print ++$i; print "\t"; print (array(2)=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array()	"; print "\n"; print ++$i; print "\t"; print (array(2)==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(2) == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/856.php b/hphp/test/slow/comparisons/856.php
index 71c17a884..f00ba97f6 100644
--- a/hphp/test/slow/comparisons/856.php
+++ b/hphp/test/slow/comparisons/856.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == true	"; print "\n"; print ++$i; print "\t"; print (array('1')==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == false	"; print "\n"; print ++$i; print "\t"; print (array('1')==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == 1	"; print "\n"; print ++$i; print "\t"; print (array('1')==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == 0	"; print "\n"; print ++$i; print "\t"; print (array('1')==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == -1	"; print "\n"; print ++$i; print "\t"; print (array('1')=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array()	"; print "\n"; print ++$i; print "\t"; print (array('1')==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('1') == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/857.php b/hphp/test/slow/comparisons/857.php
index 1afe9a583..2ad214369 100644
--- a/hphp/test/slow/comparisons/857.php
+++ b/hphp/test/slow/comparisons/857.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/858.php b/hphp/test/slow/comparisons/858.php
index 5020d5d89..ed45803ff 100644
--- a/hphp/test/slow/comparisons/858.php
+++ b/hphp/test/slow/comparisons/858.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == true	"; print "\n"; print ++$i; print "\t"; print (array('a')==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == false	"; print "\n"; print ++$i; print "\t"; print (array('a')==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == 1	"; print "\n"; print ++$i; print "\t"; print (array('a')==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == 0	"; print "\n"; print ++$i; print "\t"; print (array('a')==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == -1	"; print "\n"; print ++$i; print "\t"; print (array('a')=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array()	"; print "\n"; print ++$i; print "\t"; print (array('a')==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a') == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/859.php b/hphp/test/slow/comparisons/859.php
index 8bedd8466..08e56ea32 100644
--- a/hphp/test/slow/comparisons/859.php
+++ b/hphp/test/slow/comparisons/859.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/860.php b/hphp/test/slow/comparisons/860.php
index 096bcd1b5..b3ddd3d7e 100644
--- a/hphp/test/slow/comparisons/860.php
+++ b/hphp/test/slow/comparisons/860.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/861.php b/hphp/test/slow/comparisons/861.php
index a3aa62922..5ec47ecde 100644
--- a/hphp/test/slow/comparisons/861.php
+++ b/hphp/test/slow/comparisons/861.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/862.php b/hphp/test/slow/comparisons/862.php
index 8d49f45a6..c30ea70db 100644
--- a/hphp/test/slow/comparisons/862.php
+++ b/hphp/test/slow/comparisons/862.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/863.php b/hphp/test/slow/comparisons/863.php
index 365a288af..f9a4a6ba0 100644
--- a/hphp/test/slow/comparisons/863.php
+++ b/hphp/test/slow/comparisons/863.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/864.php b/hphp/test/slow/comparisons/864.php
index d9b9d6058..e7aa300f1 100644
--- a/hphp/test/slow/comparisons/864.php
+++ b/hphp/test/slow/comparisons/864.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == true	"; print "\n"; print ++$i; print "\t"; print ('php'==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == false	"; print "\n"; print ++$i; print "\t"; print ('php'==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == 1	"; print "\n"; print ++$i; print "\t"; print ('php'==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == 0	"; print "\n"; print ++$i; print "\t"; print ('php'==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == -1	"; print "\n"; print ++$i; print "\t"; print ('php'=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == '1'	"; print "\n"; print ++$i; print "\t"; print ('php'=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == '0'	"; print "\n"; print ++$i; print "\t"; print ('php'=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array()	"; print "\n"; print ++$i; print "\t"; print ('php'==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'php' == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/865.php b/hphp/test/slow/comparisons/865.php
index 3403d23d3..b2a9b08cf 100644
--- a/hphp/test/slow/comparisons/865.php
+++ b/hphp/test/slow/comparisons/865.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == true	"; print "\n"; print ++$i; print "\t"; print (''==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == false	"; print "\n"; print ++$i; print "\t"; print (''==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == 1	"; print "\n"; print ++$i; print "\t"; print (''==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == 0	"; print "\n"; print ++$i; print "\t"; print (''==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == -1	"; print "\n"; print ++$i; print "\t"; print (''=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a =='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == '1'	"; print "\n"; print ++$i; print "\t"; print (''=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a =='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == '0'	"; print "\n"; print ++$i; print "\t"; print (''=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a =='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == '-1'	"; print "\n"; print ++$i; print "\t"; print (''==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == nullptr	"; print "\n"; print ++$i; print "\t"; print (''==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array()	"; print "\n"; print ++$i; print "\t"; print (''==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array(1)	"; print "\n"; print ++$i; print "\t"; print (''==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array(2)	"; print "\n"; print ++$i; print "\t"; print (''==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array('1')	"; print "\n"; print ++$i; print "\t"; print (''==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array('a')	"; print "\n"; print ++$i; print "\t"; print (''==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a =='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == 'php'	"; print "\n"; print ++$i; print "\t"; print (''=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a =='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''==$b) ? 'Y' : 'N'; print ($a ==$b) ? 'Y' : 'N'; print "\t"; print "'' == ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a =='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a =='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a =='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a =='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a =='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''==$b) ? 'Y' : 'N';
+ print ($a ==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' == ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/866.php b/hphp/test/slow/comparisons/866.php
index b1839d868..8a6eda7ea 100644
--- a/hphp/test/slow/comparisons/866.php
+++ b/hphp/test/slow/comparisons/866.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === true	"; print "\n"; print ++$i; print "\t"; print ('1.2'===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === false	"; print "\n"; print ++$i; print "\t"; print ('1.2'===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1.2' === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/867.php b/hphp/test/slow/comparisons/867.php
index b5d84793a..7ee20ac2a 100644
--- a/hphp/test/slow/comparisons/867.php
+++ b/hphp/test/slow/comparisons/867.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === true	"; print "\n"; print ++$i; print "\t"; print (true===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === false	"; print "\n"; print ++$i; print "\t"; print (true===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === 1	"; print "\n"; print ++$i; print "\t"; print (true===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === 0	"; print "\n"; print ++$i; print "\t"; print (true===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === -1	"; print "\n"; print ++$i; print "\t"; print (true==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === '1'	"; print "\n"; print ++$i; print "\t"; print (true==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === '0'	"; print "\n"; print ++$i; print "\t"; print (true==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === '-1'	"; print "\n"; print ++$i; print "\t"; print (true===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === nullptr	"; print "\n"; print ++$i; print "\t"; print (true===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array()	"; print "\n"; print ++$i; print "\t"; print (true===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array(1)	"; print "\n"; print ++$i; print "\t"; print (true===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array(2)	"; print "\n"; print ++$i; print "\t"; print (true===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array('1')	"; print "\n"; print ++$i; print "\t"; print (true===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array('a')	"; print "\n"; print ++$i; print "\t"; print (true===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === 'php'	"; print "\n"; print ++$i; print "\t"; print (true==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "true === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "true === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/868.php b/hphp/test/slow/comparisons/868.php
index f0afbc2dc..96db0366b 100644
--- a/hphp/test/slow/comparisons/868.php
+++ b/hphp/test/slow/comparisons/868.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === true	"; print "\n"; print ++$i; print "\t"; print (false===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === false	"; print "\n"; print ++$i; print "\t"; print (false===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === 1	"; print "\n"; print ++$i; print "\t"; print (false===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === 0	"; print "\n"; print ++$i; print "\t"; print (false===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === -1	"; print "\n"; print ++$i; print "\t"; print (false==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === '1'	"; print "\n"; print ++$i; print "\t"; print (false==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === '0'	"; print "\n"; print ++$i; print "\t"; print (false==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === '-1'	"; print "\n"; print ++$i; print "\t"; print (false===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === nullptr	"; print "\n"; print ++$i; print "\t"; print (false===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array()	"; print "\n"; print ++$i; print "\t"; print (false===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array(1)	"; print "\n"; print ++$i; print "\t"; print (false===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array(2)	"; print "\n"; print ++$i; print "\t"; print (false===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array('1')	"; print "\n"; print ++$i; print "\t"; print (false===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array('a')	"; print "\n"; print ++$i; print "\t"; print (false===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === 'php'	"; print "\n"; print ++$i; print "\t"; print (false==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "false === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "false === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/869.php b/hphp/test/slow/comparisons/869.php
index 0e5baaed3..1b125c02d 100644
--- a/hphp/test/slow/comparisons/869.php
+++ b/hphp/test/slow/comparisons/869.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === true	"; print "\n"; print ++$i; print "\t"; print (1===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === false	"; print "\n"; print ++$i; print "\t"; print (1===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === 1	"; print "\n"; print ++$i; print "\t"; print (1===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === 0	"; print "\n"; print ++$i; print "\t"; print (1===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === -1	"; print "\n"; print ++$i; print "\t"; print (1==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === '1'	"; print "\n"; print ++$i; print "\t"; print (1==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === '0'	"; print "\n"; print ++$i; print "\t"; print (1==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === '-1'	"; print "\n"; print ++$i; print "\t"; print (1===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === nullptr	"; print "\n"; print ++$i; print "\t"; print (1===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array()	"; print "\n"; print ++$i; print "\t"; print (1===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array(1)	"; print "\n"; print ++$i; print "\t"; print (1===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array(2)	"; print "\n"; print ++$i; print "\t"; print (1===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array('1')	"; print "\n"; print ++$i; print "\t"; print (1===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array('a')	"; print "\n"; print ++$i; print "\t"; print (1===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === 'php'	"; print "\n"; print ++$i; print "\t"; print (1==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "1 === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/870.php b/hphp/test/slow/comparisons/870.php
index 60e1248ef..1caef1d69 100644
--- a/hphp/test/slow/comparisons/870.php
+++ b/hphp/test/slow/comparisons/870.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === true	"; print "\n"; print ++$i; print "\t"; print (0===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === false	"; print "\n"; print ++$i; print "\t"; print (0===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === 1	"; print "\n"; print ++$i; print "\t"; print (0===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === 0	"; print "\n"; print ++$i; print "\t"; print (0===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === -1	"; print "\n"; print ++$i; print "\t"; print (0==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === '1'	"; print "\n"; print ++$i; print "\t"; print (0==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === '0'	"; print "\n"; print ++$i; print "\t"; print (0==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === '-1'	"; print "\n"; print ++$i; print "\t"; print (0===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === nullptr	"; print "\n"; print ++$i; print "\t"; print (0===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array()	"; print "\n"; print ++$i; print "\t"; print (0===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array(1)	"; print "\n"; print ++$i; print "\t"; print (0===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array(2)	"; print "\n"; print ++$i; print "\t"; print (0===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array('1')	"; print "\n"; print ++$i; print "\t"; print (0===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array('a')	"; print "\n"; print ++$i; print "\t"; print (0===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === 'php'	"; print "\n"; print ++$i; print "\t"; print (0==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "0 === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/871.php b/hphp/test/slow/comparisons/871.php
index 0083a498c..224627e77 100644
--- a/hphp/test/slow/comparisons/871.php
+++ b/hphp/test/slow/comparisons/871.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === true	"; print "\n"; print ++$i; print "\t"; print (-1===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === false	"; print "\n"; print ++$i; print "\t"; print (-1===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === 1	"; print "\n"; print ++$i; print "\t"; print (-1===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === 0	"; print "\n"; print ++$i; print "\t"; print (-1===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === -1	"; print "\n"; print ++$i; print "\t"; print (-1==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === '1'	"; print "\n"; print ++$i; print "\t"; print (-1==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === '0'	"; print "\n"; print ++$i; print "\t"; print (-1==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === '-1'	"; print "\n"; print ++$i; print "\t"; print (-1===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === nullptr	"; print "\n"; print ++$i; print "\t"; print (-1===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array()	"; print "\n"; print ++$i; print "\t"; print (-1===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array(1)	"; print "\n"; print ++$i; print "\t"; print (-1===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array(2)	"; print "\n"; print ++$i; print "\t"; print (-1===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array('1')	"; print "\n"; print ++$i; print "\t"; print (-1===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array('a')	"; print "\n"; print ++$i; print "\t"; print (-1===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === 'php'	"; print "\n"; print ++$i; print "\t"; print (-1==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "-1 === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/872.php b/hphp/test/slow/comparisons/872.php
index ecc7b0212..7db58d871 100644
--- a/hphp/test/slow/comparisons/872.php
+++ b/hphp/test/slow/comparisons/872.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === true	"; print "\n"; print ++$i; print "\t"; print ('1'===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === false	"; print "\n"; print ++$i; print "\t"; print ('1'===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === 1	"; print "\n"; print ++$i; print "\t"; print ('1'===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === 0	"; print "\n"; print ++$i; print "\t"; print ('1'===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === -1	"; print "\n"; print ++$i; print "\t"; print ('1'==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === '1'	"; print "\n"; print ++$i; print "\t"; print ('1'==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === '0'	"; print "\n"; print ++$i; print "\t"; print ('1'==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array()	"; print "\n"; print ++$i; print "\t"; print ('1'===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'1' === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/873.php b/hphp/test/slow/comparisons/873.php
index c06aaca0e..040fa060f 100644
--- a/hphp/test/slow/comparisons/873.php
+++ b/hphp/test/slow/comparisons/873.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === true	"; print "\n"; print ++$i; print "\t"; print ('0'===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === false	"; print "\n"; print ++$i; print "\t"; print ('0'===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === 1	"; print "\n"; print ++$i; print "\t"; print ('0'===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === 0	"; print "\n"; print ++$i; print "\t"; print ('0'===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === -1	"; print "\n"; print ++$i; print "\t"; print ('0'==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === '1'	"; print "\n"; print ++$i; print "\t"; print ('0'==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === '0'	"; print "\n"; print ++$i; print "\t"; print ('0'==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array()	"; print "\n"; print ++$i; print "\t"; print ('0'===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'0' === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/874.php b/hphp/test/slow/comparisons/874.php
index 63348a710..05bd69423 100644
--- a/hphp/test/slow/comparisons/874.php
+++ b/hphp/test/slow/comparisons/874.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === true	"; print "\n"; print ++$i; print "\t"; print ('-1'===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === false	"; print "\n"; print ++$i; print "\t"; print ('-1'===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === 1	"; print "\n"; print ++$i; print "\t"; print ('-1'===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === 0	"; print "\n"; print ++$i; print "\t"; print ('-1'===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === -1	"; print "\n"; print ++$i; print "\t"; print ('-1'==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array()	"; print "\n"; print ++$i; print "\t"; print ('-1'===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'-1' === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/875.php b/hphp/test/slow/comparisons/875.php
index ec58a4a17..5f806defe 100644
--- a/hphp/test/slow/comparisons/875.php
+++ b/hphp/test/slow/comparisons/875.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === true	"; print "\n"; print ++$i; print "\t"; print (nullptr===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === false	"; print "\n"; print ++$i; print "\t"; print (nullptr===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === 1	"; print "\n"; print ++$i; print "\t"; print (nullptr===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === 0	"; print "\n"; print ++$i; print "\t"; print (nullptr===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === -1	"; print "\n"; print ++$i; print "\t"; print (nullptr==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array()	"; print "\n"; print ++$i; print "\t"; print (nullptr===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "nullptr === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/876.php b/hphp/test/slow/comparisons/876.php
index 6609be30f..1b75b4e26 100644
--- a/hphp/test/slow/comparisons/876.php
+++ b/hphp/test/slow/comparisons/876.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === true	"; print "\n"; print ++$i; print "\t"; print (array()===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === false	"; print "\n"; print ++$i; print "\t"; print (array()===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === 1	"; print "\n"; print ++$i; print "\t"; print (array()===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === 0	"; print "\n"; print ++$i; print "\t"; print (array()===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === -1	"; print "\n"; print ++$i; print "\t"; print (array()==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === '1'	"; print "\n"; print ++$i; print "\t"; print (array()==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === '0'	"; print "\n"; print ++$i; print "\t"; print (array()==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === '-1'	"; print "\n"; print ++$i; print "\t"; print (array()===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === nullptr	"; print "\n"; print ++$i; print "\t"; print (array()===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array()	"; print "\n"; print ++$i; print "\t"; print (array()===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array(1)	"; print "\n"; print ++$i; print "\t"; print (array()===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array(2)	"; print "\n"; print ++$i; print "\t"; print (array()===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array('1')	"; print "\n"; print ++$i; print "\t"; print (array()===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array('a')	"; print "\n"; print ++$i; print "\t"; print (array()===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === 'php'	"; print "\n"; print ++$i; print "\t"; print (array()==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array() === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/877.php b/hphp/test/slow/comparisons/877.php
index 7cc84594f..f2ad27d24 100644
--- a/hphp/test/slow/comparisons/877.php
+++ b/hphp/test/slow/comparisons/877.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === true	"; print "\n"; print ++$i; print "\t"; print (array(1)===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === false	"; print "\n"; print ++$i; print "\t"; print (array(1)===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === 1	"; print "\n"; print ++$i; print "\t"; print (array(1)===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === 0	"; print "\n"; print ++$i; print "\t"; print (array(1)===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === -1	"; print "\n"; print ++$i; print "\t"; print (array(1)==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array()	"; print "\n"; print ++$i; print "\t"; print (array(1)===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(1) === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/878.php b/hphp/test/slow/comparisons/878.php
index 61bda9598..3b128998d 100644
--- a/hphp/test/slow/comparisons/878.php
+++ b/hphp/test/slow/comparisons/878.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === true	"; print "\n"; print ++$i; print "\t"; print (array(2)===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === false	"; print "\n"; print ++$i; print "\t"; print (array(2)===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === 1	"; print "\n"; print ++$i; print "\t"; print (array(2)===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === 0	"; print "\n"; print ++$i; print "\t"; print (array(2)===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === -1	"; print "\n"; print ++$i; print "\t"; print (array(2)==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array()	"; print "\n"; print ++$i; print "\t"; print (array(2)===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(2) === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/879.php b/hphp/test/slow/comparisons/879.php
index 96e8c5ca2..11a878813 100644
--- a/hphp/test/slow/comparisons/879.php
+++ b/hphp/test/slow/comparisons/879.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === true	"; print "\n"; print ++$i; print "\t"; print (array('1')===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === false	"; print "\n"; print ++$i; print "\t"; print (array('1')===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === 1	"; print "\n"; print ++$i; print "\t"; print (array('1')===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === 0	"; print "\n"; print ++$i; print "\t"; print (array('1')===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === -1	"; print "\n"; print ++$i; print "\t"; print (array('1')==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array()	"; print "\n"; print ++$i; print "\t"; print (array('1')===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('1') === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/880.php b/hphp/test/slow/comparisons/880.php
index 049ce30f9..f9c259862 100644
--- a/hphp/test/slow/comparisons/880.php
+++ b/hphp/test/slow/comparisons/880.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/881.php b/hphp/test/slow/comparisons/881.php
index 9d70874ac..72cf5fa89 100644
--- a/hphp/test/slow/comparisons/881.php
+++ b/hphp/test/slow/comparisons/881.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === true	"; print "\n"; print ++$i; print "\t"; print (array('a')===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === false	"; print "\n"; print ++$i; print "\t"; print (array('a')===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === 1	"; print "\n"; print ++$i; print "\t"; print (array('a')===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === 0	"; print "\n"; print ++$i; print "\t"; print (array('a')===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === -1	"; print "\n"; print ++$i; print "\t"; print (array('a')==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array()	"; print "\n"; print ++$i; print "\t"; print (array('a')===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a') === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/882.php b/hphp/test/slow/comparisons/882.php
index 0df538e4e..6c9167976 100644
--- a/hphp/test/slow/comparisons/882.php
+++ b/hphp/test/slow/comparisons/882.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/883.php b/hphp/test/slow/comparisons/883.php
index c8f60f417..1a4048f8d 100644
--- a/hphp/test/slow/comparisons/883.php
+++ b/hphp/test/slow/comparisons/883.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/884.php b/hphp/test/slow/comparisons/884.php
index 5346af3d5..1e0cf06a2 100644
--- a/hphp/test/slow/comparisons/884.php
+++ b/hphp/test/slow/comparisons/884.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/885.php b/hphp/test/slow/comparisons/885.php
index c54ac7007..de87b17e3 100644
--- a/hphp/test/slow/comparisons/885.php
+++ b/hphp/test/slow/comparisons/885.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/886.php b/hphp/test/slow/comparisons/886.php
index 9d73b5926..0c41438be 100644
--- a/hphp/test/slow/comparisons/886.php
+++ b/hphp/test/slow/comparisons/886.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/887.php b/hphp/test/slow/comparisons/887.php
index 59186ef61..5f11fbbb1 100644
--- a/hphp/test/slow/comparisons/887.php
+++ b/hphp/test/slow/comparisons/887.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === true	"; print "\n"; print ++$i; print "\t"; print ('php'===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === false	"; print "\n"; print ++$i; print "\t"; print ('php'===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === 1	"; print "\n"; print ++$i; print "\t"; print ('php'===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === 0	"; print "\n"; print ++$i; print "\t"; print ('php'===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === -1	"; print "\n"; print ++$i; print "\t"; print ('php'==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === '1'	"; print "\n"; print ++$i; print "\t"; print ('php'==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === '0'	"; print "\n"; print ++$i; print "\t"; print ('php'==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array()	"; print "\n"; print ++$i; print "\t"; print ('php'===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'php' === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/888.php b/hphp/test/slow/comparisons/888.php
index 7a722a977..481029c48 100644
--- a/hphp/test/slow/comparisons/888.php
+++ b/hphp/test/slow/comparisons/888.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''===true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === true	"; print "\n"; print ++$i; print "\t"; print (''===false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === false	"; print "\n"; print ++$i; print "\t"; print (''===1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === 1	"; print "\n"; print ++$i; print "\t"; print (''===0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === 0	"; print "\n"; print ++$i; print "\t"; print (''===-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === -1	"; print "\n"; print ++$i; print "\t"; print (''==='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === '1'	"; print "\n"; print ++$i; print "\t"; print (''==='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === '0'	"; print "\n"; print ++$i; print "\t"; print (''==='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === '-1'	"; print "\n"; print ++$i; print "\t"; print (''===nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === nullptr	"; print "\n"; print ++$i; print "\t"; print (''===array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array()	"; print "\n"; print ++$i; print "\t"; print (''===array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array(1)	"; print "\n"; print ++$i; print "\t"; print (''===array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array(2)	"; print "\n"; print ++$i; print "\t"; print (''===array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array('1')	"; print "\n"; print ++$i; print "\t"; print (''===array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''===array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array('a')	"; print "\n"; print ++$i; print "\t"; print (''===array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''===array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''===array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''===array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ===array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''==='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === 'php'	"; print "\n"; print ++$i; print "\t"; print (''==='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a ==='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''===$b) ? 'Y' : 'N'; print ($a ===$b) ? 'Y' : 'N'; print "\t"; print "'' === ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''===true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''===array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ===array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''==='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a ==='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''===$b) ? 'Y' : 'N';
+ print ($a ===$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' === ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/889.php b/hphp/test/slow/comparisons/889.php
index 0a0d235bd..102bf5a0b 100644
--- a/hphp/test/slow/comparisons/889.php
+++ b/hphp/test/slow/comparisons/889.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != true	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != false	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1.2' != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/890.php b/hphp/test/slow/comparisons/890.php
index c3f7e33bb..fb93fc25a 100644
--- a/hphp/test/slow/comparisons/890.php
+++ b/hphp/test/slow/comparisons/890.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != true	"; print "\n"; print ++$i; print "\t"; print (true!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != false	"; print "\n"; print ++$i; print "\t"; print (true!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != 1	"; print "\n"; print ++$i; print "\t"; print (true!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != 0	"; print "\n"; print ++$i; print "\t"; print (true!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != -1	"; print "\n"; print ++$i; print "\t"; print (true!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != '1'	"; print "\n"; print ++$i; print "\t"; print (true!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != '0'	"; print "\n"; print ++$i; print "\t"; print (true!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != '-1'	"; print "\n"; print ++$i; print "\t"; print (true!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != nullptr	"; print "\n"; print ++$i; print "\t"; print (true!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array()	"; print "\n"; print ++$i; print "\t"; print (true!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array(1)	"; print "\n"; print ++$i; print "\t"; print (true!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array(2)	"; print "\n"; print ++$i; print "\t"; print (true!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array('1')	"; print "\n"; print ++$i; print "\t"; print (true!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array('a')	"; print "\n"; print ++$i; print "\t"; print (true!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != 'php'	"; print "\n"; print ++$i; print "\t"; print (true!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "true != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "true != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/891.php b/hphp/test/slow/comparisons/891.php
index 209f4f6e5..3d468e283 100644
--- a/hphp/test/slow/comparisons/891.php
+++ b/hphp/test/slow/comparisons/891.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != true	"; print "\n"; print ++$i; print "\t"; print (false!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != false	"; print "\n"; print ++$i; print "\t"; print (false!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != 1	"; print "\n"; print ++$i; print "\t"; print (false!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != 0	"; print "\n"; print ++$i; print "\t"; print (false!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != -1	"; print "\n"; print ++$i; print "\t"; print (false!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != '1'	"; print "\n"; print ++$i; print "\t"; print (false!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != '0'	"; print "\n"; print ++$i; print "\t"; print (false!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != '-1'	"; print "\n"; print ++$i; print "\t"; print (false!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != nullptr	"; print "\n"; print ++$i; print "\t"; print (false!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array()	"; print "\n"; print ++$i; print "\t"; print (false!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array(1)	"; print "\n"; print ++$i; print "\t"; print (false!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array(2)	"; print "\n"; print ++$i; print "\t"; print (false!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array('1')	"; print "\n"; print ++$i; print "\t"; print (false!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array('a')	"; print "\n"; print ++$i; print "\t"; print (false!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != 'php'	"; print "\n"; print ++$i; print "\t"; print (false!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "false != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "false != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/892.php b/hphp/test/slow/comparisons/892.php
index b0135dde5..5868442a0 100644
--- a/hphp/test/slow/comparisons/892.php
+++ b/hphp/test/slow/comparisons/892.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != true	"; print "\n"; print ++$i; print "\t"; print (1!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != false	"; print "\n"; print ++$i; print "\t"; print (1!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != 1	"; print "\n"; print ++$i; print "\t"; print (1!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != 0	"; print "\n"; print ++$i; print "\t"; print (1!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != -1	"; print "\n"; print ++$i; print "\t"; print (1!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != '1'	"; print "\n"; print ++$i; print "\t"; print (1!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != '0'	"; print "\n"; print ++$i; print "\t"; print (1!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != '-1'	"; print "\n"; print ++$i; print "\t"; print (1!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != nullptr	"; print "\n"; print ++$i; print "\t"; print (1!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array()	"; print "\n"; print ++$i; print "\t"; print (1!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array(1)	"; print "\n"; print ++$i; print "\t"; print (1!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array(2)	"; print "\n"; print ++$i; print "\t"; print (1!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array('1')	"; print "\n"; print ++$i; print "\t"; print (1!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array('a')	"; print "\n"; print ++$i; print "\t"; print (1!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != 'php'	"; print "\n"; print ++$i; print "\t"; print (1!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "1 != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/893.php b/hphp/test/slow/comparisons/893.php
index 432ca6ba1..be4c0f5e7 100644
--- a/hphp/test/slow/comparisons/893.php
+++ b/hphp/test/slow/comparisons/893.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != true	"; print "\n"; print ++$i; print "\t"; print (0!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != false	"; print "\n"; print ++$i; print "\t"; print (0!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != 1	"; print "\n"; print ++$i; print "\t"; print (0!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != 0	"; print "\n"; print ++$i; print "\t"; print (0!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != -1	"; print "\n"; print ++$i; print "\t"; print (0!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != '1'	"; print "\n"; print ++$i; print "\t"; print (0!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != '0'	"; print "\n"; print ++$i; print "\t"; print (0!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != '-1'	"; print "\n"; print ++$i; print "\t"; print (0!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != nullptr	"; print "\n"; print ++$i; print "\t"; print (0!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array()	"; print "\n"; print ++$i; print "\t"; print (0!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array(1)	"; print "\n"; print ++$i; print "\t"; print (0!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array(2)	"; print "\n"; print ++$i; print "\t"; print (0!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array('1')	"; print "\n"; print ++$i; print "\t"; print (0!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array('a')	"; print "\n"; print ++$i; print "\t"; print (0!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != 'php'	"; print "\n"; print ++$i; print "\t"; print (0!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "0 != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/894.php b/hphp/test/slow/comparisons/894.php
index 50458270d..bc39a0d33 100644
--- a/hphp/test/slow/comparisons/894.php
+++ b/hphp/test/slow/comparisons/894.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != true	"; print "\n"; print ++$i; print "\t"; print (-1!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != false	"; print "\n"; print ++$i; print "\t"; print (-1!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != 1	"; print "\n"; print ++$i; print "\t"; print (-1!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != 0	"; print "\n"; print ++$i; print "\t"; print (-1!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != -1	"; print "\n"; print ++$i; print "\t"; print (-1!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != '1'	"; print "\n"; print ++$i; print "\t"; print (-1!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != '0'	"; print "\n"; print ++$i; print "\t"; print (-1!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != '-1'	"; print "\n"; print ++$i; print "\t"; print (-1!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != nullptr	"; print "\n"; print ++$i; print "\t"; print (-1!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array()	"; print "\n"; print ++$i; print "\t"; print (-1!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array(1)	"; print "\n"; print ++$i; print "\t"; print (-1!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array(2)	"; print "\n"; print ++$i; print "\t"; print (-1!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array('1')	"; print "\n"; print ++$i; print "\t"; print (-1!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array('a')	"; print "\n"; print ++$i; print "\t"; print (-1!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != 'php'	"; print "\n"; print ++$i; print "\t"; print (-1!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "-1 != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/895.php b/hphp/test/slow/comparisons/895.php
index d7fca3bfd..b77b34401 100644
--- a/hphp/test/slow/comparisons/895.php
+++ b/hphp/test/slow/comparisons/895.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != true	"; print "\n"; print ++$i; print "\t"; print ('1'!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != false	"; print "\n"; print ++$i; print "\t"; print ('1'!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != 1	"; print "\n"; print ++$i; print "\t"; print ('1'!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != 0	"; print "\n"; print ++$i; print "\t"; print ('1'!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != -1	"; print "\n"; print ++$i; print "\t"; print ('1'!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != '1'	"; print "\n"; print ++$i; print "\t"; print ('1'!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != '0'	"; print "\n"; print ++$i; print "\t"; print ('1'!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array()	"; print "\n"; print ++$i; print "\t"; print ('1'!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'1' != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/896.php b/hphp/test/slow/comparisons/896.php
index fff06c3d8..c20481ef8 100644
--- a/hphp/test/slow/comparisons/896.php
+++ b/hphp/test/slow/comparisons/896.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != true	"; print "\n"; print ++$i; print "\t"; print ('0'!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != false	"; print "\n"; print ++$i; print "\t"; print ('0'!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != 1	"; print "\n"; print ++$i; print "\t"; print ('0'!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != 0	"; print "\n"; print ++$i; print "\t"; print ('0'!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != -1	"; print "\n"; print ++$i; print "\t"; print ('0'!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != '1'	"; print "\n"; print ++$i; print "\t"; print ('0'!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != '0'	"; print "\n"; print ++$i; print "\t"; print ('0'!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array()	"; print "\n"; print ++$i; print "\t"; print ('0'!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'0' != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/897.php b/hphp/test/slow/comparisons/897.php
index d8bf5b6dd..4382c6352 100644
--- a/hphp/test/slow/comparisons/897.php
+++ b/hphp/test/slow/comparisons/897.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != true	"; print "\n"; print ++$i; print "\t"; print ('-1'!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != false	"; print "\n"; print ++$i; print "\t"; print ('-1'!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != 1	"; print "\n"; print ++$i; print "\t"; print ('-1'!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != 0	"; print "\n"; print ++$i; print "\t"; print ('-1'!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != -1	"; print "\n"; print ++$i; print "\t"; print ('-1'!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array()	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'-1' != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/898.php b/hphp/test/slow/comparisons/898.php
index 92a77db15..275903518 100644
--- a/hphp/test/slow/comparisons/898.php
+++ b/hphp/test/slow/comparisons/898.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != true	"; print "\n"; print ++$i; print "\t"; print (nullptr!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != false	"; print "\n"; print ++$i; print "\t"; print (nullptr!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != 1	"; print "\n"; print ++$i; print "\t"; print (nullptr!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != 0	"; print "\n"; print ++$i; print "\t"; print (nullptr!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != -1	"; print "\n"; print ++$i; print "\t"; print (nullptr!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array()	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "nullptr != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/899.php b/hphp/test/slow/comparisons/899.php
index d4442d654..ceb82887c 100644
--- a/hphp/test/slow/comparisons/899.php
+++ b/hphp/test/slow/comparisons/899.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != true	"; print "\n"; print ++$i; print "\t"; print (array()!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != false	"; print "\n"; print ++$i; print "\t"; print (array()!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != 1	"; print "\n"; print ++$i; print "\t"; print (array()!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != 0	"; print "\n"; print ++$i; print "\t"; print (array()!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != -1	"; print "\n"; print ++$i; print "\t"; print (array()!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != '1'	"; print "\n"; print ++$i; print "\t"; print (array()!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != '0'	"; print "\n"; print ++$i; print "\t"; print (array()!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != '-1'	"; print "\n"; print ++$i; print "\t"; print (array()!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != nullptr	"; print "\n"; print ++$i; print "\t"; print (array()!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array()	"; print "\n"; print ++$i; print "\t"; print (array()!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array(1)	"; print "\n"; print ++$i; print "\t"; print (array()!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array(2)	"; print "\n"; print ++$i; print "\t"; print (array()!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array('1')	"; print "\n"; print ++$i; print "\t"; print (array()!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array('a')	"; print "\n"; print ++$i; print "\t"; print (array()!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != 'php'	"; print "\n"; print ++$i; print "\t"; print (array()!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array() != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/900.php b/hphp/test/slow/comparisons/900.php
index 2a72b2313..f1aa9f68a 100644
--- a/hphp/test/slow/comparisons/900.php
+++ b/hphp/test/slow/comparisons/900.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != true	"; print "\n"; print ++$i; print "\t"; print (array(1)!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != false	"; print "\n"; print ++$i; print "\t"; print (array(1)!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != 1	"; print "\n"; print ++$i; print "\t"; print (array(1)!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != 0	"; print "\n"; print ++$i; print "\t"; print (array(1)!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != -1	"; print "\n"; print ++$i; print "\t"; print (array(1)!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array()	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(1) != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/901.php b/hphp/test/slow/comparisons/901.php
index de0c0e2d5..fc4e1b451 100644
--- a/hphp/test/slow/comparisons/901.php
+++ b/hphp/test/slow/comparisons/901.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != true	"; print "\n"; print ++$i; print "\t"; print (array(2)!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != false	"; print "\n"; print ++$i; print "\t"; print (array(2)!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != 1	"; print "\n"; print ++$i; print "\t"; print (array(2)!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != 0	"; print "\n"; print ++$i; print "\t"; print (array(2)!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != -1	"; print "\n"; print ++$i; print "\t"; print (array(2)!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array()	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(2) != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/902.php b/hphp/test/slow/comparisons/902.php
index 68cd2c219..d3ba671e8 100644
--- a/hphp/test/slow/comparisons/902.php
+++ b/hphp/test/slow/comparisons/902.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != true	"; print "\n"; print ++$i; print "\t"; print (array('1')!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != false	"; print "\n"; print ++$i; print "\t"; print (array('1')!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != 1	"; print "\n"; print ++$i; print "\t"; print (array('1')!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != 0	"; print "\n"; print ++$i; print "\t"; print (array('1')!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != -1	"; print "\n"; print ++$i; print "\t"; print (array('1')!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array()	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('1') != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/903.php b/hphp/test/slow/comparisons/903.php
index 2d9808fe8..a645f80ff 100644
--- a/hphp/test/slow/comparisons/903.php
+++ b/hphp/test/slow/comparisons/903.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/904.php b/hphp/test/slow/comparisons/904.php
index dc2b4236f..4395e3f51 100644
--- a/hphp/test/slow/comparisons/904.php
+++ b/hphp/test/slow/comparisons/904.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != true	"; print "\n"; print ++$i; print "\t"; print (array('a')!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != false	"; print "\n"; print ++$i; print "\t"; print (array('a')!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != 1	"; print "\n"; print ++$i; print "\t"; print (array('a')!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != 0	"; print "\n"; print ++$i; print "\t"; print (array('a')!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != -1	"; print "\n"; print ++$i; print "\t"; print (array('a')!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array()	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a') != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/905.php b/hphp/test/slow/comparisons/905.php
index 8bcfbe768..6192716a7 100644
--- a/hphp/test/slow/comparisons/905.php
+++ b/hphp/test/slow/comparisons/905.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/906.php b/hphp/test/slow/comparisons/906.php
index 922d4cc95..acacac2b4 100644
--- a/hphp/test/slow/comparisons/906.php
+++ b/hphp/test/slow/comparisons/906.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/907.php b/hphp/test/slow/comparisons/907.php
index c21e713af..e9a662217 100644
--- a/hphp/test/slow/comparisons/907.php
+++ b/hphp/test/slow/comparisons/907.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/908.php b/hphp/test/slow/comparisons/908.php
index e4c22ddc3..3d401f15a 100644
--- a/hphp/test/slow/comparisons/908.php
+++ b/hphp/test/slow/comparisons/908.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/909.php b/hphp/test/slow/comparisons/909.php
index 951a9f200..2c8e160f7 100644
--- a/hphp/test/slow/comparisons/909.php
+++ b/hphp/test/slow/comparisons/909.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/910.php b/hphp/test/slow/comparisons/910.php
index 7bfa13f33..a019d3fed 100644
--- a/hphp/test/slow/comparisons/910.php
+++ b/hphp/test/slow/comparisons/910.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != true	"; print "\n"; print ++$i; print "\t"; print ('php'!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != false	"; print "\n"; print ++$i; print "\t"; print ('php'!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != 1	"; print "\n"; print ++$i; print "\t"; print ('php'!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != 0	"; print "\n"; print ++$i; print "\t"; print ('php'!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != -1	"; print "\n"; print ++$i; print "\t"; print ('php'!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != '1'	"; print "\n"; print ++$i; print "\t"; print ('php'!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != '0'	"; print "\n"; print ++$i; print "\t"; print ('php'!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array()	"; print "\n"; print ++$i; print "\t"; print ('php'!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'php' != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/911.php b/hphp/test/slow/comparisons/911.php
index a7870c837..16c67ead1 100644
--- a/hphp/test/slow/comparisons/911.php
+++ b/hphp/test/slow/comparisons/911.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''!=true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != true	"; print "\n"; print ++$i; print "\t"; print (''!=false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != false	"; print "\n"; print ++$i; print "\t"; print (''!=1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != 1	"; print "\n"; print ++$i; print "\t"; print (''!=0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != 0	"; print "\n"; print ++$i; print "\t"; print (''!=-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != -1	"; print "\n"; print ++$i; print "\t"; print (''!='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != '1'	"; print "\n"; print ++$i; print "\t"; print (''!='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != '0'	"; print "\n"; print ++$i; print "\t"; print (''!='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != '-1'	"; print "\n"; print ++$i; print "\t"; print (''!=nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != nullptr	"; print "\n"; print ++$i; print "\t"; print (''!=array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array()	"; print "\n"; print ++$i; print "\t"; print (''!=array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array(1)	"; print "\n"; print ++$i; print "\t"; print (''!=array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array(2)	"; print "\n"; print ++$i; print "\t"; print (''!=array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array('1')	"; print "\n"; print ++$i; print "\t"; print (''!=array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''!=array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array('a')	"; print "\n"; print ++$i; print "\t"; print (''!=array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''!=array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''!=array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''!=array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''!='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != 'php'	"; print "\n"; print ++$i; print "\t"; print (''!='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''!=$b) ? 'Y' : 'N'; print ($a !=$b) ? 'Y' : 'N'; print "\t"; print "'' != ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''!=true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''!=$b) ? 'Y' : 'N';
+ print ($a !=$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' != ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/912.php b/hphp/test/slow/comparisons/912.php
index 5340701f5..501e7be61 100644
--- a/hphp/test/slow/comparisons/912.php
+++ b/hphp/test/slow/comparisons/912.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> true	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> false	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1.2' <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/913.php b/hphp/test/slow/comparisons/913.php
index 466529cd6..76f5ec4aa 100644
--- a/hphp/test/slow/comparisons/913.php
+++ b/hphp/test/slow/comparisons/913.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> true	"; print "\n"; print ++$i; print "\t"; print (true<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> false	"; print "\n"; print ++$i; print "\t"; print (true<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> 1	"; print "\n"; print ++$i; print "\t"; print (true<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> 0	"; print "\n"; print ++$i; print "\t"; print (true<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> -1	"; print "\n"; print ++$i; print "\t"; print (true<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> '1'	"; print "\n"; print ++$i; print "\t"; print (true<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> '0'	"; print "\n"; print ++$i; print "\t"; print (true<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> '-1'	"; print "\n"; print ++$i; print "\t"; print (true<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> nullptr	"; print "\n"; print ++$i; print "\t"; print (true<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array()	"; print "\n"; print ++$i; print "\t"; print (true<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array(1)	"; print "\n"; print ++$i; print "\t"; print (true<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array(2)	"; print "\n"; print ++$i; print "\t"; print (true<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array('1')	"; print "\n"; print ++$i; print "\t"; print (true<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array('a')	"; print "\n"; print ++$i; print "\t"; print (true<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> 'php'	"; print "\n"; print ++$i; print "\t"; print (true<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "true <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "true <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/914.php b/hphp/test/slow/comparisons/914.php
index 20245e798..693d3a905 100644
--- a/hphp/test/slow/comparisons/914.php
+++ b/hphp/test/slow/comparisons/914.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> true	"; print "\n"; print ++$i; print "\t"; print (false<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> false	"; print "\n"; print ++$i; print "\t"; print (false<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> 1	"; print "\n"; print ++$i; print "\t"; print (false<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> 0	"; print "\n"; print ++$i; print "\t"; print (false<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> -1	"; print "\n"; print ++$i; print "\t"; print (false<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> '1'	"; print "\n"; print ++$i; print "\t"; print (false<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> '0'	"; print "\n"; print ++$i; print "\t"; print (false<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> '-1'	"; print "\n"; print ++$i; print "\t"; print (false<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> nullptr	"; print "\n"; print ++$i; print "\t"; print (false<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array()	"; print "\n"; print ++$i; print "\t"; print (false<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array(1)	"; print "\n"; print ++$i; print "\t"; print (false<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array(2)	"; print "\n"; print ++$i; print "\t"; print (false<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array('1')	"; print "\n"; print ++$i; print "\t"; print (false<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array('a')	"; print "\n"; print ++$i; print "\t"; print (false<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> 'php'	"; print "\n"; print ++$i; print "\t"; print (false<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "false <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "false <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/915.php b/hphp/test/slow/comparisons/915.php
index 51f39778e..28fcb42d4 100644
--- a/hphp/test/slow/comparisons/915.php
+++ b/hphp/test/slow/comparisons/915.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> true	"; print "\n"; print ++$i; print "\t"; print (1<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> false	"; print "\n"; print ++$i; print "\t"; print (1<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> 1	"; print "\n"; print ++$i; print "\t"; print (1<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> 0	"; print "\n"; print ++$i; print "\t"; print (1<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> -1	"; print "\n"; print ++$i; print "\t"; print (1<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> '1'	"; print "\n"; print ++$i; print "\t"; print (1<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> '0'	"; print "\n"; print ++$i; print "\t"; print (1<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> '-1'	"; print "\n"; print ++$i; print "\t"; print (1<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> nullptr	"; print "\n"; print ++$i; print "\t"; print (1<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array()	"; print "\n"; print ++$i; print "\t"; print (1<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array(1)	"; print "\n"; print ++$i; print "\t"; print (1<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array(2)	"; print "\n"; print ++$i; print "\t"; print (1<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array('1')	"; print "\n"; print ++$i; print "\t"; print (1<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array('a')	"; print "\n"; print ++$i; print "\t"; print (1<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> 'php'	"; print "\n"; print ++$i; print "\t"; print (1<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "1 <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/916.php b/hphp/test/slow/comparisons/916.php
index 0f5deec7f..703786936 100644
--- a/hphp/test/slow/comparisons/916.php
+++ b/hphp/test/slow/comparisons/916.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> true	"; print "\n"; print ++$i; print "\t"; print (0<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> false	"; print "\n"; print ++$i; print "\t"; print (0<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> 1	"; print "\n"; print ++$i; print "\t"; print (0<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> 0	"; print "\n"; print ++$i; print "\t"; print (0<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> -1	"; print "\n"; print ++$i; print "\t"; print (0<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> '1'	"; print "\n"; print ++$i; print "\t"; print (0<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> '0'	"; print "\n"; print ++$i; print "\t"; print (0<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> '-1'	"; print "\n"; print ++$i; print "\t"; print (0<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> nullptr	"; print "\n"; print ++$i; print "\t"; print (0<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array()	"; print "\n"; print ++$i; print "\t"; print (0<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array(1)	"; print "\n"; print ++$i; print "\t"; print (0<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array(2)	"; print "\n"; print ++$i; print "\t"; print (0<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array('1')	"; print "\n"; print ++$i; print "\t"; print (0<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array('a')	"; print "\n"; print ++$i; print "\t"; print (0<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> 'php'	"; print "\n"; print ++$i; print "\t"; print (0<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "0 <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/917.php b/hphp/test/slow/comparisons/917.php
index 1bdb89ab3..a380312f7 100644
--- a/hphp/test/slow/comparisons/917.php
+++ b/hphp/test/slow/comparisons/917.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> true	"; print "\n"; print ++$i; print "\t"; print (-1<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> false	"; print "\n"; print ++$i; print "\t"; print (-1<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> 1	"; print "\n"; print ++$i; print "\t"; print (-1<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> 0	"; print "\n"; print ++$i; print "\t"; print (-1<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> -1	"; print "\n"; print ++$i; print "\t"; print (-1<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> '1'	"; print "\n"; print ++$i; print "\t"; print (-1<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> '0'	"; print "\n"; print ++$i; print "\t"; print (-1<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> '-1'	"; print "\n"; print ++$i; print "\t"; print (-1<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> nullptr	"; print "\n"; print ++$i; print "\t"; print (-1<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array()	"; print "\n"; print ++$i; print "\t"; print (-1<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array(1)	"; print "\n"; print ++$i; print "\t"; print (-1<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array(2)	"; print "\n"; print ++$i; print "\t"; print (-1<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array('1')	"; print "\n"; print ++$i; print "\t"; print (-1<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array('a')	"; print "\n"; print ++$i; print "\t"; print (-1<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> 'php'	"; print "\n"; print ++$i; print "\t"; print (-1<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "-1 <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/918.php b/hphp/test/slow/comparisons/918.php
index 82df72f09..231a07802 100644
--- a/hphp/test/slow/comparisons/918.php
+++ b/hphp/test/slow/comparisons/918.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> true	"; print "\n"; print ++$i; print "\t"; print ('1'<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> false	"; print "\n"; print ++$i; print "\t"; print ('1'<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> 1	"; print "\n"; print ++$i; print "\t"; print ('1'<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> 0	"; print "\n"; print ++$i; print "\t"; print ('1'<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> -1	"; print "\n"; print ++$i; print "\t"; print ('1'<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> '1'	"; print "\n"; print ++$i; print "\t"; print ('1'<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> '0'	"; print "\n"; print ++$i; print "\t"; print ('1'<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array()	"; print "\n"; print ++$i; print "\t"; print ('1'<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'1' <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/919.php b/hphp/test/slow/comparisons/919.php
index c6c080acb..2236b3446 100644
--- a/hphp/test/slow/comparisons/919.php
+++ b/hphp/test/slow/comparisons/919.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> true	"; print "\n"; print ++$i; print "\t"; print ('0'<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> false	"; print "\n"; print ++$i; print "\t"; print ('0'<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> 1	"; print "\n"; print ++$i; print "\t"; print ('0'<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> 0	"; print "\n"; print ++$i; print "\t"; print ('0'<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> -1	"; print "\n"; print ++$i; print "\t"; print ('0'<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> '1'	"; print "\n"; print ++$i; print "\t"; print ('0'<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> '0'	"; print "\n"; print ++$i; print "\t"; print ('0'<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array()	"; print "\n"; print ++$i; print "\t"; print ('0'<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'0' <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/920.php b/hphp/test/slow/comparisons/920.php
index 593fbaed1..9d29bfc49 100644
--- a/hphp/test/slow/comparisons/920.php
+++ b/hphp/test/slow/comparisons/920.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> true	"; print "\n"; print ++$i; print "\t"; print ('-1'<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> false	"; print "\n"; print ++$i; print "\t"; print ('-1'<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> 1	"; print "\n"; print ++$i; print "\t"; print ('-1'<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> 0	"; print "\n"; print ++$i; print "\t"; print ('-1'<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> -1	"; print "\n"; print ++$i; print "\t"; print ('-1'<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array()	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'-1' <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/921.php b/hphp/test/slow/comparisons/921.php
index 48cf57b04..d0618dce0 100644
--- a/hphp/test/slow/comparisons/921.php
+++ b/hphp/test/slow/comparisons/921.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> true	"; print "\n"; print ++$i; print "\t"; print (nullptr<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> false	"; print "\n"; print ++$i; print "\t"; print (nullptr<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> 1	"; print "\n"; print ++$i; print "\t"; print (nullptr<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> 0	"; print "\n"; print ++$i; print "\t"; print (nullptr<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> -1	"; print "\n"; print ++$i; print "\t"; print (nullptr<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array()	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "nullptr <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/922.php b/hphp/test/slow/comparisons/922.php
index 1272d04cf..4ecdec919 100644
--- a/hphp/test/slow/comparisons/922.php
+++ b/hphp/test/slow/comparisons/922.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> true	"; print "\n"; print ++$i; print "\t"; print (array()<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> false	"; print "\n"; print ++$i; print "\t"; print (array()<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> 1	"; print "\n"; print ++$i; print "\t"; print (array()<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> 0	"; print "\n"; print ++$i; print "\t"; print (array()<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> -1	"; print "\n"; print ++$i; print "\t"; print (array()<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> '1'	"; print "\n"; print ++$i; print "\t"; print (array()<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> '0'	"; print "\n"; print ++$i; print "\t"; print (array()<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array()<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array()<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array()	"; print "\n"; print ++$i; print "\t"; print (array()<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array()<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array()<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array()<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array()<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array()<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array() <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/923.php b/hphp/test/slow/comparisons/923.php
index cb14bf5fc..8f624884b 100644
--- a/hphp/test/slow/comparisons/923.php
+++ b/hphp/test/slow/comparisons/923.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> true	"; print "\n"; print ++$i; print "\t"; print (array(1)<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> false	"; print "\n"; print ++$i; print "\t"; print (array(1)<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> 1	"; print "\n"; print ++$i; print "\t"; print (array(1)<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> 0	"; print "\n"; print ++$i; print "\t"; print (array(1)<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> -1	"; print "\n"; print ++$i; print "\t"; print (array(1)<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array()	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(1) <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/924.php b/hphp/test/slow/comparisons/924.php
index 887350e4d..79ccb73ff 100644
--- a/hphp/test/slow/comparisons/924.php
+++ b/hphp/test/slow/comparisons/924.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> true	"; print "\n"; print ++$i; print "\t"; print (array(2)<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> false	"; print "\n"; print ++$i; print "\t"; print (array(2)<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> 1	"; print "\n"; print ++$i; print "\t"; print (array(2)<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> 0	"; print "\n"; print ++$i; print "\t"; print (array(2)<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> -1	"; print "\n"; print ++$i; print "\t"; print (array(2)<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array()	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(2) <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/925.php b/hphp/test/slow/comparisons/925.php
index bddd56021..dcd41c399 100644
--- a/hphp/test/slow/comparisons/925.php
+++ b/hphp/test/slow/comparisons/925.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> true	"; print "\n"; print ++$i; print "\t"; print (array('1')<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> false	"; print "\n"; print ++$i; print "\t"; print (array('1')<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> 1	"; print "\n"; print ++$i; print "\t"; print (array('1')<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> 0	"; print "\n"; print ++$i; print "\t"; print (array('1')<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> -1	"; print "\n"; print ++$i; print "\t"; print (array('1')<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array()	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('1') <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/926.php b/hphp/test/slow/comparisons/926.php
index 8873735a5..0d08e8384 100644
--- a/hphp/test/slow/comparisons/926.php
+++ b/hphp/test/slow/comparisons/926.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/927.php b/hphp/test/slow/comparisons/927.php
index 7a425d817..f5650ad45 100644
--- a/hphp/test/slow/comparisons/927.php
+++ b/hphp/test/slow/comparisons/927.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> true	"; print "\n"; print ++$i; print "\t"; print (array('a')<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> false	"; print "\n"; print ++$i; print "\t"; print (array('a')<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> 1	"; print "\n"; print ++$i; print "\t"; print (array('a')<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> 0	"; print "\n"; print ++$i; print "\t"; print (array('a')<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> -1	"; print "\n"; print ++$i; print "\t"; print (array('a')<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array()	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a') <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/928.php b/hphp/test/slow/comparisons/928.php
index a4aada9d0..4801be066 100644
--- a/hphp/test/slow/comparisons/928.php
+++ b/hphp/test/slow/comparisons/928.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/929.php b/hphp/test/slow/comparisons/929.php
index 9f12fd9de..e62710f53 100644
--- a/hphp/test/slow/comparisons/929.php
+++ b/hphp/test/slow/comparisons/929.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/930.php b/hphp/test/slow/comparisons/930.php
index 1e1503f01..befbd6122 100644
--- a/hphp/test/slow/comparisons/930.php
+++ b/hphp/test/slow/comparisons/930.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/931.php b/hphp/test/slow/comparisons/931.php
index 68da0cb5c..2d958f8db 100644
--- a/hphp/test/slow/comparisons/931.php
+++ b/hphp/test/slow/comparisons/931.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/932.php b/hphp/test/slow/comparisons/932.php
index c31b1c719..1228d6253 100644
--- a/hphp/test/slow/comparisons/932.php
+++ b/hphp/test/slow/comparisons/932.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/933.php b/hphp/test/slow/comparisons/933.php
index 222fd33b8..55fc4de5c 100644
--- a/hphp/test/slow/comparisons/933.php
+++ b/hphp/test/slow/comparisons/933.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> true	"; print "\n"; print ++$i; print "\t"; print ('php'<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> false	"; print "\n"; print ++$i; print "\t"; print ('php'<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> 1	"; print "\n"; print ++$i; print "\t"; print ('php'<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> 0	"; print "\n"; print ++$i; print "\t"; print ('php'<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> -1	"; print "\n"; print ++$i; print "\t"; print ('php'<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> '1'	"; print "\n"; print ++$i; print "\t"; print ('php'<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> '0'	"; print "\n"; print ++$i; print "\t"; print ('php'<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array()	"; print "\n"; print ++$i; print "\t"; print ('php'<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'php' <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/934.php b/hphp/test/slow/comparisons/934.php
index 0072c5328..5579bc0ab 100644
--- a/hphp/test/slow/comparisons/934.php
+++ b/hphp/test/slow/comparisons/934.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''<>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> true	"; print "\n"; print ++$i; print "\t"; print (''<>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> false	"; print "\n"; print ++$i; print "\t"; print (''<>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> 1	"; print "\n"; print ++$i; print "\t"; print (''<>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> 0	"; print "\n"; print ++$i; print "\t"; print (''<>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> -1	"; print "\n"; print ++$i; print "\t"; print (''<>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> '1'	"; print "\n"; print ++$i; print "\t"; print (''<>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> '0'	"; print "\n"; print ++$i; print "\t"; print (''<>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> '-1'	"; print "\n"; print ++$i; print "\t"; print (''<>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> nullptr	"; print "\n"; print ++$i; print "\t"; print (''<>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array()	"; print "\n"; print ++$i; print "\t"; print (''<>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array(1)	"; print "\n"; print ++$i; print "\t"; print (''<>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array(2)	"; print "\n"; print ++$i; print "\t"; print (''<>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array('1')	"; print "\n"; print ++$i; print "\t"; print (''<>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''<>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array('a')	"; print "\n"; print ++$i; print "\t"; print (''<>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''<>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''<>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''<>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''<>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> 'php'	"; print "\n"; print ++$i; print "\t"; print (''<>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <>'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''<>$b) ? 'Y' : 'N'; print ($a <>$b) ? 'Y' : 'N'; print "\t"; print "'' <> ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''<>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <>'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''<>$b) ? 'Y' : 'N';
+ print ($a <>$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' <> ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/935.php b/hphp/test/slow/comparisons/935.php
index 4f87dca80..c4e8e14a1 100644
--- a/hphp/test/slow/comparisons/935.php
+++ b/hphp/test/slow/comparisons/935.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== true	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== false	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1.2' !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/936.php b/hphp/test/slow/comparisons/936.php
index f50e84bf0..40d5df3de 100644
--- a/hphp/test/slow/comparisons/936.php
+++ b/hphp/test/slow/comparisons/936.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== true	"; print "\n"; print ++$i; print "\t"; print (true!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== false	"; print "\n"; print ++$i; print "\t"; print (true!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== 1	"; print "\n"; print ++$i; print "\t"; print (true!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== 0	"; print "\n"; print ++$i; print "\t"; print (true!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== -1	"; print "\n"; print ++$i; print "\t"; print (true!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== '1'	"; print "\n"; print ++$i; print "\t"; print (true!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== '0'	"; print "\n"; print ++$i; print "\t"; print (true!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== '-1'	"; print "\n"; print ++$i; print "\t"; print (true!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== nullptr	"; print "\n"; print ++$i; print "\t"; print (true!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array()	"; print "\n"; print ++$i; print "\t"; print (true!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array(1)	"; print "\n"; print ++$i; print "\t"; print (true!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array(2)	"; print "\n"; print ++$i; print "\t"; print (true!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array('1')	"; print "\n"; print ++$i; print "\t"; print (true!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array('a')	"; print "\n"; print ++$i; print "\t"; print (true!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== 'php'	"; print "\n"; print ++$i; print "\t"; print (true!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "true !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "true !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/937.php b/hphp/test/slow/comparisons/937.php
index 2c9761252..19040c571 100644
--- a/hphp/test/slow/comparisons/937.php
+++ b/hphp/test/slow/comparisons/937.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== true	"; print "\n"; print ++$i; print "\t"; print (false!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== false	"; print "\n"; print ++$i; print "\t"; print (false!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== 1	"; print "\n"; print ++$i; print "\t"; print (false!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== 0	"; print "\n"; print ++$i; print "\t"; print (false!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== -1	"; print "\n"; print ++$i; print "\t"; print (false!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== '1'	"; print "\n"; print ++$i; print "\t"; print (false!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== '0'	"; print "\n"; print ++$i; print "\t"; print (false!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== '-1'	"; print "\n"; print ++$i; print "\t"; print (false!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== nullptr	"; print "\n"; print ++$i; print "\t"; print (false!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array()	"; print "\n"; print ++$i; print "\t"; print (false!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array(1)	"; print "\n"; print ++$i; print "\t"; print (false!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array(2)	"; print "\n"; print ++$i; print "\t"; print (false!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array('1')	"; print "\n"; print ++$i; print "\t"; print (false!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array('a')	"; print "\n"; print ++$i; print "\t"; print (false!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== 'php'	"; print "\n"; print ++$i; print "\t"; print (false!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "false !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "false !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/938.php b/hphp/test/slow/comparisons/938.php
index bfd9db9a1..ca373f8c1 100644
--- a/hphp/test/slow/comparisons/938.php
+++ b/hphp/test/slow/comparisons/938.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== true	"; print "\n"; print ++$i; print "\t"; print (1!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== false	"; print "\n"; print ++$i; print "\t"; print (1!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== 1	"; print "\n"; print ++$i; print "\t"; print (1!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== 0	"; print "\n"; print ++$i; print "\t"; print (1!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== -1	"; print "\n"; print ++$i; print "\t"; print (1!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== '1'	"; print "\n"; print ++$i; print "\t"; print (1!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== '0'	"; print "\n"; print ++$i; print "\t"; print (1!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== '-1'	"; print "\n"; print ++$i; print "\t"; print (1!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== nullptr	"; print "\n"; print ++$i; print "\t"; print (1!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array()	"; print "\n"; print ++$i; print "\t"; print (1!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array(1)	"; print "\n"; print ++$i; print "\t"; print (1!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array(2)	"; print "\n"; print ++$i; print "\t"; print (1!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array('1')	"; print "\n"; print ++$i; print "\t"; print (1!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array('a')	"; print "\n"; print ++$i; print "\t"; print (1!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== 'php'	"; print "\n"; print ++$i; print "\t"; print (1!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "1 !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/939.php b/hphp/test/slow/comparisons/939.php
index d206770f3..d4e25b71c 100644
--- a/hphp/test/slow/comparisons/939.php
+++ b/hphp/test/slow/comparisons/939.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== true	"; print "\n"; print ++$i; print "\t"; print (0!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== false	"; print "\n"; print ++$i; print "\t"; print (0!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== 1	"; print "\n"; print ++$i; print "\t"; print (0!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== 0	"; print "\n"; print ++$i; print "\t"; print (0!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== -1	"; print "\n"; print ++$i; print "\t"; print (0!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== '1'	"; print "\n"; print ++$i; print "\t"; print (0!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== '0'	"; print "\n"; print ++$i; print "\t"; print (0!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== '-1'	"; print "\n"; print ++$i; print "\t"; print (0!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== nullptr	"; print "\n"; print ++$i; print "\t"; print (0!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array()	"; print "\n"; print ++$i; print "\t"; print (0!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array(1)	"; print "\n"; print ++$i; print "\t"; print (0!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array(2)	"; print "\n"; print ++$i; print "\t"; print (0!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array('1')	"; print "\n"; print ++$i; print "\t"; print (0!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array('a')	"; print "\n"; print ++$i; print "\t"; print (0!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== 'php'	"; print "\n"; print ++$i; print "\t"; print (0!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "0 !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/940.php b/hphp/test/slow/comparisons/940.php
index b58d32594..443ab7ad9 100644
--- a/hphp/test/slow/comparisons/940.php
+++ b/hphp/test/slow/comparisons/940.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== true	"; print "\n"; print ++$i; print "\t"; print (-1!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== false	"; print "\n"; print ++$i; print "\t"; print (-1!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== 1	"; print "\n"; print ++$i; print "\t"; print (-1!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== 0	"; print "\n"; print ++$i; print "\t"; print (-1!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== -1	"; print "\n"; print ++$i; print "\t"; print (-1!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== '1'	"; print "\n"; print ++$i; print "\t"; print (-1!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== '0'	"; print "\n"; print ++$i; print "\t"; print (-1!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== '-1'	"; print "\n"; print ++$i; print "\t"; print (-1!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== nullptr	"; print "\n"; print ++$i; print "\t"; print (-1!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array()	"; print "\n"; print ++$i; print "\t"; print (-1!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array(1)	"; print "\n"; print ++$i; print "\t"; print (-1!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array(2)	"; print "\n"; print ++$i; print "\t"; print (-1!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array('1')	"; print "\n"; print ++$i; print "\t"; print (-1!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array('a')	"; print "\n"; print ++$i; print "\t"; print (-1!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== 'php'	"; print "\n"; print ++$i; print "\t"; print (-1!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "-1 !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/941.php b/hphp/test/slow/comparisons/941.php
index d41012909..eb7ea2c7a 100644
--- a/hphp/test/slow/comparisons/941.php
+++ b/hphp/test/slow/comparisons/941.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== true	"; print "\n"; print ++$i; print "\t"; print ('1'!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== false	"; print "\n"; print ++$i; print "\t"; print ('1'!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== 1	"; print "\n"; print ++$i; print "\t"; print ('1'!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== 0	"; print "\n"; print ++$i; print "\t"; print ('1'!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== -1	"; print "\n"; print ++$i; print "\t"; print ('1'!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== '1'	"; print "\n"; print ++$i; print "\t"; print ('1'!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== '0'	"; print "\n"; print ++$i; print "\t"; print ('1'!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array()	"; print "\n"; print ++$i; print "\t"; print ('1'!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'1' !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/942.php b/hphp/test/slow/comparisons/942.php
index 78469f727..ebe4336b2 100644
--- a/hphp/test/slow/comparisons/942.php
+++ b/hphp/test/slow/comparisons/942.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== true	"; print "\n"; print ++$i; print "\t"; print ('0'!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== false	"; print "\n"; print ++$i; print "\t"; print ('0'!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== 1	"; print "\n"; print ++$i; print "\t"; print ('0'!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== 0	"; print "\n"; print ++$i; print "\t"; print ('0'!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== -1	"; print "\n"; print ++$i; print "\t"; print ('0'!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== '1'	"; print "\n"; print ++$i; print "\t"; print ('0'!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== '0'	"; print "\n"; print ++$i; print "\t"; print ('0'!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array()	"; print "\n"; print ++$i; print "\t"; print ('0'!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'0' !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/943.php b/hphp/test/slow/comparisons/943.php
index fbebe6e8f..d28a803dd 100644
--- a/hphp/test/slow/comparisons/943.php
+++ b/hphp/test/slow/comparisons/943.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== true	"; print "\n"; print ++$i; print "\t"; print ('-1'!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== false	"; print "\n"; print ++$i; print "\t"; print ('-1'!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== 1	"; print "\n"; print ++$i; print "\t"; print ('-1'!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== 0	"; print "\n"; print ++$i; print "\t"; print ('-1'!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== -1	"; print "\n"; print ++$i; print "\t"; print ('-1'!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array()	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'-1' !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/944.php b/hphp/test/slow/comparisons/944.php
index d383921b2..d31565f81 100644
--- a/hphp/test/slow/comparisons/944.php
+++ b/hphp/test/slow/comparisons/944.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== true	"; print "\n"; print ++$i; print "\t"; print (nullptr!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== false	"; print "\n"; print ++$i; print "\t"; print (nullptr!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== 1	"; print "\n"; print ++$i; print "\t"; print (nullptr!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== 0	"; print "\n"; print ++$i; print "\t"; print (nullptr!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== -1	"; print "\n"; print ++$i; print "\t"; print (nullptr!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array()	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "nullptr !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/945.php b/hphp/test/slow/comparisons/945.php
index f93c6ec1e..b19c39092 100644
--- a/hphp/test/slow/comparisons/945.php
+++ b/hphp/test/slow/comparisons/945.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== true	"; print "\n"; print ++$i; print "\t"; print (array()!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== false	"; print "\n"; print ++$i; print "\t"; print (array()!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== 1	"; print "\n"; print ++$i; print "\t"; print (array()!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== 0	"; print "\n"; print ++$i; print "\t"; print (array()!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== -1	"; print "\n"; print ++$i; print "\t"; print (array()!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== '1'	"; print "\n"; print ++$i; print "\t"; print (array()!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== '0'	"; print "\n"; print ++$i; print "\t"; print (array()!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array()!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array()!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array()	"; print "\n"; print ++$i; print "\t"; print (array()!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array()!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array()!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array()!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array()!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array()!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array() !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/946.php b/hphp/test/slow/comparisons/946.php
index 46be968de..a6352caa8 100644
--- a/hphp/test/slow/comparisons/946.php
+++ b/hphp/test/slow/comparisons/946.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== true	"; print "\n"; print ++$i; print "\t"; print (array(1)!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== false	"; print "\n"; print ++$i; print "\t"; print (array(1)!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== 1	"; print "\n"; print ++$i; print "\t"; print (array(1)!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== 0	"; print "\n"; print ++$i; print "\t"; print (array(1)!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== -1	"; print "\n"; print ++$i; print "\t"; print (array(1)!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array()	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(1) !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/947.php b/hphp/test/slow/comparisons/947.php
index 31c26c06e..ca40fe850 100644
--- a/hphp/test/slow/comparisons/947.php
+++ b/hphp/test/slow/comparisons/947.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== true	"; print "\n"; print ++$i; print "\t"; print (array(2)!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== false	"; print "\n"; print ++$i; print "\t"; print (array(2)!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== 1	"; print "\n"; print ++$i; print "\t"; print (array(2)!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== 0	"; print "\n"; print ++$i; print "\t"; print (array(2)!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== -1	"; print "\n"; print ++$i; print "\t"; print (array(2)!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array()	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(2) !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/948.php b/hphp/test/slow/comparisons/948.php
index ab405081d..686806a50 100644
--- a/hphp/test/slow/comparisons/948.php
+++ b/hphp/test/slow/comparisons/948.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== true	"; print "\n"; print ++$i; print "\t"; print (array('1')!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== false	"; print "\n"; print ++$i; print "\t"; print (array('1')!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== 1	"; print "\n"; print ++$i; print "\t"; print (array('1')!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== 0	"; print "\n"; print ++$i; print "\t"; print (array('1')!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== -1	"; print "\n"; print ++$i; print "\t"; print (array('1')!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array()	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('1') !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/949.php b/hphp/test/slow/comparisons/949.php
index fdb4a5856..2e479f404 100644
--- a/hphp/test/slow/comparisons/949.php
+++ b/hphp/test/slow/comparisons/949.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/950.php b/hphp/test/slow/comparisons/950.php
index 7e0ec57bb..61b0cfce3 100644
--- a/hphp/test/slow/comparisons/950.php
+++ b/hphp/test/slow/comparisons/950.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== true	"; print "\n"; print ++$i; print "\t"; print (array('a')!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== false	"; print "\n"; print ++$i; print "\t"; print (array('a')!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== 1	"; print "\n"; print ++$i; print "\t"; print (array('a')!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== 0	"; print "\n"; print ++$i; print "\t"; print (array('a')!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== -1	"; print "\n"; print ++$i; print "\t"; print (array('a')!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array()	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a') !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/951.php b/hphp/test/slow/comparisons/951.php
index 95e8c3831..6f1eebd0c 100644
--- a/hphp/test/slow/comparisons/951.php
+++ b/hphp/test/slow/comparisons/951.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/952.php b/hphp/test/slow/comparisons/952.php
index b232d9c69..c454e3c71 100644
--- a/hphp/test/slow/comparisons/952.php
+++ b/hphp/test/slow/comparisons/952.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/953.php b/hphp/test/slow/comparisons/953.php
index 317cb26f0..6b913a575 100644
--- a/hphp/test/slow/comparisons/953.php
+++ b/hphp/test/slow/comparisons/953.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/954.php b/hphp/test/slow/comparisons/954.php
index f26a39d56..7f488839c 100644
--- a/hphp/test/slow/comparisons/954.php
+++ b/hphp/test/slow/comparisons/954.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/955.php b/hphp/test/slow/comparisons/955.php
index 040813711..798195627 100644
--- a/hphp/test/slow/comparisons/955.php
+++ b/hphp/test/slow/comparisons/955.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/956.php b/hphp/test/slow/comparisons/956.php
index 643ee5550..3a09c8f6a 100644
--- a/hphp/test/slow/comparisons/956.php
+++ b/hphp/test/slow/comparisons/956.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== true	"; print "\n"; print ++$i; print "\t"; print ('php'!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== false	"; print "\n"; print ++$i; print "\t"; print ('php'!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== 1	"; print "\n"; print ++$i; print "\t"; print ('php'!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== 0	"; print "\n"; print ++$i; print "\t"; print ('php'!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== -1	"; print "\n"; print ++$i; print "\t"; print ('php'!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== '1'	"; print "\n"; print ++$i; print "\t"; print ('php'!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== '0'	"; print "\n"; print ++$i; print "\t"; print ('php'!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array()	"; print "\n"; print ++$i; print "\t"; print ('php'!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'php' !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/957.php b/hphp/test/slow/comparisons/957.php
index c97f25611..6f1560f9f 100644
--- a/hphp/test/slow/comparisons/957.php
+++ b/hphp/test/slow/comparisons/957.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''!==true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== true	"; print "\n"; print ++$i; print "\t"; print (''!==false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== false	"; print "\n"; print ++$i; print "\t"; print (''!==1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== 1	"; print "\n"; print ++$i; print "\t"; print (''!==0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== 0	"; print "\n"; print ++$i; print "\t"; print (''!==-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== -1	"; print "\n"; print ++$i; print "\t"; print (''!=='1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=='1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== '1'	"; print "\n"; print ++$i; print "\t"; print (''!=='0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=='0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== '0'	"; print "\n"; print ++$i; print "\t"; print (''!=='-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=='-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== '-1'	"; print "\n"; print ++$i; print "\t"; print (''!==nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== nullptr	"; print "\n"; print ++$i; print "\t"; print (''!==array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array()	"; print "\n"; print ++$i; print "\t"; print (''!==array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array(1)	"; print "\n"; print ++$i; print "\t"; print (''!==array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array(2)	"; print "\n"; print ++$i; print "\t"; print (''!==array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array('1')	"; print "\n"; print ++$i; print "\t"; print (''!==array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''!==array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array('a')	"; print "\n"; print ++$i; print "\t"; print (''!==array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''!==array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''!==array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''!==array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !==array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''!=='php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=='php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== 'php'	"; print "\n"; print ++$i; print "\t"; print (''!=='') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a !=='') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''!==$b) ? 'Y' : 'N'; print ($a !==$b) ? 'Y' : 'N'; print "\t"; print "'' !== ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''!==true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=='1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=='1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=='0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=='0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=='-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=='-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!==array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !==array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=='php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=='php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''!=='') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a !=='') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''!==$b) ? 'Y' : 'N';
+ print ($a !==$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' !== ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/958.php b/hphp/test/slow/comparisons/958.php
index 8e15114d9..25d0d615b 100644
--- a/hphp/test/slow/comparisons/958.php
+++ b/hphp/test/slow/comparisons/958.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < true	"; print "\n"; print ++$i; print "\t"; print ('1.2'<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < false	"; print "\n"; print ++$i; print "\t"; print ('1.2'<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1.2' < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/959.php b/hphp/test/slow/comparisons/959.php
index dcbc4c940..3a69feb22 100644
--- a/hphp/test/slow/comparisons/959.php
+++ b/hphp/test/slow/comparisons/959.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < true	"; print "\n"; print ++$i; print "\t"; print (true<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < false	"; print "\n"; print ++$i; print "\t"; print (true<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < 1	"; print "\n"; print ++$i; print "\t"; print (true<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < 0	"; print "\n"; print ++$i; print "\t"; print (true<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < -1	"; print "\n"; print ++$i; print "\t"; print (true<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < '1'	"; print "\n"; print ++$i; print "\t"; print (true<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < '0'	"; print "\n"; print ++$i; print "\t"; print (true<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < '-1'	"; print "\n"; print ++$i; print "\t"; print (true<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < nullptr	"; print "\n"; print ++$i; print "\t"; print (true<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array()	"; print "\n"; print ++$i; print "\t"; print (true<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array(1)	"; print "\n"; print ++$i; print "\t"; print (true<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array(2)	"; print "\n"; print ++$i; print "\t"; print (true<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array('1')	"; print "\n"; print ++$i; print "\t"; print (true<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array('a')	"; print "\n"; print ++$i; print "\t"; print (true<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < 'php'	"; print "\n"; print ++$i; print "\t"; print (true<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "true < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "true < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/960.php b/hphp/test/slow/comparisons/960.php
index c4b5e8d0f..d147bfff1 100644
--- a/hphp/test/slow/comparisons/960.php
+++ b/hphp/test/slow/comparisons/960.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < true	"; print "\n"; print ++$i; print "\t"; print (false<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < false	"; print "\n"; print ++$i; print "\t"; print (false<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < 1	"; print "\n"; print ++$i; print "\t"; print (false<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < 0	"; print "\n"; print ++$i; print "\t"; print (false<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < -1	"; print "\n"; print ++$i; print "\t"; print (false<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < '1'	"; print "\n"; print ++$i; print "\t"; print (false<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < '0'	"; print "\n"; print ++$i; print "\t"; print (false<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < '-1'	"; print "\n"; print ++$i; print "\t"; print (false<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < nullptr	"; print "\n"; print ++$i; print "\t"; print (false<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array()	"; print "\n"; print ++$i; print "\t"; print (false<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array(1)	"; print "\n"; print ++$i; print "\t"; print (false<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array(2)	"; print "\n"; print ++$i; print "\t"; print (false<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array('1')	"; print "\n"; print ++$i; print "\t"; print (false<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array('a')	"; print "\n"; print ++$i; print "\t"; print (false<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < 'php'	"; print "\n"; print ++$i; print "\t"; print (false<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "false < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "false < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/961.php b/hphp/test/slow/comparisons/961.php
index 2d64bd95f..267d40b1d 100644
--- a/hphp/test/slow/comparisons/961.php
+++ b/hphp/test/slow/comparisons/961.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < true	"; print "\n"; print ++$i; print "\t"; print (1<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < false	"; print "\n"; print ++$i; print "\t"; print (1<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < 1	"; print "\n"; print ++$i; print "\t"; print (1<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < 0	"; print "\n"; print ++$i; print "\t"; print (1<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < -1	"; print "\n"; print ++$i; print "\t"; print (1<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < '1'	"; print "\n"; print ++$i; print "\t"; print (1<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < '0'	"; print "\n"; print ++$i; print "\t"; print (1<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < '-1'	"; print "\n"; print ++$i; print "\t"; print (1<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < nullptr	"; print "\n"; print ++$i; print "\t"; print (1<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array()	"; print "\n"; print ++$i; print "\t"; print (1<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array(1)	"; print "\n"; print ++$i; print "\t"; print (1<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array(2)	"; print "\n"; print ++$i; print "\t"; print (1<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array('1')	"; print "\n"; print ++$i; print "\t"; print (1<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array('a')	"; print "\n"; print ++$i; print "\t"; print (1<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < 'php'	"; print "\n"; print ++$i; print "\t"; print (1<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "1 < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/962.php b/hphp/test/slow/comparisons/962.php
index b8d104fff..21c78cf2e 100644
--- a/hphp/test/slow/comparisons/962.php
+++ b/hphp/test/slow/comparisons/962.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < true	"; print "\n"; print ++$i; print "\t"; print (0<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < false	"; print "\n"; print ++$i; print "\t"; print (0<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < 1	"; print "\n"; print ++$i; print "\t"; print (0<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < 0	"; print "\n"; print ++$i; print "\t"; print (0<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < -1	"; print "\n"; print ++$i; print "\t"; print (0<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < '1'	"; print "\n"; print ++$i; print "\t"; print (0<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < '0'	"; print "\n"; print ++$i; print "\t"; print (0<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < '-1'	"; print "\n"; print ++$i; print "\t"; print (0<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < nullptr	"; print "\n"; print ++$i; print "\t"; print (0<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array()	"; print "\n"; print ++$i; print "\t"; print (0<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array(1)	"; print "\n"; print ++$i; print "\t"; print (0<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array(2)	"; print "\n"; print ++$i; print "\t"; print (0<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array('1')	"; print "\n"; print ++$i; print "\t"; print (0<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array('a')	"; print "\n"; print ++$i; print "\t"; print (0<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < 'php'	"; print "\n"; print ++$i; print "\t"; print (0<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "0 < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/963.php b/hphp/test/slow/comparisons/963.php
index 99ccddbb9..75cc47231 100644
--- a/hphp/test/slow/comparisons/963.php
+++ b/hphp/test/slow/comparisons/963.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < true	"; print "\n"; print ++$i; print "\t"; print (-1<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < false	"; print "\n"; print ++$i; print "\t"; print (-1<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < 1	"; print "\n"; print ++$i; print "\t"; print (-1<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < 0	"; print "\n"; print ++$i; print "\t"; print (-1<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < -1	"; print "\n"; print ++$i; print "\t"; print (-1<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < '1'	"; print "\n"; print ++$i; print "\t"; print (-1<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < '0'	"; print "\n"; print ++$i; print "\t"; print (-1<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < '-1'	"; print "\n"; print ++$i; print "\t"; print (-1<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < nullptr	"; print "\n"; print ++$i; print "\t"; print (-1<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array()	"; print "\n"; print ++$i; print "\t"; print (-1<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array(1)	"; print "\n"; print ++$i; print "\t"; print (-1<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array(2)	"; print "\n"; print ++$i; print "\t"; print (-1<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array('1')	"; print "\n"; print ++$i; print "\t"; print (-1<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array('a')	"; print "\n"; print ++$i; print "\t"; print (-1<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < 'php'	"; print "\n"; print ++$i; print "\t"; print (-1<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "-1 < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/964.php b/hphp/test/slow/comparisons/964.php
index dc986fe72..882624573 100644
--- a/hphp/test/slow/comparisons/964.php
+++ b/hphp/test/slow/comparisons/964.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < true	"; print "\n"; print ++$i; print "\t"; print ('1'<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < false	"; print "\n"; print ++$i; print "\t"; print ('1'<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < 1	"; print "\n"; print ++$i; print "\t"; print ('1'<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < 0	"; print "\n"; print ++$i; print "\t"; print ('1'<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < -1	"; print "\n"; print ++$i; print "\t"; print ('1'<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < '1'	"; print "\n"; print ++$i; print "\t"; print ('1'<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < '0'	"; print "\n"; print ++$i; print "\t"; print ('1'<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array()	"; print "\n"; print ++$i; print "\t"; print ('1'<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'1' < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/965.php b/hphp/test/slow/comparisons/965.php
index 147628d25..d49ed85bf 100644
--- a/hphp/test/slow/comparisons/965.php
+++ b/hphp/test/slow/comparisons/965.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < true	"; print "\n"; print ++$i; print "\t"; print ('0'<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < false	"; print "\n"; print ++$i; print "\t"; print ('0'<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < 1	"; print "\n"; print ++$i; print "\t"; print ('0'<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < 0	"; print "\n"; print ++$i; print "\t"; print ('0'<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < -1	"; print "\n"; print ++$i; print "\t"; print ('0'<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < '1'	"; print "\n"; print ++$i; print "\t"; print ('0'<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < '0'	"; print "\n"; print ++$i; print "\t"; print ('0'<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array()	"; print "\n"; print ++$i; print "\t"; print ('0'<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'0' < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/966.php b/hphp/test/slow/comparisons/966.php
index cd4a895c0..ccb62ec00 100644
--- a/hphp/test/slow/comparisons/966.php
+++ b/hphp/test/slow/comparisons/966.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < true	"; print "\n"; print ++$i; print "\t"; print ('-1'<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < false	"; print "\n"; print ++$i; print "\t"; print ('-1'<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < 1	"; print "\n"; print ++$i; print "\t"; print ('-1'<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < 0	"; print "\n"; print ++$i; print "\t"; print ('-1'<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < -1	"; print "\n"; print ++$i; print "\t"; print ('-1'<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array()	"; print "\n"; print ++$i; print "\t"; print ('-1'<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'-1' < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/967.php b/hphp/test/slow/comparisons/967.php
index ee2874f71..e4811f462 100644
--- a/hphp/test/slow/comparisons/967.php
+++ b/hphp/test/slow/comparisons/967.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < true	"; print "\n"; print ++$i; print "\t"; print (nullptr<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < false	"; print "\n"; print ++$i; print "\t"; print (nullptr<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < 1	"; print "\n"; print ++$i; print "\t"; print (nullptr<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < 0	"; print "\n"; print ++$i; print "\t"; print (nullptr<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < -1	"; print "\n"; print ++$i; print "\t"; print (nullptr<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array()	"; print "\n"; print ++$i; print "\t"; print (nullptr<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "nullptr < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/968.php b/hphp/test/slow/comparisons/968.php
index e1be03efb..9f7b63ac8 100644
--- a/hphp/test/slow/comparisons/968.php
+++ b/hphp/test/slow/comparisons/968.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < true	"; print "\n"; print ++$i; print "\t"; print (array()<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < false	"; print "\n"; print ++$i; print "\t"; print (array()<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < 1	"; print "\n"; print ++$i; print "\t"; print (array()<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < 0	"; print "\n"; print ++$i; print "\t"; print (array()<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < -1	"; print "\n"; print ++$i; print "\t"; print (array()<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < '1'	"; print "\n"; print ++$i; print "\t"; print (array()<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < '0'	"; print "\n"; print ++$i; print "\t"; print (array()<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < '-1'	"; print "\n"; print ++$i; print "\t"; print (array()<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < nullptr	"; print "\n"; print ++$i; print "\t"; print (array()<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array()	"; print "\n"; print ++$i; print "\t"; print (array()<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array(1)	"; print "\n"; print ++$i; print "\t"; print (array()<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array(2)	"; print "\n"; print ++$i; print "\t"; print (array()<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array('1')	"; print "\n"; print ++$i; print "\t"; print (array()<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array('a')	"; print "\n"; print ++$i; print "\t"; print (array()<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < 'php'	"; print "\n"; print ++$i; print "\t"; print (array()<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array() < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/969.php b/hphp/test/slow/comparisons/969.php
index b96eca184..7357b3107 100644
--- a/hphp/test/slow/comparisons/969.php
+++ b/hphp/test/slow/comparisons/969.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < true	"; print "\n"; print ++$i; print "\t"; print (array(1)<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < false	"; print "\n"; print ++$i; print "\t"; print (array(1)<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < 1	"; print "\n"; print ++$i; print "\t"; print (array(1)<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < 0	"; print "\n"; print ++$i; print "\t"; print (array(1)<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < -1	"; print "\n"; print ++$i; print "\t"; print (array(1)<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array()	"; print "\n"; print ++$i; print "\t"; print (array(1)<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(1) < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/970.php b/hphp/test/slow/comparisons/970.php
index 7b7371dae..129c7e039 100644
--- a/hphp/test/slow/comparisons/970.php
+++ b/hphp/test/slow/comparisons/970.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < true	"; print "\n"; print ++$i; print "\t"; print (array(2)<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < false	"; print "\n"; print ++$i; print "\t"; print (array(2)<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < 1	"; print "\n"; print ++$i; print "\t"; print (array(2)<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < 0	"; print "\n"; print ++$i; print "\t"; print (array(2)<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < -1	"; print "\n"; print ++$i; print "\t"; print (array(2)<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array()	"; print "\n"; print ++$i; print "\t"; print (array(2)<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(2) < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/971.php b/hphp/test/slow/comparisons/971.php
index cbf3d5ee7..700326366 100644
--- a/hphp/test/slow/comparisons/971.php
+++ b/hphp/test/slow/comparisons/971.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < true	"; print "\n"; print ++$i; print "\t"; print (array('1')<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < false	"; print "\n"; print ++$i; print "\t"; print (array('1')<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < 1	"; print "\n"; print ++$i; print "\t"; print (array('1')<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < 0	"; print "\n"; print ++$i; print "\t"; print (array('1')<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < -1	"; print "\n"; print ++$i; print "\t"; print (array('1')<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array()	"; print "\n"; print ++$i; print "\t"; print (array('1')<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('1') < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/972.php b/hphp/test/slow/comparisons/972.php
index abe61d499..6b5b98507 100644
--- a/hphp/test/slow/comparisons/972.php
+++ b/hphp/test/slow/comparisons/972.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/973.php b/hphp/test/slow/comparisons/973.php
index 182d0f6e8..4f37d9613 100644
--- a/hphp/test/slow/comparisons/973.php
+++ b/hphp/test/slow/comparisons/973.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < true	"; print "\n"; print ++$i; print "\t"; print (array('a')<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < false	"; print "\n"; print ++$i; print "\t"; print (array('a')<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < 1	"; print "\n"; print ++$i; print "\t"; print (array('a')<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < 0	"; print "\n"; print ++$i; print "\t"; print (array('a')<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < -1	"; print "\n"; print ++$i; print "\t"; print (array('a')<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array()	"; print "\n"; print ++$i; print "\t"; print (array('a')<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a') < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/974.php b/hphp/test/slow/comparisons/974.php
index f37c691f0..c312ef5c7 100644
--- a/hphp/test/slow/comparisons/974.php
+++ b/hphp/test/slow/comparisons/974.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/975.php b/hphp/test/slow/comparisons/975.php
index d8004739f..7cf993b05 100644
--- a/hphp/test/slow/comparisons/975.php
+++ b/hphp/test/slow/comparisons/975.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/976.php b/hphp/test/slow/comparisons/976.php
index 9e622c84d..309114095 100644
--- a/hphp/test/slow/comparisons/976.php
+++ b/hphp/test/slow/comparisons/976.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/977.php b/hphp/test/slow/comparisons/977.php
index d923881d5..cd911a38f 100644
--- a/hphp/test/slow/comparisons/977.php
+++ b/hphp/test/slow/comparisons/977.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('a' => 1))<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < true	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < false	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < 1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < 0	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < -1	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array()	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('a' => 1))<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('a' => 1)); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('a' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('a' => 1)) < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('a' => 1))<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('a' => 1));
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('a' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('a' => 1)) < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/978.php b/hphp/test/slow/comparisons/978.php
index 5ce51f4b7..30742b1ef 100644
--- a/hphp/test/slow/comparisons/978.php
+++ b/hphp/test/slow/comparisons/978.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(array('b' => 1))<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < true	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < false	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < 1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < 0	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < -1	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < '1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < '0'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < '-1'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < nullptr	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array()	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array(1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array(2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array('1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array('a')	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < 'php'	"; print "\n"; print ++$i; print "\t"; print (array(array('b' => 1))<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(array('b' => 1)); print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(array('b' => 1))<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "array(array('b' => 1)) < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(array('b' => 1))<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(array('b' => 1));
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(array('b' => 1))<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(array('b' => 1)) < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/979.php b/hphp/test/slow/comparisons/979.php
index 789e8e5f1..2702a750d 100644
--- a/hphp/test/slow/comparisons/979.php
+++ b/hphp/test/slow/comparisons/979.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('php'<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < true	"; print "\n"; print ++$i; print "\t"; print ('php'<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < false	"; print "\n"; print ++$i; print "\t"; print ('php'<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < 1	"; print "\n"; print ++$i; print "\t"; print ('php'<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < 0	"; print "\n"; print ++$i; print "\t"; print ('php'<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < -1	"; print "\n"; print ++$i; print "\t"; print ('php'<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < '1'	"; print "\n"; print ++$i; print "\t"; print ('php'<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < '0'	"; print "\n"; print ++$i; print "\t"; print ('php'<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < '-1'	"; print "\n"; print ++$i; print "\t"; print ('php'<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < nullptr	"; print "\n"; print ++$i; print "\t"; print ('php'<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array()	"; print "\n"; print ++$i; print "\t"; print ('php'<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array(1)	"; print "\n"; print ++$i; print "\t"; print ('php'<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array(2)	"; print "\n"; print ++$i; print "\t"; print ('php'<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array('1')	"; print "\n"; print ++$i; print "\t"; print ('php'<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('php'<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array('a')	"; print "\n"; print ++$i; print "\t"; print ('php'<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('php'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('php'<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('php'<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < 'php'	"; print "\n"; print ++$i; print "\t"; print ('php'<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 'php'; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('php'<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'php' < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('php'<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('php'<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 'php';
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('php'<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'php' < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/980.php b/hphp/test/slow/comparisons/980.php
index 1ec354bb8..cc06094d8 100644
--- a/hphp/test/slow/comparisons/980.php
+++ b/hphp/test/slow/comparisons/980.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (''<true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < true	"; print "\n"; print ++$i; print "\t"; print (''<false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < false	"; print "\n"; print ++$i; print "\t"; print (''<1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < 1	"; print "\n"; print ++$i; print "\t"; print (''<0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < 0	"; print "\n"; print ++$i; print "\t"; print (''<-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < -1	"; print "\n"; print ++$i; print "\t"; print (''<'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < '1'	"; print "\n"; print ++$i; print "\t"; print (''<'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < '0'	"; print "\n"; print ++$i; print "\t"; print (''<'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < '-1'	"; print "\n"; print ++$i; print "\t"; print (''<nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < nullptr	"; print "\n"; print ++$i; print "\t"; print (''<array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array()	"; print "\n"; print ++$i; print "\t"; print (''<array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array(1)	"; print "\n"; print ++$i; print "\t"; print (''<array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array(2)	"; print "\n"; print ++$i; print "\t"; print (''<array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array('1')	"; print "\n"; print ++$i; print "\t"; print (''<array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (''<array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array('a')	"; print "\n"; print ++$i; print "\t"; print (''<array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (''<array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (''<array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (''<array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (''<array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (''<'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < 'php'	"; print "\n"; print ++$i; print "\t"; print (''<'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = ''; print ($a <'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (''<$b) ? 'Y' : 'N'; print ($a <$b) ? 'Y' : 'N'; print "\t"; print "'' < ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (''<true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (''<'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '';
+ print ($a <'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (''<$b) ? 'Y' : 'N';
+ print ($a <$b) ? 'Y' : 'N';
+ print "\t";
+ print "'' < ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/981.php b/hphp/test/slow/comparisons/981.php
index d304d9ec4..c49235606 100644
--- a/hphp/test/slow/comparisons/981.php
+++ b/hphp/test/slow/comparisons/981.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1.2'>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > true	"; print "\n"; print ++$i; print "\t"; print ('1.2'>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > false	"; print "\n"; print ++$i; print "\t"; print ('1.2'>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > 1	"; print "\n"; print ++$i; print "\t"; print ('1.2'>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > 0	"; print "\n"; print ++$i; print "\t"; print ('1.2'>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > -1	"; print "\n"; print ++$i; print "\t"; print ('1.2'>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > '1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > '0'	"; print "\n"; print ++$i; print "\t"; print ('1.2'>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > '-1'	"; print "\n"; print ++$i; print "\t"; print ('1.2'>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > nullptr	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array()	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array(1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array(2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array('1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array('a')	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1.2'>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > 'php'	"; print "\n"; print ++$i; print "\t"; print ('1.2'>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1.2'; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1.2'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1.2' > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1.2'>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1.2'>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1.2';
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1.2'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1.2' > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/982.php b/hphp/test/slow/comparisons/982.php
index 80b4d2e22..3bf2c9057 100644
--- a/hphp/test/slow/comparisons/982.php
+++ b/hphp/test/slow/comparisons/982.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (true>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > true	"; print "\n"; print ++$i; print "\t"; print (true>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > false	"; print "\n"; print ++$i; print "\t"; print (true>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > 1	"; print "\n"; print ++$i; print "\t"; print (true>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > 0	"; print "\n"; print ++$i; print "\t"; print (true>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > -1	"; print "\n"; print ++$i; print "\t"; print (true>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > '1'	"; print "\n"; print ++$i; print "\t"; print (true>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > '0'	"; print "\n"; print ++$i; print "\t"; print (true>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > '-1'	"; print "\n"; print ++$i; print "\t"; print (true>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > nullptr	"; print "\n"; print ++$i; print "\t"; print (true>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array()	"; print "\n"; print ++$i; print "\t"; print (true>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array(1)	"; print "\n"; print ++$i; print "\t"; print (true>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array(2)	"; print "\n"; print ++$i; print "\t"; print (true>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array('1')	"; print "\n"; print ++$i; print "\t"; print (true>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (true>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array('a')	"; print "\n"; print ++$i; print "\t"; print (true>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (true>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (true>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (true>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (true>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (true>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > 'php'	"; print "\n"; print ++$i; print "\t"; print (true>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = true; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (true>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "true > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (true>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (true>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = true;
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (true>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "true > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/983.php b/hphp/test/slow/comparisons/983.php
index 1c93613e5..dec58eca1 100644
--- a/hphp/test/slow/comparisons/983.php
+++ b/hphp/test/slow/comparisons/983.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (false>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > true	"; print "\n"; print ++$i; print "\t"; print (false>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > false	"; print "\n"; print ++$i; print "\t"; print (false>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > 1	"; print "\n"; print ++$i; print "\t"; print (false>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > 0	"; print "\n"; print ++$i; print "\t"; print (false>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > -1	"; print "\n"; print ++$i; print "\t"; print (false>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > '1'	"; print "\n"; print ++$i; print "\t"; print (false>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > '0'	"; print "\n"; print ++$i; print "\t"; print (false>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > '-1'	"; print "\n"; print ++$i; print "\t"; print (false>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > nullptr	"; print "\n"; print ++$i; print "\t"; print (false>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array()	"; print "\n"; print ++$i; print "\t"; print (false>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array(1)	"; print "\n"; print ++$i; print "\t"; print (false>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array(2)	"; print "\n"; print ++$i; print "\t"; print (false>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array('1')	"; print "\n"; print ++$i; print "\t"; print (false>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (false>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array('a')	"; print "\n"; print ++$i; print "\t"; print (false>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (false>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (false>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (false>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (false>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (false>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > 'php'	"; print "\n"; print ++$i; print "\t"; print (false>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = false; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (false>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "false > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (false>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (false>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = false;
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (false>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "false > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/984.php b/hphp/test/slow/comparisons/984.php
index 67b49a55e..df81a1cce 100644
--- a/hphp/test/slow/comparisons/984.php
+++ b/hphp/test/slow/comparisons/984.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (1>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > true	"; print "\n"; print ++$i; print "\t"; print (1>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > false	"; print "\n"; print ++$i; print "\t"; print (1>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > 1	"; print "\n"; print ++$i; print "\t"; print (1>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > 0	"; print "\n"; print ++$i; print "\t"; print (1>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > -1	"; print "\n"; print ++$i; print "\t"; print (1>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > '1'	"; print "\n"; print ++$i; print "\t"; print (1>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > '0'	"; print "\n"; print ++$i; print "\t"; print (1>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > '-1'	"; print "\n"; print ++$i; print "\t"; print (1>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > nullptr	"; print "\n"; print ++$i; print "\t"; print (1>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array()	"; print "\n"; print ++$i; print "\t"; print (1>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array(1)	"; print "\n"; print ++$i; print "\t"; print (1>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array(2)	"; print "\n"; print ++$i; print "\t"; print (1>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array('1')	"; print "\n"; print ++$i; print "\t"; print (1>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (1>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array('a')	"; print "\n"; print ++$i; print "\t"; print (1>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (1>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (1>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (1>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (1>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (1>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > 'php'	"; print "\n"; print ++$i; print "\t"; print (1>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 1; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "1 > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (1>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (1>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 1;
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "1 > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/985.php b/hphp/test/slow/comparisons/985.php
index eaf66cd37..5811c3212 100644
--- a/hphp/test/slow/comparisons/985.php
+++ b/hphp/test/slow/comparisons/985.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (0>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > true	"; print "\n"; print ++$i; print "\t"; print (0>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > false	"; print "\n"; print ++$i; print "\t"; print (0>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > 1	"; print "\n"; print ++$i; print "\t"; print (0>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > 0	"; print "\n"; print ++$i; print "\t"; print (0>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > -1	"; print "\n"; print ++$i; print "\t"; print (0>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > '1'	"; print "\n"; print ++$i; print "\t"; print (0>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > '0'	"; print "\n"; print ++$i; print "\t"; print (0>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > '-1'	"; print "\n"; print ++$i; print "\t"; print (0>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > nullptr	"; print "\n"; print ++$i; print "\t"; print (0>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array()	"; print "\n"; print ++$i; print "\t"; print (0>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array(1)	"; print "\n"; print ++$i; print "\t"; print (0>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array(2)	"; print "\n"; print ++$i; print "\t"; print (0>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array('1')	"; print "\n"; print ++$i; print "\t"; print (0>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (0>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array('a')	"; print "\n"; print ++$i; print "\t"; print (0>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (0>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (0>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (0>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (0>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (0>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > 'php'	"; print "\n"; print ++$i; print "\t"; print (0>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = 0; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (0>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "0 > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (0>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (0>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = 0;
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (0>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "0 > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/986.php b/hphp/test/slow/comparisons/986.php
index b9cda737c..56754362b 100644
--- a/hphp/test/slow/comparisons/986.php
+++ b/hphp/test/slow/comparisons/986.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (-1>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > true	"; print "\n"; print ++$i; print "\t"; print (-1>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > false	"; print "\n"; print ++$i; print "\t"; print (-1>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > 1	"; print "\n"; print ++$i; print "\t"; print (-1>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > 0	"; print "\n"; print ++$i; print "\t"; print (-1>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > -1	"; print "\n"; print ++$i; print "\t"; print (-1>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > '1'	"; print "\n"; print ++$i; print "\t"; print (-1>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > '0'	"; print "\n"; print ++$i; print "\t"; print (-1>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > '-1'	"; print "\n"; print ++$i; print "\t"; print (-1>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > nullptr	"; print "\n"; print ++$i; print "\t"; print (-1>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array()	"; print "\n"; print ++$i; print "\t"; print (-1>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array(1)	"; print "\n"; print ++$i; print "\t"; print (-1>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array(2)	"; print "\n"; print ++$i; print "\t"; print (-1>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array('1')	"; print "\n"; print ++$i; print "\t"; print (-1>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (-1>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array('a')	"; print "\n"; print ++$i; print "\t"; print (-1>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (-1>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (-1>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (-1>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > 'php'	"; print "\n"; print ++$i; print "\t"; print (-1>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = -1; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (-1>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "-1 > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (-1>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (-1>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = -1;
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (-1>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "-1 > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/987.php b/hphp/test/slow/comparisons/987.php
index 11181f55f..4861c5799 100644
--- a/hphp/test/slow/comparisons/987.php
+++ b/hphp/test/slow/comparisons/987.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('1'>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > true	"; print "\n"; print ++$i; print "\t"; print ('1'>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > false	"; print "\n"; print ++$i; print "\t"; print ('1'>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > 1	"; print "\n"; print ++$i; print "\t"; print ('1'>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > 0	"; print "\n"; print ++$i; print "\t"; print ('1'>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > -1	"; print "\n"; print ++$i; print "\t"; print ('1'>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > '1'	"; print "\n"; print ++$i; print "\t"; print ('1'>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > '0'	"; print "\n"; print ++$i; print "\t"; print ('1'>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > '-1'	"; print "\n"; print ++$i; print "\t"; print ('1'>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > nullptr	"; print "\n"; print ++$i; print "\t"; print ('1'>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array()	"; print "\n"; print ++$i; print "\t"; print ('1'>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array(1)	"; print "\n"; print ++$i; print "\t"; print ('1'>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array(2)	"; print "\n"; print ++$i; print "\t"; print ('1'>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array('1')	"; print "\n"; print ++$i; print "\t"; print ('1'>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('1'>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array('a')	"; print "\n"; print ++$i; print "\t"; print ('1'>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('1'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('1'>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('1'>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > 'php'	"; print "\n"; print ++$i; print "\t"; print ('1'>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '1'; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'1' > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('1'>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('1'>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '1';
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'1' > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/988.php b/hphp/test/slow/comparisons/988.php
index ed776d7f8..a6f29d7cf 100644
--- a/hphp/test/slow/comparisons/988.php
+++ b/hphp/test/slow/comparisons/988.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('0'>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > true	"; print "\n"; print ++$i; print "\t"; print ('0'>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > false	"; print "\n"; print ++$i; print "\t"; print ('0'>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > 1	"; print "\n"; print ++$i; print "\t"; print ('0'>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > 0	"; print "\n"; print ++$i; print "\t"; print ('0'>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > -1	"; print "\n"; print ++$i; print "\t"; print ('0'>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > '1'	"; print "\n"; print ++$i; print "\t"; print ('0'>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > '0'	"; print "\n"; print ++$i; print "\t"; print ('0'>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > '-1'	"; print "\n"; print ++$i; print "\t"; print ('0'>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > nullptr	"; print "\n"; print ++$i; print "\t"; print ('0'>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array()	"; print "\n"; print ++$i; print "\t"; print ('0'>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array(1)	"; print "\n"; print ++$i; print "\t"; print ('0'>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array(2)	"; print "\n"; print ++$i; print "\t"; print ('0'>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array('1')	"; print "\n"; print ++$i; print "\t"; print ('0'>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('0'>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array('a')	"; print "\n"; print ++$i; print "\t"; print ('0'>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('0'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('0'>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('0'>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > 'php'	"; print "\n"; print ++$i; print "\t"; print ('0'>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '0'; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('0'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'0' > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('0'>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('0'>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '0';
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('0'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'0' > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/989.php b/hphp/test/slow/comparisons/989.php
index 83e796108..0371e36ac 100644
--- a/hphp/test/slow/comparisons/989.php
+++ b/hphp/test/slow/comparisons/989.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print ('-1'>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > true	"; print "\n"; print ++$i; print "\t"; print ('-1'>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > false	"; print "\n"; print ++$i; print "\t"; print ('-1'>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > 1	"; print "\n"; print ++$i; print "\t"; print ('-1'>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > 0	"; print "\n"; print ++$i; print "\t"; print ('-1'>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > -1	"; print "\n"; print ++$i; print "\t"; print ('-1'>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > '1'	"; print "\n"; print ++$i; print "\t"; print ('-1'>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > '0'	"; print "\n"; print ++$i; print "\t"; print ('-1'>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > '-1'	"; print "\n"; print ++$i; print "\t"; print ('-1'>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > nullptr	"; print "\n"; print ++$i; print "\t"; print ('-1'>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array()	"; print "\n"; print ++$i; print "\t"; print ('-1'>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array(1)	"; print "\n"; print ++$i; print "\t"; print ('-1'>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array(2)	"; print "\n"; print ++$i; print "\t"; print ('-1'>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array('1')	"; print "\n"; print ++$i; print "\t"; print ('-1'>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print ('-1'>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array('a')	"; print "\n"; print ++$i; print "\t"; print ('-1'>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print ('-1'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print ('-1'>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print ('-1'>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > 'php'	"; print "\n"; print ++$i; print "\t"; print ('-1'>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = '-1'; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print ('-1'>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "'-1' > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print ('-1'>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print ('-1'>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = '-1';
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print ('-1'>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "'-1' > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/990.php b/hphp/test/slow/comparisons/990.php
index 5d4235c39..38817c3d0 100644
--- a/hphp/test/slow/comparisons/990.php
+++ b/hphp/test/slow/comparisons/990.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (nullptr>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > true	"; print "\n"; print ++$i; print "\t"; print (nullptr>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > false	"; print "\n"; print ++$i; print "\t"; print (nullptr>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > 1	"; print "\n"; print ++$i; print "\t"; print (nullptr>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > 0	"; print "\n"; print ++$i; print "\t"; print (nullptr>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > -1	"; print "\n"; print ++$i; print "\t"; print (nullptr>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > '1'	"; print "\n"; print ++$i; print "\t"; print (nullptr>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > '0'	"; print "\n"; print ++$i; print "\t"; print (nullptr>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > '-1'	"; print "\n"; print ++$i; print "\t"; print (nullptr>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > nullptr	"; print "\n"; print ++$i; print "\t"; print (nullptr>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array()	"; print "\n"; print ++$i; print "\t"; print (nullptr>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array(1)	"; print "\n"; print ++$i; print "\t"; print (nullptr>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array(2)	"; print "\n"; print ++$i; print "\t"; print (nullptr>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array('1')	"; print "\n"; print ++$i; print "\t"; print (nullptr>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (nullptr>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array('a')	"; print "\n"; print ++$i; print "\t"; print (nullptr>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (nullptr>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (nullptr>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (nullptr>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > 'php'	"; print "\n"; print ++$i; print "\t"; print (nullptr>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = nullptr; print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (nullptr>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "nullptr > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (nullptr>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (nullptr>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = nullptr;
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (nullptr>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "nullptr > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/991.php b/hphp/test/slow/comparisons/991.php
index 298ee1a3e..0bab33dee 100644
--- a/hphp/test/slow/comparisons/991.php
+++ b/hphp/test/slow/comparisons/991.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array()>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > true	"; print "\n"; print ++$i; print "\t"; print (array()>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > false	"; print "\n"; print ++$i; print "\t"; print (array()>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > 1	"; print "\n"; print ++$i; print "\t"; print (array()>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > 0	"; print "\n"; print ++$i; print "\t"; print (array()>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > -1	"; print "\n"; print ++$i; print "\t"; print (array()>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > '1'	"; print "\n"; print ++$i; print "\t"; print (array()>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > '0'	"; print "\n"; print ++$i; print "\t"; print (array()>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > '-1'	"; print "\n"; print ++$i; print "\t"; print (array()>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > nullptr	"; print "\n"; print ++$i; print "\t"; print (array()>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array()	"; print "\n"; print ++$i; print "\t"; print (array()>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array(1)	"; print "\n"; print ++$i; print "\t"; print (array()>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array(2)	"; print "\n"; print ++$i; print "\t"; print (array()>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array('1')	"; print "\n"; print ++$i; print "\t"; print (array()>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array()>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array('a')	"; print "\n"; print ++$i; print "\t"; print (array()>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array()>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array()>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array()>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > 'php'	"; print "\n"; print ++$i; print "\t"; print (array()>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array()>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array() > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array()>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array()>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array();
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array()>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array() > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/992.php b/hphp/test/slow/comparisons/992.php
index 39161ba7e..50c08d272 100644
--- a/hphp/test/slow/comparisons/992.php
+++ b/hphp/test/slow/comparisons/992.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(1)>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > true	"; print "\n"; print ++$i; print "\t"; print (array(1)>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > false	"; print "\n"; print ++$i; print "\t"; print (array(1)>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > 1	"; print "\n"; print ++$i; print "\t"; print (array(1)>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > 0	"; print "\n"; print ++$i; print "\t"; print (array(1)>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > -1	"; print "\n"; print ++$i; print "\t"; print (array(1)>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > '1'	"; print "\n"; print ++$i; print "\t"; print (array(1)>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > '0'	"; print "\n"; print ++$i; print "\t"; print (array(1)>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > '-1'	"; print "\n"; print ++$i; print "\t"; print (array(1)>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > nullptr	"; print "\n"; print ++$i; print "\t"; print (array(1)>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array()	"; print "\n"; print ++$i; print "\t"; print (array(1)>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array(1)	"; print "\n"; print ++$i; print "\t"; print (array(1)>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array(2)	"; print "\n"; print ++$i; print "\t"; print (array(1)>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array('1')	"; print "\n"; print ++$i; print "\t"; print (array(1)>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(1)>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array('a')	"; print "\n"; print ++$i; print "\t"; print (array(1)>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(1)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(1)>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(1)>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > 'php'	"; print "\n"; print ++$i; print "\t"; print (array(1)>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(1); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(1) > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(1)>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(1)>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(1);
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(1) > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/993.php b/hphp/test/slow/comparisons/993.php
index 59516d5b1..65a481a12 100644
--- a/hphp/test/slow/comparisons/993.php
+++ b/hphp/test/slow/comparisons/993.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array(2)>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > true	"; print "\n"; print ++$i; print "\t"; print (array(2)>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > false	"; print "\n"; print ++$i; print "\t"; print (array(2)>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > 1	"; print "\n"; print ++$i; print "\t"; print (array(2)>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > 0	"; print "\n"; print ++$i; print "\t"; print (array(2)>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > -1	"; print "\n"; print ++$i; print "\t"; print (array(2)>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > '1'	"; print "\n"; print ++$i; print "\t"; print (array(2)>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > '0'	"; print "\n"; print ++$i; print "\t"; print (array(2)>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > '-1'	"; print "\n"; print ++$i; print "\t"; print (array(2)>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > nullptr	"; print "\n"; print ++$i; print "\t"; print (array(2)>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array()	"; print "\n"; print ++$i; print "\t"; print (array(2)>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array(1)	"; print "\n"; print ++$i; print "\t"; print (array(2)>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array(2)	"; print "\n"; print ++$i; print "\t"; print (array(2)>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array('1')	"; print "\n"; print ++$i; print "\t"; print (array(2)>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array(2)>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array('a')	"; print "\n"; print ++$i; print "\t"; print (array(2)>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array(2)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array(2)>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array(2)>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > 'php'	"; print "\n"; print ++$i; print "\t"; print (array(2)>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array(2); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array(2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array(2) > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array(2)>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array(2)>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array(2);
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array(2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array(2) > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/994.php b/hphp/test/slow/comparisons/994.php
index 61bfbb2ab..e58d15ca6 100644
--- a/hphp/test/slow/comparisons/994.php
+++ b/hphp/test/slow/comparisons/994.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('1')>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > true	"; print "\n"; print ++$i; print "\t"; print (array('1')>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > false	"; print "\n"; print ++$i; print "\t"; print (array('1')>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > 1	"; print "\n"; print ++$i; print "\t"; print (array('1')>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > 0	"; print "\n"; print ++$i; print "\t"; print (array('1')>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > -1	"; print "\n"; print ++$i; print "\t"; print (array('1')>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > '1'	"; print "\n"; print ++$i; print "\t"; print (array('1')>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > '0'	"; print "\n"; print ++$i; print "\t"; print (array('1')>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > '-1'	"; print "\n"; print ++$i; print "\t"; print (array('1')>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > nullptr	"; print "\n"; print ++$i; print "\t"; print (array('1')>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array()	"; print "\n"; print ++$i; print "\t"; print (array('1')>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array(1)	"; print "\n"; print ++$i; print "\t"; print (array('1')>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array(2)	"; print "\n"; print ++$i; print "\t"; print (array('1')>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array('1')	"; print "\n"; print ++$i; print "\t"; print (array('1')>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('1')>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array('a')	"; print "\n"; print ++$i; print "\t"; print (array('1')>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('1')>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('1')>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('1')>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > 'php'	"; print "\n"; print ++$i; print "\t"; print (array('1')>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('1'); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('1') > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('1')>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('1')>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('1');
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('1') > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/995.php b/hphp/test/slow/comparisons/995.php
index 6a8036af6..bc22b2a89 100644
--- a/hphp/test/slow/comparisons/995.php
+++ b/hphp/test/slow/comparisons/995.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('0' => '1')>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > true	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > false	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > 1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > 0	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > -1	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > '1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > '0'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > '-1'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > nullptr	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array()	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array(1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array(2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array('1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array('a')	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > 'php'	"; print "\n"; print ++$i; print "\t"; print (array('0' => '1')>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('0' => '1'); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('0' => '1')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('0' => '1') > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('0' => '1')>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('0' => '1');
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('0' => '1')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('0' => '1') > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/996.php b/hphp/test/slow/comparisons/996.php
index a3f7da459..8838dc5c2 100644
--- a/hphp/test/slow/comparisons/996.php
+++ b/hphp/test/slow/comparisons/996.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a')>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > true	"; print "\n"; print ++$i; print "\t"; print (array('a')>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > false	"; print "\n"; print ++$i; print "\t"; print (array('a')>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > 1	"; print "\n"; print ++$i; print "\t"; print (array('a')>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > 0	"; print "\n"; print ++$i; print "\t"; print (array('a')>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > -1	"; print "\n"; print ++$i; print "\t"; print (array('a')>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > '1'	"; print "\n"; print ++$i; print "\t"; print (array('a')>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > '0'	"; print "\n"; print ++$i; print "\t"; print (array('a')>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a')>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a')>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array()	"; print "\n"; print ++$i; print "\t"; print (array('a')>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a')>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a')>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a')>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a')>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a')>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a')>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a')>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a')>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a')>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a'); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a')>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a') > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a')>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a')>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a');
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a')>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a') > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/997.php b/hphp/test/slow/comparisons/997.php
index 824f1a044..fd7eccfbb 100644
--- a/hphp/test/slow/comparisons/997.php
+++ b/hphp/test/slow/comparisons/997.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1)>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1)>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1) > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1)>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1);
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1) > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/998.php b/hphp/test/slow/comparisons/998.php
index 10b069447..3512c863b 100644
--- a/hphp/test/slow/comparisons/998.php
+++ b/hphp/test/slow/comparisons/998.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('b' => 1)>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > true	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > false	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > 1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > 0	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > -1	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > '1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > '0'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > '-1'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > nullptr	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array()	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array(1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array(2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array('1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array('a')	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > 'php'	"; print "\n"; print ++$i; print "\t"; print (array('b' => 1)>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('b' => 1); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('b' => 1)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('b' => 1) > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('b' => 1)>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('b' => 1);
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('b' => 1)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('b' => 1) > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/comparisons/999.php b/hphp/test/slow/comparisons/999.php
index b67460bdb..57c19bde7 100644
--- a/hphp/test/slow/comparisons/999.php
+++ b/hphp/test/slow/comparisons/999.php
@@ -1,3 +1,334 @@
 <?php
 
- $i = 0; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>true) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >true) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = true; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > true	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>false) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >false) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = false; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > false	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 1; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > 1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>0) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >0) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 0; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > 0	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>-1) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >-1) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = -1; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > -1	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>'1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >'1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '1'; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > '1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>'0') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >'0') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '0'; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > '0'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>'-1') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >'-1') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = '-1'; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > '-1'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>nullptr) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >nullptr) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = nullptr; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > nullptr	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array()) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array()) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array()	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array(1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array(1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(1); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array(1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array(2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array(2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(2); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array(2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array('1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array('1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('1'); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array('1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array('0' => '1')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array('0' => '1')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('0' => '1'); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array('0' => '1')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array('a')) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array('a')) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a'); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array('a')	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array('a' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array('a' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array('a' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array('b' => 1)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array('b' => 1)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('b' => 1); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array('b' => 1)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array('a' => 1, 'b' => 2); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array('a' => 1, 'b' => 2)	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array(array('a' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array(array('a' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('a' => 1)); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array(array('a' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>array(array('b' => 1))) ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >array(array('b' => 1))) ? 'Y' : 'N'; $b = 1; $b = 't'; $b = array(array('b' => 1)); print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > array(array('b' => 1))	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>'php') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >'php') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = 'php'; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > 'php'	"; print "\n"; print ++$i; print "\t"; print (array('a' => 1, 'b' => 2)>'') ? 'Y' : 'N'; $a = 1; $a = 't'; $a = array('a' => 1, 'b' => 2); print ($a >'') ? 'Y' : 'N'; $b = 1; $b = 't'; $b = ''; print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N'; print ($a >$b) ? 'Y' : 'N'; print "\t"; print "array('a' => 1, 'b' => 2) > ''	"; print "\n"; 
\ No newline at end of file
+$i = 0;
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>true) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >true) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = true;
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > true	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>false) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >false) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = false;
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > false	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 1;
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > 1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>0) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >0) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 0;
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > 0	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>-1) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >-1) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = -1;
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > -1	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>'1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >'1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '1';
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > '1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>'0') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >'0') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '0';
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > '0'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>'-1') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >'-1') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '-1';
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > '-1'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>nullptr) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >nullptr) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = nullptr;
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > nullptr	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array()) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array()) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array();
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array()	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array(1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array(1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(1);
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array(1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array(2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array(2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(2);
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array(2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array('1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array('1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('1');
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array('1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array('0' => '1')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array('0' => '1')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('0' => '1');
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array('0' => '1')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array('a')) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array('a')) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a');
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array('a')	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array('a' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array('a' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1);
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array('a' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array('b' => 1)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array('b' => 1)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('b' => 1);
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array('b' => 1)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array('a' => 1, 'b' => 2)) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array('a' => 1, 'b' => 2);
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array('a' => 1, 'b' => 2)	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array(array('a' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array(array('a' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('a' => 1));
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array(array('a' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>array(array('b' => 1))) ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >array(array('b' => 1))) ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = array(array('b' => 1));
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > array(array('b' => 1))	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>'php') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >'php') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = 'php';
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > 'php'	";
+ print "\n";
+ print ++$i;
+ print "\t";
+ print (array('a' => 1, 'b' => 2)>'') ? 'Y' : 'N';
+ $a = 1;
+ $a = 't';
+ $a = array('a' => 1, 'b' => 2);
+ print ($a >'') ? 'Y' : 'N';
+ $b = 1;
+ $b = 't';
+ $b = '';
+ print (array('a' => 1, 'b' => 2)>$b) ? 'Y' : 'N';
+ print ($a >$b) ? 'Y' : 'N';
+ print "\t";
+ print "array('a' => 1, 'b' => 2) > ''	";
+ print "\n";
+
diff --git a/hphp/test/slow/compilation/1237.php b/hphp/test/slow/compilation/1237.php
index bab6bfc62..211a1eb35 100644
--- a/hphp/test/slow/compilation/1237.php
+++ b/hphp/test/slow/compilation/1237.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { public static $foo = 123;} $a = foo(); function foo() { return 'foo';} var_dump(A::$$a);
\ No newline at end of file
+class A {
+ public static $foo = 123;
+}
+ $a = foo();
+ function foo() {
+ return 'foo';
+}
+ var_dump(A::$$a);
diff --git a/hphp/test/slow/compilation/1238.php b/hphp/test/slow/compilation/1238.php
index ae97ab16a..6b5f73f4a 100644
--- a/hphp/test/slow/compilation/1238.php
+++ b/hphp/test/slow/compilation/1238.php
@@ -1,3 +1,4 @@
 <?php
 
- fun foo() {}
\ No newline at end of file
+fun foo() {
+}
diff --git a/hphp/test/slow/compilation/1239.php b/hphp/test/slow/compilation/1239.php
index 0feb38e60..bab4fc4ca 100644
--- a/hphp/test/slow/compilation/1239.php
+++ b/hphp/test/slow/compilation/1239.php
@@ -1,3 +1,15 @@
 <?php
 
- $a = bar(); if ($a) { class fOO {} } else { class Foo {} } function bar() { return 123;} $obj = new foo();
\ No newline at end of file
+$a = bar();
+ if ($a) {
+ class fOO {
+}
+ }
+ else {
+ class Foo {
+}
+ }
+ function bar() {
+ return 123;
+}
+ $obj = new foo();
diff --git a/hphp/test/slow/compilation/1240.php b/hphp/test/slow/compilation/1240.php
index 25664847a..ae978a093 100644
--- a/hphp/test/slow/compilation/1240.php
+++ b/hphp/test/slow/compilation/1240.php
@@ -1,3 +1,15 @@
 <?php
 
- $a = bar(); if ($a) { function fOO() {} } else { function Foo() {} } function bar() { return 123;} foo();
\ No newline at end of file
+$a = bar();
+ if ($a) {
+ function fOO() {
+}
+ }
+ else {
+ function Foo() {
+}
+ }
+ function bar() {
+ return 123;
+}
+ foo();
diff --git a/hphp/test/slow/compilation/1241.php b/hphp/test/slow/compilation/1241.php
index 3c35fc14f..95fa7cfa6 100644
--- a/hphp/test/slow/compilation/1241.php
+++ b/hphp/test/slow/compilation/1241.php
@@ -1,3 +1,9 @@
 <?php
 
- interface A {} class B implements A {} class C extends B implements A {} $obj = new C();
\ No newline at end of file
+interface A {
+}
+ class B implements A {
+}
+ class C extends B implements A {
+}
+ $obj = new C();
diff --git a/hphp/test/slow/compilation/1242.php b/hphp/test/slow/compilation/1242.php
index 9150aa549..429ed5404 100644
--- a/hphp/test/slow/compilation/1242.php
+++ b/hphp/test/slow/compilation/1242.php
@@ -1,3 +1,3 @@
 <?php
 
- print '??/';
\ No newline at end of file
+print '??/';
diff --git a/hphp/test/slow/compilation/1243.php b/hphp/test/slow/compilation/1243.php
index 9ab118874..2c2b165dc 100644
--- a/hphp/test/slow/compilation/1243.php
+++ b/hphp/test/slow/compilation/1243.php
@@ -1,3 +1,5 @@
 <?php
 
- if (false) define('a', 'test'); define('a', 5); print $b % a;
\ No newline at end of file
+if (false) define('a', 'test');
+ define('a', 5);
+ print $b % a;
diff --git a/hphp/test/slow/compilation/1244.php b/hphp/test/slow/compilation/1244.php
index 0190dcb74..2dbe863db 100644
--- a/hphp/test/slow/compilation/1244.php
+++ b/hphp/test/slow/compilation/1244.php
@@ -1,3 +1,6 @@
 <?php
 
- function d() { return '2009';} $y = (d()) + 6;
\ No newline at end of file
+function d() {
+ return '2009';
+}
+ $y = (d()) + 6;
diff --git a/hphp/test/slow/compilation/1245.php b/hphp/test/slow/compilation/1245.php
index 1a55f4b38..53c575027 100644
--- a/hphp/test/slow/compilation/1245.php
+++ b/hphp/test/slow/compilation/1245.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { public static $a = array('a', 'b'); public static function test() { self::$a[] = 'c'; var_dump(self::$a);} } A::test();
\ No newline at end of file
+class A {
+ public static $a = array('a', 'b');
+ public static function test() {
+ self::$a[] = 'c';
+ var_dump(self::$a);
+}
+ }
+ A::test();
diff --git a/hphp/test/slow/compilation/1246.php b/hphp/test/slow/compilation/1246.php
index 81f6753d0..b843347a9 100644
--- a/hphp/test/slow/compilation/1246.php
+++ b/hphp/test/slow/compilation/1246.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump("[\x][\xA][\x65][\x65D]");
\ No newline at end of file
+var_dump("[\x][\xA][\x65][\x65D]");
diff --git a/hphp/test/slow/compilation/1248.php b/hphp/test/slow/compilation/1248.php
index 9b5d26f7a..0887481b0 100644
--- a/hphp/test/slow/compilation/1248.php
+++ b/hphp/test/slow/compilation/1248.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 1; $a = 'test'; var_dump($a + 2.5);
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ var_dump($a + 2.5);
diff --git a/hphp/test/slow/compilation/1249.php b/hphp/test/slow/compilation/1249.php
index ad423e05c..ec7a54dc0 100644
--- a/hphp/test/slow/compilation/1249.php
+++ b/hphp/test/slow/compilation/1249.php
@@ -1,3 +1,3 @@
 <?php
 
- $a = -date('w');
\ No newline at end of file
+$a = -date('w');
diff --git a/hphp/test/slow/compilation/1250.php b/hphp/test/slow/compilation/1250.php
index cf1d7174c..225d50e9b 100644
--- a/hphp/test/slow/compilation/1250.php
+++ b/hphp/test/slow/compilation/1250.php
@@ -1,3 +1,12 @@
 <?php
 
- class A { public $a = array('t' => 't');} class B { public $a;} $a = 1; $a = new A(); $a->a['t'] = true; var_dump($a->a['t']);
\ No newline at end of file
+class A {
+ public $a = array('t' => 't');
+}
+ class B {
+ public $a;
+}
+ $a = 1;
+ $a = new A();
+ $a->a['t'] = true;
+ var_dump($a->a['t']);
diff --git a/hphp/test/slow/compilation/1251.php b/hphp/test/slow/compilation/1251.php
index cf85e0a6e..e7e3d6062 100644
--- a/hphp/test/slow/compilation/1251.php
+++ b/hphp/test/slow/compilation/1251.php
@@ -1,3 +1,3 @@
 <?php
 
- $a = date('d') % 10;
\ No newline at end of file
+$a = date('d') % 10;
diff --git a/hphp/test/slow/compilation/1252.php b/hphp/test/slow/compilation/1252.php
index 2c1949066..bc11c678a 100644
--- a/hphp/test/slow/compilation/1252.php
+++ b/hphp/test/slow/compilation/1252.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $a = 1; print $a % 10;
\ No newline at end of file
+$a = 'test';
+ $a = 1;
+ print $a % 10;
diff --git a/hphp/test/slow/compilation/1253.php b/hphp/test/slow/compilation/1253.php
index 7a06a1264..8b0d70683 100644
--- a/hphp/test/slow/compilation/1253.php
+++ b/hphp/test/slow/compilation/1253.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = MAX_LATITUDE + 5;if (12 > -MAX_LATITUDE) define('MAX_LATITUDE', 90); 
\ No newline at end of file
+$a = MAX_LATITUDE + 5;
+if (12 > -MAX_LATITUDE) define('MAX_LATITUDE', 90);
+
diff --git a/hphp/test/slow/compilation/1254.php b/hphp/test/slow/compilation/1254.php
index 0f2490fdc..ab9ae2da0 100644
--- a/hphp/test/slow/compilation/1254.php
+++ b/hphp/test/slow/compilation/1254.php
@@ -1,3 +1,3 @@
 <?php
 
- print 1 << 32;
\ No newline at end of file
+print 1 << 32;
diff --git a/hphp/test/slow/compilation/1255.php b/hphp/test/slow/compilation/1255.php
index 0e4f2b964..1e9ad98a0 100644
--- a/hphp/test/slow/compilation/1255.php
+++ b/hphp/test/slow/compilation/1255.php
@@ -1,3 +1,4 @@
 <?php
 
- if (!$a = true) {}
\ No newline at end of file
+if (!$a = true) {
+}
diff --git a/hphp/test/slow/compilation/1256.php b/hphp/test/slow/compilation/1256.php
index 73821d0a0..6727153c9 100644
--- a/hphp/test/slow/compilation/1256.php
+++ b/hphp/test/slow/compilation/1256.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($a = 0) { $b = $a; $c = $b[$a];}
\ No newline at end of file
+function test($a = 0) {
+ $b = $a;
+ $c = $b[$a];
+}
diff --git a/hphp/test/slow/compilation/1257.php b/hphp/test/slow/compilation/1257.php
index 490ca3f95..6d8b7640a 100644
--- a/hphp/test/slow/compilation/1257.php
+++ b/hphp/test/slow/compilation/1257.php
@@ -1,3 +1,8 @@
 <?php
 
- function str() { return 'test';} function test() { var_dump(str() - $a);}
\ No newline at end of file
+function str() {
+ return 'test';
+}
+ function test() {
+ var_dump(str() - $a);
+}
diff --git a/hphp/test/slow/compilation/1258.php b/hphp/test/slow/compilation/1258.php
index d18104871..5b105a25b 100644
--- a/hphp/test/slow/compilation/1258.php
+++ b/hphp/test/slow/compilation/1258.php
@@ -1,3 +1,7 @@
 <?php
 
- function test() {} function foo() { test($a = 1);}
\ No newline at end of file
+function test() {
+}
+ function foo() {
+ test($a = 1);
+}
diff --git a/hphp/test/slow/compilation/1259.php b/hphp/test/slow/compilation/1259.php
index 00186e6c6..4da335a1a 100644
--- a/hphp/test/slow/compilation/1259.php
+++ b/hphp/test/slow/compilation/1259.php
@@ -1,3 +1,5 @@
 <?php
 
- function test() {} true ? test() : 1;
\ No newline at end of file
+function test() {
+}
+ true ? test() : 1;
diff --git a/hphp/test/slow/compilation/1260.php b/hphp/test/slow/compilation/1260.php
index 64d46c287..a454aa49e 100644
--- a/hphp/test/slow/compilation/1260.php
+++ b/hphp/test/slow/compilation/1260.php
@@ -1,3 +1,7 @@
 <?php
 
- function test() { $a = 0; $a += $b;} test();
\ No newline at end of file
+function test() {
+ $a = 0;
+ $a += $b;
+}
+ test();
diff --git a/hphp/test/slow/compilation/1261.php b/hphp/test/slow/compilation/1261.php
index 7ad010915..066a00e5e 100644
--- a/hphp/test/slow/compilation/1261.php
+++ b/hphp/test/slow/compilation/1261.php
@@ -1,3 +1,7 @@
 <?php
 
- class A {} $a = new A(); $a->a = $a->b = 'test'; var_dump($a);
\ No newline at end of file
+class A {
+}
+ $a = new A();
+ $a->a = $a->b = 'test';
+ var_dump($a);
diff --git a/hphp/test/slow/compilation/1262.php b/hphp/test/slow/compilation/1262.php
index 33f8257bc..5176e6cff 100644
--- a/hphp/test/slow/compilation/1262.php
+++ b/hphp/test/slow/compilation/1262.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 1; $a = array(); $a['a'] = $a['b'] = 'test'; var_dump($a);
\ No newline at end of file
+$a = 1;
+ $a = array();
+ $a['a'] = $a['b'] = 'test';
+ var_dump($a);
diff --git a/hphp/test/slow/compilation/1263.php b/hphp/test/slow/compilation/1263.php
index 0e278c559..77ca6c115 100644
--- a/hphp/test/slow/compilation/1263.php
+++ b/hphp/test/slow/compilation/1263.php
@@ -1,3 +1,6 @@
 <?php
 
- function test() { return array();} reset(test());
\ No newline at end of file
+function test() {
+ return array();
+}
+ reset(test());
diff --git a/hphp/test/slow/compilation/1264.php b/hphp/test/slow/compilation/1264.php
index 4a042fcf6..ec8cce656 100644
--- a/hphp/test/slow/compilation/1264.php
+++ b/hphp/test/slow/compilation/1264.php
@@ -1,3 +1,12 @@
 <?php
 
- class A { public $prop = 1;} class B { public $prop = 5;} $a = 1; $a = new A(); $a->prop++; var_dump($a->prop);
\ No newline at end of file
+class A {
+ public $prop = 1;
+}
+ class B {
+ public $prop = 5;
+}
+ $a = 1;
+ $a = new A();
+ $a->prop++;
+ var_dump($a->prop);
diff --git a/hphp/test/slow/compilation/1265.php b/hphp/test/slow/compilation/1265.php
index 3428f47eb..ecdca4565 100644
--- a/hphp/test/slow/compilation/1265.php
+++ b/hphp/test/slow/compilation/1265.php
@@ -1,3 +1,8 @@
 <?php
 
- class A { public $prop = 1;} $a = new A(); $a->prop++; var_dump($a->prop);
\ No newline at end of file
+class A {
+ public $prop = 1;
+}
+ $a = new A();
+ $a->prop++;
+ var_dump($a->prop);
diff --git a/hphp/test/slow/compilation/1266.php b/hphp/test/slow/compilation/1266.php
index f4396b9aa..3f9be9c8a 100644
--- a/hphp/test/slow/compilation/1266.php
+++ b/hphp/test/slow/compilation/1266.php
@@ -1,3 +1,9 @@
 <?php
 
- class A { public $prop = 1;} $a = 1; $a = new A(); $a->prop++; var_dump($a->prop);
\ No newline at end of file
+class A {
+ public $prop = 1;
+}
+ $a = 1;
+ $a = new A();
+ $a->prop++;
+ var_dump($a->prop);
diff --git a/hphp/test/slow/compilation/1267.php b/hphp/test/slow/compilation/1267.php
index 7592bacba..f9bb8a045 100644
--- a/hphp/test/slow/compilation/1267.php
+++ b/hphp/test/slow/compilation/1267.php
@@ -1,3 +1,3 @@
 <?php
 
- $a = 0xC0000000 & $b;
\ No newline at end of file
+$a = 0xC0000000 & $b;
diff --git a/hphp/test/slow/compilation/1268.php b/hphp/test/slow/compilation/1268.php
index 05d63b558..14a48c739 100644
--- a/hphp/test/slow/compilation/1268.php
+++ b/hphp/test/slow/compilation/1268.php
@@ -1,3 +1,6 @@
 <?php
 
- class E extends exception { public $message; public $code;}
\ No newline at end of file
+class E extends exception {
+ public $message;
+ public $code;
+}
diff --git a/hphp/test/slow/compilation/1269.php b/hphp/test/slow/compilation/1269.php
index e91401f33..50aec1d05 100644
--- a/hphp/test/slow/compilation/1269.php
+++ b/hphp/test/slow/compilation/1269.php
@@ -1,3 +1,9 @@
 <?php
 
- class A { static $a = 1;} class B extends A { static $a = 2;} var_dump(B::$a);
\ No newline at end of file
+class A {
+ static $a = 1;
+}
+ class B extends A {
+ static $a = 2;
+}
+ var_dump(B::$a);
diff --git a/hphp/test/slow/compilation/1270.php b/hphp/test/slow/compilation/1270.php
index 44c233fb8..4ed790d6d 100644
--- a/hphp/test/slow/compilation/1270.php
+++ b/hphp/test/slow/compilation/1270.php
@@ -1,3 +1,14 @@
 <?php
 
- class A { function __call($a, $b) { $b = 'a'; $b = 1; var_dump($a, $b[0], $b[1]);}} $obj = new A(); $a = 1; $b = 'a'; $b = 2; $obj->test($a, $b);
\ No newline at end of file
+class A {
+ function __call($a, $b) {
+ $b = 'a';
+ $b = 1;
+ var_dump($a, $b[0], $b[1]);
+}
+}
+ $obj = new A();
+ $a = 1;
+ $b = 'a';
+ $b = 2;
+ $obj->test($a, $b);
diff --git a/hphp/test/slow/compilation/1271.php b/hphp/test/slow/compilation/1271.php
index debdad6c7..770a4897e 100644
--- a/hphp/test/slow/compilation/1271.php
+++ b/hphp/test/slow/compilation/1271.php
@@ -1,3 +1,18 @@
 <?php
 
- class A { public function getA() { return $this;} public function test() { var_dump('test');}} class B { public function getA() {} public function test(){}}$obj = new A(); $obj->getA()->test();
\ No newline at end of file
+class A {
+ public function getA() {
+ return $this;
+}
+ public function test() {
+ var_dump('test');
+}
+}
+ class B {
+ public function getA() {
+}
+ public function test(){
+}
+}
+$obj = new A();
+ $obj->getA()->test();
diff --git a/hphp/test/slow/compilation/1272.php b/hphp/test/slow/compilation/1272.php
index 4396b2760..0dc91053e 100644
--- a/hphp/test/slow/compilation/1272.php
+++ b/hphp/test/slow/compilation/1272.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { function __construct($a) { var_dump($a);} } class B extends A {} $a = new B('test');
\ No newline at end of file
+class A {
+ function __construct($a) {
+ var_dump($a);
+}
+ }
+ class B extends A {
+}
+ $a = new B('test');
diff --git a/hphp/test/slow/compilation/1273.php b/hphp/test/slow/compilation/1273.php
index 15093a1c0..8e8ad3885 100644
--- a/hphp/test/slow/compilation/1273.php
+++ b/hphp/test/slow/compilation/1273.php
@@ -1,3 +1,17 @@
 <?php
 
- class A { function test() {}} class B { public $b;} class C { function test() {}} $a = 'test'; $a = new B(); $a->b = new A(); $a->b->test();
\ No newline at end of file
+class A {
+ function test() {
+}
+}
+ class B {
+ public $b;
+}
+ class C {
+ function test() {
+}
+}
+ $a = 'test';
+ $a = new B();
+ $a->b = new A();
+ $a->b->test();
diff --git a/hphp/test/slow/compilation/1274.php b/hphp/test/slow/compilation/1274.php
index 6a2332176..73bed3694 100644
--- a/hphp/test/slow/compilation/1274.php
+++ b/hphp/test/slow/compilation/1274.php
@@ -1,3 +1,15 @@
 <?php
 
- $global = B::CLASS_CONSTANT; $another = test2($global); define('CONSTANT', test2('defining')); function test2($a) { var_dump($a); return 12345;} class A extends B {} class B { const CLASS_CONSTANT = 1;} 
\ No newline at end of file
+$global = B::CLASS_CONSTANT;
+ $another = test2($global);
+ define('CONSTANT', test2('defining'));
+ function test2($a) {
+ var_dump($a);
+ return 12345;
+}
+ class A extends B {
+}
+ class B {
+ const CLASS_CONSTANT = 1;
+}
+
diff --git a/hphp/test/slow/compilation/1275.php b/hphp/test/slow/compilation/1275.php
index ceebeb1d1..a9efe1b44 100644
--- a/hphp/test/slow/compilation/1275.php
+++ b/hphp/test/slow/compilation/1275.php
@@ -1,3 +1,4 @@
 <?php
 
- $_SERVER = array('test' => 1); var_dump($_SERVER);
\ No newline at end of file
+$_SERVER = array('test' => 1);
+ var_dump($_SERVER);
diff --git a/hphp/test/slow/compilation/1276.php b/hphp/test/slow/compilation/1276.php
index 5e827d180..5f59c7126 100644
--- a/hphp/test/slow/compilation/1276.php
+++ b/hphp/test/slow/compilation/1276.php
@@ -1,3 +1,4 @@
 <?php
 
- $GLOBALS['_SERVER'] = array('test' => 1); var_dump($_SERVER);
\ No newline at end of file
+$GLOBALS['_SERVER'] = array('test' => 1);
+ var_dump($_SERVER);
diff --git a/hphp/test/slow/compilation/1277.php b/hphp/test/slow/compilation/1277.php
index 8b65a846a..e789817a4 100644
--- a/hphp/test/slow/compilation/1277.php
+++ b/hphp/test/slow/compilation/1277.php
@@ -1,3 +1,14 @@
 <?php
 
- class A { const C = 123; static function t($a = B::C) {} } A::t();class B { const C = 456; static function t($a = A::C) {} } B::t();
\ No newline at end of file
+class A {
+ const C = 123;
+ static function t($a = B::C) {
+}
+ }
+ A::t();
+class B {
+ const C = 456;
+ static function t($a = A::C) {
+}
+ }
+ B::t();
diff --git a/hphp/test/slow/compilation/1278.php b/hphp/test/slow/compilation/1278.php
index c6241f87c..ac61a1390 100644
--- a/hphp/test/slow/compilation/1278.php
+++ b/hphp/test/slow/compilation/1278.php
@@ -1,3 +1,9 @@
 <?php
 
- class T { function __toString() { return 123;}} $obj = new T(); var_dump($obj);
\ No newline at end of file
+class T {
+ function __toString() {
+ return 123;
+}
+}
+ $obj = new T();
+ var_dump($obj);
diff --git a/hphp/test/slow/compilation/1279.php b/hphp/test/slow/compilation/1279.php
index 79efe2976..0d2f00d21 100644
--- a/hphp/test/slow/compilation/1279.php
+++ b/hphp/test/slow/compilation/1279.php
@@ -1,3 +1,6 @@
 <?php
 
- function test() {} var_dump(test()); $a = test();
\ No newline at end of file
+function test() {
+}
+ var_dump(test());
+ $a = test();
diff --git a/hphp/test/slow/compilation/1280.php b/hphp/test/slow/compilation/1280.php
index dca4f42a7..06546b72e 100644
--- a/hphp/test/slow/compilation/1280.php
+++ b/hphp/test/slow/compilation/1280.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 'test'; $a = 123; switch ($a) { case -1: var_dump($a);}
\ No newline at end of file
+$a = 'test';
+ $a = 123;
+ switch ($a) {
+ case -1: var_dump($a);
+}
diff --git a/hphp/test/slow/compilation/1281.php b/hphp/test/slow/compilation/1281.php
index 10e2380c0..fbcad0b93 100644
--- a/hphp/test/slow/compilation/1281.php
+++ b/hphp/test/slow/compilation/1281.php
@@ -1,3 +1,4 @@
 <?php
 
- $a['a']['b'] = 'test'; var_dump($a['a']['b']);
\ No newline at end of file
+$a['a']['b'] = 'test';
+ var_dump($a['a']['b']);
diff --git a/hphp/test/slow/compilation/1282.php b/hphp/test/slow/compilation/1282.php
index 054a5af01..698d50093 100644
--- a/hphp/test/slow/compilation/1282.php
+++ b/hphp/test/slow/compilation/1282.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { function test(A $a) { $a->foo();} function foo() { print 'foo';}}
\ No newline at end of file
+class A {
+ function test(A $a) {
+ $a->foo();
+}
+ function foo() {
+ print 'foo';
+}
+}
diff --git a/hphp/test/slow/compilation/1283.php b/hphp/test/slow/compilation/1283.php
index 95c3b21b0..6e4158f0d 100644
--- a/hphp/test/slow/compilation/1283.php
+++ b/hphp/test/slow/compilation/1283.php
@@ -1,3 +1,9 @@
 <?php
 
- class A { function f($a) {} }$obj = new A;$obj->f(date('m/d/y H:i:s', 123456789));$v = date("m",123456789)+1;
\ No newline at end of file
+class A {
+ function f($a) {
+}
+ }
+$obj = new A;
+$obj->f(date('m/d/y H:i:s', 123456789));
+$v = date("m",123456789)+1;
diff --git a/hphp/test/slow/compilation/1284.php b/hphp/test/slow/compilation/1284.php
index 0fa220734..f2ad38449 100644
--- a/hphp/test/slow/compilation/1284.php
+++ b/hphp/test/slow/compilation/1284.php
@@ -1,3 +1,3 @@
 <?php
 
- if ($a) $a == 0;
\ No newline at end of file
+if ($a) $a == 0;
diff --git a/hphp/test/slow/compilation/1285.php b/hphp/test/slow/compilation/1285.php
index f7d82834e..da69cdaec 100644
--- a/hphp/test/slow/compilation/1285.php
+++ b/hphp/test/slow/compilation/1285.php
@@ -1,3 +1,6 @@
 <?php
 
- function foo($p1="/.*/", $p2="//") {  var_dump($p1, $p2);}foo();
\ No newline at end of file
+function foo($p1="/.*/", $p2="//") {
+  var_dump($p1, $p2);
+}
+foo();
diff --git a/hphp/test/slow/compilation/1286.php b/hphp/test/slow/compilation/1286.php
index 88e6ac90e..a963326d0 100644
--- a/hphp/test/slow/compilation/1286.php
+++ b/hphp/test/slow/compilation/1286.php
@@ -1,3 +1,4 @@
 <?php
 
- $n = floor(1.0);var_dump(($n > 0) ? $n : $n + 1);
\ No newline at end of file
+$n = floor(1.0);
+var_dump(($n > 0) ? $n : $n + 1);
diff --git a/hphp/test/slow/compilation/1287.php b/hphp/test/slow/compilation/1287.php
index f6ec81dfc..db00d9088 100644
--- a/hphp/test/slow/compilation/1287.php
+++ b/hphp/test/slow/compilation/1287.php
@@ -1,3 +1,12 @@
 <?php
 
- class X {  function test($a, $b, $c) {    return $a != $b;  }}function test($a) {  $x = new X;  return $a ? $x->test(1, 2) : false;}var_dump(test(1));
\ No newline at end of file
+class X {
+  function test($a, $b, $c) {
+    return $a != $b;
+  }
+}
+function test($a) {
+  $x = new X;
+  return $a ? $x->test(1, 2) : false;
+}
+var_dump(test(1));
diff --git a/hphp/test/slow/compilation/1288.php b/hphp/test/slow/compilation/1288.php
index 81abbedc4..5961edd19 100644
--- a/hphp/test/slow/compilation/1288.php
+++ b/hphp/test/slow/compilation/1288.php
@@ -1,3 +1,7 @@
 <?php
 
- function bug1($a, $b) {foreach ($b[$a++ + $a++] as &$x) { echo $x; }}
\ No newline at end of file
+function bug1($a, $b) {
+foreach ($b[$a++ + $a++] as &$x) {
+ echo $x;
+ }
+}
diff --git a/hphp/test/slow/compilation/1289.php b/hphp/test/slow/compilation/1289.php
index 82c9027ad..9a8947760 100644
--- a/hphp/test/slow/compilation/1289.php
+++ b/hphp/test/slow/compilation/1289.php
@@ -1,3 +1,9 @@
 <?php
 
- function f($a, $b, $c) { return 'hello'; }function test($a) {  $x = ($a->foo = f($b++, $b++, $b++)) . f(1,2,3);  return $x;}
\ No newline at end of file
+function f($a, $b, $c) {
+ return 'hello';
+ }
+function test($a) {
+  $x = ($a->foo = f($b++, $b++, $b++)) . f(1,2,3);
+  return $x;
+}
diff --git a/hphp/test/slow/compilation/1290.php b/hphp/test/slow/compilation/1290.php
index 8d7778efc..32d276e3e 100644
--- a/hphp/test/slow/compilation/1290.php
+++ b/hphp/test/slow/compilation/1290.php
@@ -1,3 +1,7 @@
 <?php
 
- function g() {}function test1() {  return '' . g();}
\ No newline at end of file
+function g() {
+}
+function test1() {
+  return '' . g();
+}
diff --git a/hphp/test/slow/compilation/1291.php b/hphp/test/slow/compilation/1291.php
index d55c9043f..78dcec71e 100644
--- a/hphp/test/slow/compilation/1291.php
+++ b/hphp/test/slow/compilation/1291.php
@@ -1,3 +1,7 @@
 <?php
 
- function g() {}function test1() {  return 0 + g();}
\ No newline at end of file
+function g() {
+}
+function test1() {
+  return 0 + g();
+}
diff --git a/hphp/test/slow/compilation/1292.php b/hphp/test/slow/compilation/1292.php
index 08436ce1f..474f6ca57 100644
--- a/hphp/test/slow/compilation/1292.php
+++ b/hphp/test/slow/compilation/1292.php
@@ -1,3 +1,7 @@
 <?php
 
- function g() {}function test1() {  return 1 * g();}
\ No newline at end of file
+function g() {
+}
+function test1() {
+  return 1 * g();
+}
diff --git a/hphp/test/slow/compilation/1293.php b/hphp/test/slow/compilation/1293.php
index 4a1dcde83..f72ef43d7 100644
--- a/hphp/test/slow/compilation/1293.php
+++ b/hphp/test/slow/compilation/1293.php
@@ -1,3 +1,24 @@
 <?php
 
- $data = new stdclass;$type = 'OCI-Lob';if ($data instanceof $type) {  echo 'true';}class X {  static $foo;};function test() {  $x = new X;  $foo = 'foo';  if (isset($x->$foo) || empty($x->$foo) ||      isset($x->{'bar'})) {    unset($x->$foo);    unset($x->{'bar'});    echo true;  }}
\ No newline at end of file
+$data = new stdclass;
+$type = 'OCI-Lob';
+if ($data instanceof $type) {
+  echo 'true';
+}
+class X {
+  static $foo;
+}
+;
+function test() {
+  $x = new X;
+  $foo = 'foo';
+  if (isset($x->$foo) || empty($x->$foo) ||      isset($x->{
+'bar'}
+)) {
+    unset($x->$foo);
+    unset($x->{
+'bar'}
+);
+    echo true;
+  }
+}
diff --git a/hphp/test/slow/compilation/1294.php b/hphp/test/slow/compilation/1294.php
index d88af5ede..16eb8b78e 100644
--- a/hphp/test/slow/compilation/1294.php
+++ b/hphp/test/slow/compilation/1294.php
@@ -1,3 +1,14 @@
 <?php
 
- class X {  static function g() {}};@X::g();function g($a,$b) {}function f() { return 3; }@g(f(),f());
\ No newline at end of file
+class X {
+  static function g() {
+}
+}
+;
+@X::g();
+function g($a,$b) {
+}
+function f() {
+ return 3;
+ }
+@g(f(),f());
diff --git a/hphp/test/slow/compilation/1295.php b/hphp/test/slow/compilation/1295.php
index 26cc6c70a..afd18c49c 100644
--- a/hphp/test/slow/compilation/1295.php
+++ b/hphp/test/slow/compilation/1295.php
@@ -1,3 +1,6 @@
 <?php
 
- for ($i = 0; $i++,$i - 10;) {}
\ No newline at end of file
+for ($i = 0;
+ $i++,$i - 10;
+) {
+}
diff --git a/hphp/test/slow/compilation/1296.php b/hphp/test/slow/compilation/1296.php
index 4412d5307..5ee937a2a 100644
--- a/hphp/test/slow/compilation/1296.php
+++ b/hphp/test/slow/compilation/1296.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($className) {$x = new ReflectionClass($className);return $x->newInstance()->loadAll(); }
\ No newline at end of file
+function test($className) {
+$x = new ReflectionClass($className);
+return $x->newInstance()->loadAll();
+ }
diff --git a/hphp/test/slow/compilation/1297.php b/hphp/test/slow/compilation/1297.php
index 5ce1099e0..b699925e3 100644
--- a/hphp/test/slow/compilation/1297.php
+++ b/hphp/test/slow/compilation/1297.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(array(1,2,3)+array(4,5,6));
\ No newline at end of file
+var_dump(array(1,2,3)+array(4,5,6));
diff --git a/hphp/test/slow/compilation/1298.php b/hphp/test/slow/compilation/1298.php
index ca999fbf9..eb5fa2645 100644
--- a/hphp/test/slow/compilation/1298.php
+++ b/hphp/test/slow/compilation/1298.php
@@ -1,3 +1,11 @@
 <?php
 
- function foo($a) {  $r = '';  if ($a) {    $r ->error = '';  }  return $r;}var_dump(foo(true));var_dump(foo(false));
\ No newline at end of file
+function foo($a) {
+  $r = '';
+  if ($a) {
+    $r ->error = '';
+  }
+  return $r;
+}
+var_dump(foo(true));
+var_dump(foo(false));
diff --git a/hphp/test/slow/compilation/1299.php b/hphp/test/slow/compilation/1299.php
index a172d6ba7..584022680 100644
--- a/hphp/test/slow/compilation/1299.php
+++ b/hphp/test/slow/compilation/1299.php
@@ -1,3 +1,11 @@
 <?php
 
- function foo($a) {  $r = '';  if ($a) {    $r ->error->line = 1;  }  return $r;}var_dump(foo(true));var_dump(foo(false));
\ No newline at end of file
+function foo($a) {
+  $r = '';
+  if ($a) {
+    $r ->error->line = 1;
+  }
+  return $r;
+}
+var_dump(foo(true));
+var_dump(foo(false));
diff --git a/hphp/test/slow/compilation/1300.php b/hphp/test/slow/compilation/1300.php
index 02d3d1510..313c22c85 100644
--- a/hphp/test/slow/compilation/1300.php
+++ b/hphp/test/slow/compilation/1300.php
@@ -1,3 +1,3 @@
 <?php
 
- call_user_func_array(array('Normalizer','normalize'),array('bar'));
\ No newline at end of file
+call_user_func_array(array('Normalizer','normalize'),array('bar'));
diff --git a/hphp/test/slow/compilation/1301.php b/hphp/test/slow/compilation/1301.php
index aba18d92a..b45f28f32 100644
--- a/hphp/test/slow/compilation/1301.php
+++ b/hphp/test/slow/compilation/1301.php
@@ -1,3 +1,10 @@
 <?php
 
- function bar($g) { return $g; }class X {  static function foo() {    echo $this->baz(bar(1), bar(''));  }}
\ No newline at end of file
+function bar($g) {
+ return $g;
+ }
+class X {
+  static function foo() {
+    echo $this->baz(bar(1), bar(''));
+  }
+}
diff --git a/hphp/test/slow/compilation/1302.php b/hphp/test/slow/compilation/1302.php
index 866765e4e..a24256ea3 100644
--- a/hphp/test/slow/compilation/1302.php
+++ b/hphp/test/slow/compilation/1302.php
@@ -1,3 +1,7 @@
 <?php
 
- function foo() {}function test() {  foo()->bar();}
\ No newline at end of file
+function foo() {
+}
+function test() {
+  foo()->bar();
+}
diff --git a/hphp/test/slow/compilation/1303.php b/hphp/test/slow/compilation/1303.php
index dc75cee51..cd89d1dc0 100644
--- a/hphp/test/slow/compilation/1303.php
+++ b/hphp/test/slow/compilation/1303.php
@@ -1,3 +1,11 @@
 <?php
 
- function checker($x) {  $msg = foo();  $notice = $msg['title'].'. '.$msg['body'];  foo();  @list($a,$b) = $x;  $x = @$x['a'];  $x = @$x['b'];  return $a - $b + $x;}
\ No newline at end of file
+function checker($x) {
+  $msg = foo();
+  $notice = $msg['title'].'. '.$msg['body'];
+  foo();
+  @list($a,$b) = $x;
+  $x = @$x['a'];
+  $x = @$x['b'];
+  return $a - $b + $x;
+}
diff --git a/hphp/test/slow/compilation/1304.php b/hphp/test/slow/compilation/1304.php
index ed84cec11..3849ff8ab 100644
--- a/hphp/test/slow/compilation/1304.php
+++ b/hphp/test/slow/compilation/1304.php
@@ -1,3 +1,16 @@
 <?php
 
- class C {  function foo($a) {    var_dump($this + $a);    var_dump($this - $a);    var_dump($this * $a);    var_dump($this / $a);    var_dump($a + $this);    var_dump($a - $this);    var_dump($a * $this);    var_dump($a / $this);  }}$obj = new C;$obj->foo(1);
\ No newline at end of file
+class C {
+  function foo($a) {
+    var_dump($this + $a);
+    var_dump($this - $a);
+    var_dump($this * $a);
+    var_dump($this / $a);
+    var_dump($a + $this);
+    var_dump($a - $this);
+    var_dump($a * $this);
+    var_dump($a / $this);
+  }
+}
+$obj = new C;
+$obj->foo(1);
diff --git a/hphp/test/slow/compilation/1305.php b/hphp/test/slow/compilation/1305.php
index 9b0059c44..887650794 100644
--- a/hphp/test/slow/compilation/1305.php
+++ b/hphp/test/slow/compilation/1305.php
@@ -1,3 +1,14 @@
 <?php
 
- class X {}class Y extends X { public $foo; }function foo() {  $x = new Y;  $x && var_dump($x->foo);  $x = new X;  var_dump($x);}foo();
\ No newline at end of file
+class X {
+}
+class Y extends X {
+ public $foo;
+ }
+function foo() {
+  $x = new Y;
+  $x && var_dump($x->foo);
+  $x = new X;
+  var_dump($x);
+}
+foo();
diff --git a/hphp/test/slow/compilation/1306.php b/hphp/test/slow/compilation/1306.php
index eff016774..43dc0e3b2 100644
--- a/hphp/test/slow/compilation/1306.php
+++ b/hphp/test/slow/compilation/1306.php
@@ -1,3 +1,11 @@
 <?php
 
- function bar($a) {}function foo($x) {  $a = $x;  echo $x;  unset($a);  $a = bar(1);  bar($a++);}
\ No newline at end of file
+function bar($a) {
+}
+function foo($x) {
+  $a = $x;
+  echo $x;
+  unset($a);
+  $a = bar(1);
+  bar($a++);
+}
diff --git a/hphp/test/slow/compilation/1307.php b/hphp/test/slow/compilation/1307.php
index 2a81b1b38..a4e888c8f 100644
--- a/hphp/test/slow/compilation/1307.php
+++ b/hphp/test/slow/compilation/1307.php
@@ -1,3 +1,5 @@
 <?php
 
- function test($a) { return null * $a; }
\ No newline at end of file
+function test($a) {
+ return null * $a;
+ }
diff --git a/hphp/test/slow/compilation/1308.php b/hphp/test/slow/compilation/1308.php
index 8da9ce20f..e2fe41623 100644
--- a/hphp/test/slow/compilation/1308.php
+++ b/hphp/test/slow/compilation/1308.php
@@ -1,3 +1,8 @@
 <?php
 
- function foo() {  define('AAA', 1);  if (false) {    define('BBB', 'bbb');  }}
\ No newline at end of file
+function foo() {
+  define('AAA', 1);
+  if (false) {
+    define('BBB', 'bbb');
+  }
+}
diff --git a/hphp/test/slow/compilation/1309.php b/hphp/test/slow/compilation/1309.php
index 8e4ad2914..16e3d6d76 100644
--- a/hphp/test/slow/compilation/1309.php
+++ b/hphp/test/slow/compilation/1309.php
@@ -1,3 +1,11 @@
 <?php
 
- function foo() { return array(1,2,3); }function bar($a, $b, $c) { $a = 4; }$x = foo();bar($x[3][4], $y);var_dump($x);
\ No newline at end of file
+function foo() {
+ return array(1,2,3);
+ }
+function bar($a, $b, $c) {
+ $a = 4;
+ }
+$x = foo();
+bar($x[3][4], $y);
+var_dump($x);
diff --git a/hphp/test/slow/compilation/1310.php b/hphp/test/slow/compilation/1310.php
index 74838f6e7..d22d2505d 100644
--- a/hphp/test/slow/compilation/1310.php
+++ b/hphp/test/slow/compilation/1310.php
@@ -1,3 +1,5 @@
 <?php
 
- function test($a) {  print "hello $a world!" and die;}
\ No newline at end of file
+function test($a) {
+  print "hello $a world!" and die;
+}
diff --git a/hphp/test/slow/compilation/1311.php b/hphp/test/slow/compilation/1311.php
index 1fe255991..9d397ab6b 100644
--- a/hphp/test/slow/compilation/1311.php
+++ b/hphp/test/slow/compilation/1311.php
@@ -1,3 +1,17 @@
 <?php
 
- if(0){class y{}}else{class y{}}abstract class x extends y {  private static $nextSerial = 1;  private $serial = 0;  public function __construct() {    $this->serial = self::$nextSerial++;  }}
\ No newline at end of file
+if(0){
+class y{
+}
+}
+else{
+class y{
+}
+}
+abstract class x extends y {
+  private static $nextSerial = 1;
+  private $serial = 0;
+  public function __construct() {
+    $this->serial = self::$nextSerial++;
+  }
+}
diff --git a/hphp/test/slow/compilation/1312.php b/hphp/test/slow/compilation/1312.php
index 1b5a00775..c5cef8a3e 100644
--- a/hphp/test/slow/compilation/1312.php
+++ b/hphp/test/slow/compilation/1312.php
@@ -1,3 +1,10 @@
 <?php
 
- function setAttribute() {  if (($v_size = func_num_args()) == 0) {    return true;  }  $v_att_list = &func_get_args();  return true;}setAttribute('a');
\ No newline at end of file
+function setAttribute() {
+  if (($v_size = func_num_args()) == 0) {
+    return true;
+  }
+  $v_att_list = &func_get_args();
+  return true;
+}
+setAttribute('a');
diff --git a/hphp/test/slow/compilation/1313.php b/hphp/test/slow/compilation/1313.php
index e39d16947..e77c1f0b9 100644
--- a/hphp/test/slow/compilation/1313.php
+++ b/hphp/test/slow/compilation/1313.php
@@ -1,3 +1,6 @@
 <?php
 
- class X {}function bar(string $x = X::FIZ, $y=null, $z=null,             $a=null, $b=null, $c=null, $d=null) {}
\ No newline at end of file
+class X {
+}
+function bar(string $x = X::FIZ, $y=null, $z=null,             $a=null, $b=null, $c=null, $d=null) {
+}
diff --git a/hphp/test/slow/compilation/1314.php b/hphp/test/slow/compilation/1314.php
index 92c7b68fe..cfd9781c9 100644
--- a/hphp/test/slow/compilation/1314.php
+++ b/hphp/test/slow/compilation/1314.php
@@ -1,3 +1,27 @@
 <?php
 
- function foo($a,$b,$c,$d) { return implode($a,$b); }function bar($values, $parent_fields) {  $full_name = implode('___', $parent_fields);  $body = '';  $body .= '<div>';  $body .= '<table id=' . 'bar_' . $full_name . ' border=1>';  $item_num = 0;  if (null !== $values) {    foreach($values as $val) {      $row_id = 'tr_sentrylist_' . $item_num . '_' . $full_name;      $body .= '<tr id=' . $row_id . '>';      $body .= '<td>';      $body .=  foo($item_num, 0,                    $val, $parent_fields);      $body .= '</td>';      $body .= '<td>';      $body .= foo($item_num, $full_name, 0, 0);      $body .= '</td>';      $body .= '</tr>';      $item_num += 1;    }  }  $body .= '</table>';}
\ No newline at end of file
+function foo($a,$b,$c,$d) {
+ return implode($a,$b);
+ }
+function bar($values, $parent_fields) {
+  $full_name = implode('___', $parent_fields);
+  $body = '';
+  $body .= '<div>';
+  $body .= '<table id=' . 'bar_' . $full_name . ' border=1>';
+  $item_num = 0;
+  if (null !== $values) {
+    foreach($values as $val) {
+      $row_id = 'tr_sentrylist_' . $item_num . '_' . $full_name;
+      $body .= '<tr id=' . $row_id . '>';
+      $body .= '<td>';
+      $body .=  foo($item_num, 0,                    $val, $parent_fields);
+      $body .= '</td>';
+      $body .= '<td>';
+      $body .= foo($item_num, $full_name, 0, 0);
+      $body .= '</td>';
+      $body .= '</tr>';
+      $item_num += 1;
+    }
+  }
+  $body .= '</table>';
+}
diff --git a/hphp/test/slow/compilation/1315.php b/hphp/test/slow/compilation/1315.php
index 6e0f95d0d..c878d71ab 100644
--- a/hphp/test/slow/compilation/1315.php
+++ b/hphp/test/slow/compilation/1315.php
@@ -1,3 +1,12 @@
 <?php
 
- class X {  function foo() {    return function() use(&$this) {      return $this->bar();    };  }  function bar() {}}
\ No newline at end of file
+class X {
+  function foo() {
+    return function() use(&$this) {
+      return $this->bar();
+    }
+;
+  }
+  function bar() {
+}
+}
diff --git a/hphp/test/slow/compilation/1316.php b/hphp/test/slow/compilation/1316.php
index e9470ea05..71128ec9b 100644
--- a/hphp/test/slow/compilation/1316.php
+++ b/hphp/test/slow/compilation/1316.php
@@ -1,3 +1,7 @@
 <?php
 
- $x = 1;switch ($x++ ?: -1) {};var_dump($x);
\ No newline at end of file
+$x = 1;
+switch ($x++ ?: -1) {
+}
+;
+var_dump($x);
diff --git a/hphp/test/slow/compilation/1317.php b/hphp/test/slow/compilation/1317.php
index afca4241b..136b1b759 100644
--- a/hphp/test/slow/compilation/1317.php
+++ b/hphp/test/slow/compilation/1317.php
@@ -1,3 +1,8 @@
 <?php
 
- function f() {  global $g;  $g++;}var_dump((boolean)f(),(int)f(),(double)f(),(string)f());var_dump((array)f(),(object)f(),(unset)f());
\ No newline at end of file
+function f() {
+  global $g;
+  $g++;
+}
+var_dump((boolean)f(),(int)f(),(double)f(),(string)f());
+var_dump((array)f(),(object)f(),(unset)f());
diff --git a/hphp/test/slow/compilation/1318.php b/hphp/test/slow/compilation/1318.php
index edc85b498..db2bd2f0b 100644
--- a/hphp/test/slow/compilation/1318.php
+++ b/hphp/test/slow/compilation/1318.php
@@ -1,3 +1,14 @@
 <?php
 
- if (isset($g)) {  class X {    private static $i = null;    function foo() {      self::$i = $this;    }  }} else {  class X {}}
\ No newline at end of file
+if (isset($g)) {
+  class X {
+    private static $i = null;
+    function foo() {
+      self::$i = $this;
+    }
+  }
+}
+ else {
+  class X {
+}
+}
diff --git a/hphp/test/slow/compilation/1319.php b/hphp/test/slow/compilation/1319.php
index 5cd661521..3eb04c909 100644
--- a/hphp/test/slow/compilation/1319.php
+++ b/hphp/test/slow/compilation/1319.php
@@ -1,3 +1,9 @@
 <?php
 
- class X { const FOO = 'hello'; }function foo(&$a) { static $s; }if (class_exists('X')) foo(X::FOO);
\ No newline at end of file
+class X {
+ const FOO = 'hello';
+ }
+function foo(&$a) {
+ static $s;
+ }
+if (class_exists('X')) foo(X::FOO);
diff --git a/hphp/test/slow/compilation/1320.php b/hphp/test/slow/compilation/1320.php
index 067a97380..feeb6553a 100644
--- a/hphp/test/slow/compilation/1320.php
+++ b/hphp/test/slow/compilation/1320.php
@@ -1,3 +1,18 @@
 <?php
 
- class X {  static function foo() { return new X; }  function bar() { var_dump(__METHOD__); }};function id($x) { return $x; }function test() {  id(X::foo(1))->bar();}test();
\ No newline at end of file
+class X {
+  static function foo() {
+ return new X;
+ }
+  function bar() {
+ var_dump(__METHOD__);
+ }
+}
+;
+function id($x) {
+ return $x;
+ }
+function test() {
+  id(X::foo(1))->bar();
+}
+test();
diff --git a/hphp/test/slow/compilation/1321.php b/hphp/test/slow/compilation/1321.php
index 74f0cb67b..caabe0be5 100644
--- a/hphp/test/slow/compilation/1321.php
+++ b/hphp/test/slow/compilation/1321.php
@@ -1,3 +1,15 @@
 <?php
 
- class X {  function bar(X $x) {    $x->foo();    $x->foo();  }  function foo() { var_dump(__METHOD__); }}function test() {  X::bar(null);}test();
\ No newline at end of file
+class X {
+  function bar(X $x) {
+    $x->foo();
+    $x->foo();
+  }
+  function foo() {
+ var_dump(__METHOD__);
+ }
+}
+function test() {
+  X::bar(null);
+}
+test();
diff --git a/hphp/test/slow/compilation/1321.php.expectf b/hphp/test/slow/compilation/1321.php.expectf
index 7ba32b4ed..c35c3b279 100644
--- a/hphp/test/slow/compilation/1321.php.expectf
+++ b/hphp/test/slow/compilation/1321.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Argument 1 passed to X::bar() must be an instance of X, null given in %s/hphp/test/slow/compilation/1321.php on line 3
+HipHop Fatal error: Argument 1 passed to X::bar() must be an instance of X, null given in %s/hphp/test/slow/compilation/1321.php on line 7
diff --git a/hphp/test/slow/compilation/1322.php b/hphp/test/slow/compilation/1322.php
index 3dd371ec3..ee4b74596 100644
--- a/hphp/test/slow/compilation/1322.php
+++ b/hphp/test/slow/compilation/1322.php
@@ -1,3 +1,13 @@
 <?php
 
- class X {  public function foo($offset) {    if (isset($this->__array[$offset])) {      return $this->initializeOffset($offset);    } else {      return null;    }    return $this->__array[$offset];  }}
\ No newline at end of file
+class X {
+  public function foo($offset) {
+    if (isset($this->__array[$offset])) {
+      return $this->initializeOffset($offset);
+    }
+ else {
+      return null;
+    }
+    return $this->__array[$offset];
+  }
+}
diff --git a/hphp/test/slow/compilation/1323.php b/hphp/test/slow/compilation/1323.php
index 916edfa85..d737e2efc 100644
--- a/hphp/test/slow/compilation/1323.php
+++ b/hphp/test/slow/compilation/1323.php
@@ -1,3 +1,15 @@
 <?php
 
- class Y {  function bar() {}}class X {  function foo() {    $x = $this;    if ($this instanceof y) {      $this->bar();    }    return $x;  }}
\ No newline at end of file
+class Y {
+  function bar() {
+}
+}
+class X {
+  function foo() {
+    $x = $this;
+    if ($this instanceof y) {
+      $this->bar();
+    }
+    return $x;
+  }
+}
diff --git a/hphp/test/slow/compilation/1324.php b/hphp/test/slow/compilation/1324.php
index 4292c0de5..b889723fa 100644
--- a/hphp/test/slow/compilation/1324.php
+++ b/hphp/test/slow/compilation/1324.php
@@ -1,3 +1,12 @@
 <?php
 
-function foo(&$a, &$b) {}if (isset($g)) {  function foo($a, $b) {}}function bar() {  foo($x, $y);}bar();
\ No newline at end of file
+function foo(&$a, &$b) {
+}
+if (isset($g)) {
+  function foo($a, $b) {
+}
+}
+function bar() {
+  foo($x, $y);
+}
+bar();
diff --git a/hphp/test/slow/compilation/1325.php b/hphp/test/slow/compilation/1325.php
index 4d05dd766..4aedafaeb 100644
--- a/hphp/test/slow/compilation/1325.php
+++ b/hphp/test/slow/compilation/1325.php
@@ -1,3 +1,14 @@
 <?php
 
- class X {  function foo($x,$y) {    $a = null;    if ($x) {      $a = new X;    }    new X($y ? null : $a);    return $a;  }}$x = new X;var_dump($x->foo(false, true));
\ No newline at end of file
+class X {
+  function foo($x,$y) {
+    $a = null;
+    if ($x) {
+      $a = new X;
+    }
+    new X($y ? null : $a);
+    return $a;
+  }
+}
+$x = new X;
+var_dump($x->foo(false, true));
diff --git a/hphp/test/slow/compilation/1326.php b/hphp/test/slow/compilation/1326.php
index 4d22e8ace..2b277c05d 100644
--- a/hphp/test/slow/compilation/1326.php
+++ b/hphp/test/slow/compilation/1326.php
@@ -1,7 +1,5 @@
 <?php
 
- 
-
 class C {
   public function loadAllWithIDs($ids) {
     if (!count($ids = array_filter($ids))) {
diff --git a/hphp/test/slow/compilation/1327.php b/hphp/test/slow/compilation/1327.php
index 19fe5794d..8beb03b25 100644
--- a/hphp/test/slow/compilation/1327.php
+++ b/hphp/test/slow/compilation/1327.php
@@ -1,3 +1,23 @@
 <?php
 
- class A {  public $a;  function foo() {    $this->bar();    if ($this instanceof B) {      $this->b = 1;    }    $this->a = 1;  }}class B extends A {  public $b;  function bar() {}}function main() {  $b = new B;  $b->foo();  var_dump($b);}main();
\ No newline at end of file
+class A {
+  public $a;
+  function foo() {
+    $this->bar();
+    if ($this instanceof B) {
+      $this->b = 1;
+    }
+    $this->a = 1;
+  }
+}
+class B extends A {
+  public $b;
+  function bar() {
+}
+}
+function main() {
+  $b = new B;
+  $b->foo();
+  var_dump($b);
+}
+main();
diff --git a/hphp/test/slow/concat/1571.php b/hphp/test/slow/concat/1571.php
index cbab6adc1..706b589a6 100644
--- a/hphp/test/slow/concat/1571.php
+++ b/hphp/test/slow/concat/1571.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $str = '';
 $arr1 = array('a', 'b');
 $arr2 = $arr1;
diff --git a/hphp/test/slow/concat/1572.php b/hphp/test/slow/concat/1572.php
index 6da64520b..89d3cdbc3 100644
--- a/hphp/test/slow/concat/1572.php
+++ b/hphp/test/slow/concat/1572.php
@@ -1,3 +1,7 @@
 <?php
 
- function foo($where_clause){  $sql =    'SELECT p.property_name, p.property_value, p.property_id, '.    'p.property_data_type, p.property_type, '.    't.tier_id, t.tier_parent_id, t.tier_version, t.tier_type, '.    't.tier_state, t.tier_name '.    'FROM tier t LEFT OUTER JOIN property p ON '.    'p.parent_id = t.tier_id AND '.    'p.property_type = "tier" '.    $where_clause;  echo $sql . "\n";}foo("where 1 = 1");
\ No newline at end of file
+function foo($where_clause){
+  $sql =    'SELECT p.property_name, p.property_value, p.property_id, '.    'p.property_data_type, p.property_type, '.    't.tier_id, t.tier_parent_id, t.tier_version, t.tier_type, '.    't.tier_state, t.tier_name '.    'FROM tier t LEFT OUTER JOIN property p ON '.    'p.parent_id = t.tier_id AND '.    'p.property_type = "tier" '.    $where_clause;
+  echo $sql . "\n";
+}
+foo("where 1 = 1");
diff --git a/hphp/test/slow/concat/1573.php b/hphp/test/slow/concat/1573.php
index bd836ceb3..18e491cdf 100644
--- a/hphp/test/slow/concat/1573.php
+++ b/hphp/test/slow/concat/1573.php
@@ -1,3 +1,9 @@
 <?php
 
- echo "a" . "b" . "c" . "d" . "e";echo 'a' . 'b' . 'c' . 'd' . 'e';echo 'a' . "b" . "c" . "d" . 'e';echo '"a' . "\"b" . "\'c" . "\'d" . '\"e';echo 1 . 2 . 3 . 4 . 5;echo 1 . '2' . '3' . 4 . 5;echo 1 . "2" . "3" . 4 . 5;
\ No newline at end of file
+echo "a" . "b" . "c" . "d" . "e";
+echo 'a' . 'b' . 'c' . 'd' . 'e';
+echo 'a' . "b" . "c" . "d" . 'e';
+echo '"a' . "\"b" . "\'c" . "\'d" . '\"e';
+echo 1 . 2 . 3 . 4 . 5;
+echo 1 . '2' . '3' . 4 . 5;
+echo 1 . "2" . "3" . 4 . 5;
diff --git a/hphp/test/slow/concat/1574.php b/hphp/test/slow/concat/1574.php
index ce4996c34..b4885e4c6 100644
--- a/hphp/test/slow/concat/1574.php
+++ b/hphp/test/slow/concat/1574.php
@@ -1,3 +1,5 @@
 <?php
 
- $v = "c";echo "a" . "b" . $v . "d" . "e";echo "a" . "b" . $v . "d" . "e" . $v . "f" . "g";
\ No newline at end of file
+$v = "c";
+echo "a" . "b" . $v . "d" . "e";
+echo "a" . "b" . $v . "d" . "e" . $v . "f" . "g";
diff --git a/hphp/test/slow/concat/1575.php b/hphp/test/slow/concat/1575.php
index f27bf2f73..1cface10a 100644
--- a/hphp/test/slow/concat/1575.php
+++ b/hphp/test/slow/concat/1575.php
@@ -1,3 +1,35 @@
 <?php
 
- echo '\\' . "\n";echo '\'' . "\n";echo '\\' . '\'' . "\n";echo '\\' . "'" . "\n";echo "\\" . "'" . "\n";echo "\101" . "\n";echo "\\" . "101" . "\n";echo "\1" . "101" . "\n";echo "\01" . "01" . "\n";echo "\01" . "g" . "\n";echo "\1" . "g" . "\n";echo "\011" . "01" . "\n";echo "\0111" . "01" . "\n";echo "\x" . "1" . "\n";echo "\x1" . "1" . "\n";echo "\x11" . "1" . "\n";echo "\x111" . "1" . "\n";echo "\x1111" . "1" . "\n";echo "\x11111" . "1" . "\n";echo "\777777" . "7" . "\n";echo "\0777777" . "7" . "\n";echo "\00777777" . "7" . "\n";echo "\0077\"7777" . "7" . "\n";echo "\0077\\7777" . "7" . "\n";echo "\0077\a7777" . "7" . "\n";echo "\0077\b7777" . "7" . "\n";echo "\0077\f7777" . "7" . "\n";echo "\0077\n7777" . "7" . "\n";echo "\0077\r7777" . "7" . "\n";echo "\0077\t7777" . "7" . "\n";echo "\0077\v7777" . "7" . "\n";echo "\0077\07777" . "7" . "\n";echo "\0077\'7777" . "7" . "\n";
\ No newline at end of file
+echo '\\' . "\n";
+echo '\'' . "\n";
+echo '\\' . '\'' . "\n";
+echo '\\' . "'" . "\n";
+echo "\\" . "'" . "\n";
+echo "\101" . "\n";
+echo "\\" . "101" . "\n";
+echo "\1" . "101" . "\n";
+echo "\01" . "01" . "\n";
+echo "\01" . "g" . "\n";
+echo "\1" . "g" . "\n";
+echo "\011" . "01" . "\n";
+echo "\0111" . "01" . "\n";
+echo "\x" . "1" . "\n";
+echo "\x1" . "1" . "\n";
+echo "\x11" . "1" . "\n";
+echo "\x111" . "1" . "\n";
+echo "\x1111" . "1" . "\n";
+echo "\x11111" . "1" . "\n";
+echo "\777777" . "7" . "\n";
+echo "\0777777" . "7" . "\n";
+echo "\00777777" . "7" . "\n";
+echo "\0077\"7777" . "7" . "\n";
+echo "\0077\\7777" . "7" . "\n";
+echo "\0077\a7777" . "7" . "\n";
+echo "\0077\b7777" . "7" . "\n";
+echo "\0077\f7777" . "7" . "\n";
+echo "\0077\n7777" . "7" . "\n";
+echo "\0077\r7777" . "7" . "\n";
+echo "\0077\t7777" . "7" . "\n";
+echo "\0077\v7777" . "7" . "\n";
+echo "\0077\07777" . "7" . "\n";
+echo "\0077\'7777" . "7" . "\n";
diff --git a/hphp/test/slow/concat/1576.php b/hphp/test/slow/concat/1576.php
index 6b26403e4..004981190 100644
--- a/hphp/test/slow/concat/1576.php
+++ b/hphp/test/slow/concat/1576.php
@@ -1,3 +1,35 @@
 <?php
 
- echo '\\';echo '\'';echo '\\';echo '\\';echo "\\";echo "\101";echo "\\";echo "\1";echo "\01";echo "\01";echo "\1";echo "\011";echo "\0111";echo "\x";echo "\x1";echo "\x11";echo "\x111";echo "\x1111";echo "\x11111";echo "\777777";echo "\0777777";echo "\00777777";echo "\0077\"7777";echo "\0077\\7777";echo "\0077\a7777";echo "\0077\b7777";echo "\0077\f7777";echo "\0077\n7777";echo "\0077\r7777";echo "\0077\t7777";echo "\0077\v7777";echo "\0077\07777";echo "\0077\'7777";
\ No newline at end of file
+echo '\\';
+echo '\'';
+echo '\\';
+echo '\\';
+echo "\\";
+echo "\101";
+echo "\\";
+echo "\1";
+echo "\01";
+echo "\01";
+echo "\1";
+echo "\011";
+echo "\0111";
+echo "\x";
+echo "\x1";
+echo "\x11";
+echo "\x111";
+echo "\x1111";
+echo "\x11111";
+echo "\777777";
+echo "\0777777";
+echo "\00777777";
+echo "\0077\"7777";
+echo "\0077\\7777";
+echo "\0077\a7777";
+echo "\0077\b7777";
+echo "\0077\f7777";
+echo "\0077\n7777";
+echo "\0077\r7777";
+echo "\0077\t7777";
+echo "\0077\v7777";
+echo "\0077\07777";
+echo "\0077\'7777";
diff --git a/hphp/test/slow/concat/1577.php b/hphp/test/slow/concat/1577.php
index fbc7bc467..2c738982a 100644
--- a/hphp/test/slow/concat/1577.php
+++ b/hphp/test/slow/concat/1577.php
@@ -1,6 +1,6 @@
 <?php
 
- echo <<<EOT
+echo <<<EOT
 \t
 \r
 \a
diff --git a/hphp/test/slow/concat/1578.php b/hphp/test/slow/concat/1578.php
index baf3ddb21..e3a1c8383 100644
--- a/hphp/test/slow/concat/1578.php
+++ b/hphp/test/slow/concat/1578.php
@@ -1,3 +1,5 @@
 <?php
 
- $v = 1;echo $v . b'a' . b"b" . `ls \055\144 \x2ftmp`;echo b'a' . b"b" . `ls \055\144 \x2ftmp` . $v;
\ No newline at end of file
+$v = 1;
+echo $v . b'a' . b"b" . `ls \055\144 \x2ftmp`;
+echo b'a' . b"b" . `ls \055\144 \x2ftmp` . $v;
diff --git a/hphp/test/slow/concat/1579.php b/hphp/test/slow/concat/1579.php
index 6c4f4b204..ed5d2d0f0 100644
--- a/hphp/test/slow/concat/1579.php
+++ b/hphp/test/slow/concat/1579.php
@@ -1,3 +1,18 @@
 <?php
 
- function foo() {  $u = "abc";  $v = "\0";  $w = "def\n";  $x = $u . $v . $w;  echo $x;  echo "abc" . "\0" . "def\n";}foo();$u = "abc";$v = "\0";$w = "def\n";$x = $u . $v . $w;echo $x;echo "abc" . "\0" . "def\n";echo "ab\0c\n";
\ No newline at end of file
+function foo() {
+  $u = "abc";
+  $v = "\0";
+  $w = "def\n";
+  $x = $u . $v . $w;
+  echo $x;
+  echo "abc" . "\0" . "def\n";
+}
+foo();
+$u = "abc";
+$v = "\0";
+$w = "def\n";
+$x = $u . $v . $w;
+echo $x;
+echo "abc" . "\0" . "def\n";
+echo "ab\0c\n";
diff --git a/hphp/test/slow/concat/1580.php b/hphp/test/slow/concat/1580.php
index 137d3f9fd..8c737acb3 100644
--- a/hphp/test/slow/concat/1580.php
+++ b/hphp/test/slow/concat/1580.php
@@ -1,4 +1,11 @@
 <?php
 
- function foo() { return "hello" . "\0" . "world
-"; }function bar() {  $s = foo();  echo $s;}bar();
\ No newline at end of file
+function foo() {
+ return "hello" . "\0" . "world
+";
+ }
+function bar() {
+  $s = foo();
+  echo $s;
+}
+bar();
diff --git a/hphp/test/slow/concat/1581.php b/hphp/test/slow/concat/1581.php
index e0e3fec80..65c29dcf7 100644
--- a/hphp/test/slow/concat/1581.php
+++ b/hphp/test/slow/concat/1581.php
@@ -1,3 +1,4 @@
 <?php
 
- define('FOO'.'BAR', 1);echo FOOBAR;
\ No newline at end of file
+define('FOO'.'BAR', 1);
+echo FOOBAR;
diff --git a/hphp/test/slow/concat/1582.php b/hphp/test/slow/concat/1582.php
index bf4e0476c..43d874647 100644
--- a/hphp/test/slow/concat/1582.php
+++ b/hphp/test/slow/concat/1582.php
@@ -1,3 +1,12 @@
 <?php
 
- $a = "1";$a .= "2";$a .= "3";$a .= "4";var_dump($a);$a .= "1";$a .= "2";$a .= "3";$a .= "4";var_dump($a);
\ No newline at end of file
+$a = "1";
+$a .= "2";
+$a .= "3";
+$a .= "4";
+var_dump($a);
+$a .= "1";
+$a .= "2";
+$a .= "3";
+$a .= "4";
+var_dump($a);
diff --git a/hphp/test/slow/concat/1583.php b/hphp/test/slow/concat/1583.php
index 3891f753d..12c263337 100644
--- a/hphp/test/slow/concat/1583.php
+++ b/hphp/test/slow/concat/1583.php
@@ -1,3 +1,14 @@
 <?php
 
- $a = array(1, array(1, array(1)));$a[1][1][1] = 3;var_dump($a);$a[1][1][1] = "1";$a[1][1][1] .= "2";$a[1][1][1] .= "3";$a[1][1][1] .= "4";$a[1][1][1] .= "5";var_dump($a);$payload['pane_html'] = null;$payload['pane_html'] = '<div id="beacon_accepted_pane" class="beacon_status_pane" style="display: none">';$payload['pane_html'] .= '<div class="beacon_status_message">';
\ No newline at end of file
+$a = array(1, array(1, array(1)));
+$a[1][1][1] = 3;
+var_dump($a);
+$a[1][1][1] = "1";
+$a[1][1][1] .= "2";
+$a[1][1][1] .= "3";
+$a[1][1][1] .= "4";
+$a[1][1][1] .= "5";
+var_dump($a);
+$payload['pane_html'] = null;
+$payload['pane_html'] = '<div id="beacon_accepted_pane" class="beacon_status_pane" style="display: none">';
+$payload['pane_html'] .= '<div class="beacon_status_message">';
diff --git a/hphp/test/slow/concat/1584.php b/hphp/test/slow/concat/1584.php
index 342bb0fbb..d7632786e 100644
--- a/hphp/test/slow/concat/1584.php
+++ b/hphp/test/slow/concat/1584.php
@@ -1,3 +1,23 @@
 <?php
 
- $a1 = a;$a2 = b;$a3 = c;$a4 = d;$a5 = e;$a6 = f;$a7 = g;$a8 = h;$a9 = i;$a10 = j;$a11 = k;$a12 = l;$a13 = m;echo $a1.$a2.$a3.$a4.$a5.$a6;echo $a1.$a2.$a3.$a4.$a5.$a6.$a7;echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8;echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9;echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9.$a10;echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9.$a10.$a11;echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9.$a10.$a11.$a12;echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9.$a10.$a11.$a12.$a13;
\ No newline at end of file
+$a1 = a;
+$a2 = b;
+$a3 = c;
+$a4 = d;
+$a5 = e;
+$a6 = f;
+$a7 = g;
+$a8 = h;
+$a9 = i;
+$a10 = j;
+$a11 = k;
+$a12 = l;
+$a13 = m;
+echo $a1.$a2.$a3.$a4.$a5.$a6;
+echo $a1.$a2.$a3.$a4.$a5.$a6.$a7;
+echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8;
+echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9;
+echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9.$a10;
+echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9.$a10.$a11;
+echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9.$a10.$a11.$a12;
+echo $a1.$a2.$a3.$a4.$a5.$a6.$a7.$a8.$a9.$a10.$a11.$a12.$a13;
diff --git a/hphp/test/slow/concat/1585.php b/hphp/test/slow/concat/1585.php
index e74f8b8d9..8bf173150 100644
--- a/hphp/test/slow/concat/1585.php
+++ b/hphp/test/slow/concat/1585.php
@@ -1,4 +1,19 @@
 <?php
 
- function n_() {  return "
-" .  str_repeat($GLOBALS['n_indent_tab'], $GLOBALS['n_indent_level']);}function n_indent() {  $GLOBALS['n_indent_level']++;  return n_();}function n_unindent() {  $GLOBALS['n_indent_level']--;  return n_();}function render($arg1, $arg2) {    return      '<div id="captcha" class="'.$arg1.'">'.      n_indent().      $arg2 .      n_unindent().      '</div>';}$GLOBALS['n_indent_level'] = 0;var_dump(render("foo", "bar"));
\ No newline at end of file
+function n_() {
+  return "
+" .  str_repeat($GLOBALS['n_indent_tab'], $GLOBALS['n_indent_level']);
+}
+function n_indent() {
+  $GLOBALS['n_indent_level']++;
+  return n_();
+}
+function n_unindent() {
+  $GLOBALS['n_indent_level']--;
+  return n_();
+}
+function render($arg1, $arg2) {
+    return      '<div id="captcha" class="'.$arg1.'">'.      n_indent().      $arg2 .      n_unindent().      '</div>';
+}
+$GLOBALS['n_indent_level'] = 0;
+var_dump(render("foo", "bar"));
diff --git a/hphp/test/slow/concat/1586.php b/hphp/test/slow/concat/1586.php
index fd2712b94..8e962a746 100644
--- a/hphp/test/slow/concat/1586.php
+++ b/hphp/test/slow/concat/1586.php
@@ -1,3 +1,13 @@
 <?php
 
- $s = " ";$a = "hello";$a .= $s;$a .= "world";var_dump($a);$a = "a";$a .= "b";$a .= $a;var_dump($a);$a = 3;echo 0 + "1$a";
\ No newline at end of file
+$s = " ";
+$a = "hello";
+$a .= $s;
+$a .= "world";
+var_dump($a);
+$a = "a";
+$a .= "b";
+$a .= $a;
+var_dump($a);
+$a = 3;
+echo 0 + "1$a";
diff --git a/hphp/test/slow/concat/1587.php b/hphp/test/slow/concat/1587.php
index cc1a0c306..9a863f11a 100644
--- a/hphp/test/slow/concat/1587.php
+++ b/hphp/test/slow/concat/1587.php
@@ -1,3 +1,13 @@
 <?php
 
- function test($a){  if ($a > 0) {    $sql = 'foo';  } else {    $sql = 'bar';  }  $sql .= ' baz';  return $sql;}echo test(1),test(-1),"\n";
\ No newline at end of file
+function test($a){
+  if ($a > 0) {
+    $sql = 'foo';
+  }
+ else {
+    $sql = 'bar';
+  }
+  $sql .= ' baz';
+  return $sql;
+}
+echo test(1),test(-1),"\n";
diff --git a/hphp/test/slow/concat/1588.php b/hphp/test/slow/concat/1588.php
index 36806c04a..ed9b80b16 100644
--- a/hphp/test/slow/concat/1588.php
+++ b/hphp/test/slow/concat/1588.php
@@ -1,5 +1,13 @@
 <?php
 
- function foo() {  echo " FOO ";  return " foo ";}function bar() {  echo " hello " . foo() . "
-";  echo " hello " , foo() , "
-";}bar();
\ No newline at end of file
+function foo() {
+  echo " FOO ";
+  return " foo ";
+}
+function bar() {
+  echo " hello " . foo() . "
+";
+  echo " hello " , foo() , "
+";
+}
+bar();
diff --git a/hphp/test/slow/concat/1589.php b/hphp/test/slow/concat/1589.php
index 37539cc3c..ac902f8c0 100644
--- a/hphp/test/slow/concat/1589.php
+++ b/hphp/test/slow/concat/1589.php
@@ -1,3 +1,50 @@
 <?php
 
- function foo() {  print " FOO ";  return " foo ";}class A implements ArrayAccess {  private $data = array();  public function offsetUnset($index) {}  public function offsetGet($index) {    print " GET ";    return " get ";  }  public function offsetSet($index, $value) {    $data[$index] = $value;  }  public function offsetExists($index) { }}class C {  public function __get( $what ) {    echo "get C\n";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C\n";    $this->_p[ $what ] = $value;  }  private $_p = array();}function bar() {  print " hello " . foo() . "\n";  $a = new A;  $a[0] = 0;  $a[1] = 1;  echo " hello $a[0]";  echo " hello $a[1]\n";  print " hello $a[0]";  print " hello $a[1]\n";  $b = new C;  $b->a = 'aaaa';  $b->b = 'bbbb';  echo " hello $b->a";  echo " hello $b->b\n";  print " hello $b->a";  print " hello $b->b\n";  echo " hello $b->a $b->b $b->a $b->b";}bar();
\ No newline at end of file
+function foo() {
+  print " FOO ";
+  return " foo ";
+}
+class A implements ArrayAccess {
+  private $data = array();
+  public function offsetUnset($index) {
+}
+  public function offsetGet($index) {
+    print " GET ";
+    return " get ";
+  }
+  public function offsetSet($index, $value) {
+    $data[$index] = $value;
+  }
+  public function offsetExists($index) {
+ }
+}
+class C {
+  public function __get( $what ) {
+    echo "get C\n";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C\n";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+function bar() {
+  print " hello " . foo() . "\n";
+  $a = new A;
+  $a[0] = 0;
+  $a[1] = 1;
+  echo " hello $a[0]";
+  echo " hello $a[1]\n";
+  print " hello $a[0]";
+  print " hello $a[1]\n";
+  $b = new C;
+  $b->a = 'aaaa';
+  $b->b = 'bbbb';
+  echo " hello $b->a";
+  echo " hello $b->b\n";
+  print " hello $b->a";
+  print " hello $b->b\n";
+  echo " hello $b->a $b->b $b->a $b->b";
+}
+bar();
diff --git a/hphp/test/slow/concat/1590.php b/hphp/test/slow/concat/1590.php
index ce3c759c3..ccd72390b 100644
--- a/hphp/test/slow/concat/1590.php
+++ b/hphp/test/slow/concat/1590.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($a, $b) {  return $a . "\0" . $b . "\0" . $a . $b . $a . $b;}var_dump(json_encode(test('x', 'y')));
\ No newline at end of file
+function test($a, $b) {
+  return $a . "\0" . $b . "\0" . $a . $b . $a . $b;
+}
+var_dump(json_encode(test('x', 'y')));
diff --git a/hphp/test/slow/concat/1591.php b/hphp/test/slow/concat/1591.php
index 81be4d3b2..9a39a17a7 100644
--- a/hphp/test/slow/concat/1591.php
+++ b/hphp/test/slow/concat/1591.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 1;var_dump($a . '2' . '3');
\ No newline at end of file
+$a = 1;
+var_dump($a . '2' . '3');
diff --git a/hphp/test/slow/concat/1592.php b/hphp/test/slow/concat/1592.php
index 6a21439c5..89f98b418 100644
--- a/hphp/test/slow/concat/1592.php
+++ b/hphp/test/slow/concat/1592.php
@@ -1,3 +1,6 @@
 <?php
 
- $a= 'a';$b = 'b';$c = 0;var_dump($a . $b == $c);
\ No newline at end of file
+$a= 'a';
+$b = 'b';
+$c = 0;
+var_dump($a . $b == $c);
diff --git a/hphp/test/slow/concat/1593.php b/hphp/test/slow/concat/1593.php
index d464709cd..7bfa7fb58 100644
--- a/hphp/test/slow/concat/1593.php
+++ b/hphp/test/slow/concat/1593.php
@@ -1,3 +1,12 @@
 <?php
 
- class C {  public function __toString() {    return 'bar';  }}function f($x) {  var_dump($x . '');}f(123);f(new C);
\ No newline at end of file
+class C {
+  public function __toString() {
+    return 'bar';
+  }
+}
+function f($x) {
+  var_dump($x . '');
+}
+f(123);
+f(new C);
diff --git a/hphp/test/slow/constant/1594.php b/hphp/test/slow/constant/1594.php
index 1d7fa92bb..39387a4df 100644
--- a/hphp/test/slow/constant/1594.php
+++ b/hphp/test/slow/constant/1594.php
@@ -1,3 +1,5 @@
 <?php
 
- define('A', 'B'); define('A_'.A, 'B'); var_dump(A, A_B);
\ No newline at end of file
+define('A', 'B');
+ define('A_'.A, 'B');
+ var_dump(A, A_B);
diff --git a/hphp/test/slow/constant/1595.php b/hphp/test/slow/constant/1595.php
index efd21165d..b7bd48bdf 100644
--- a/hphp/test/slow/constant/1595.php
+++ b/hphp/test/slow/constant/1595.php
@@ -1,3 +1,27 @@
 <?php
 
- define('AAA', true);define('BBB', false);define('CCC', null);if (AAA){  echo "AAA";} else {  echo "!AAA";}if (BBB) {  echo "BBB";} else {  echo "!BBB";}if (CCC) {  echo "CCC";} else {  echo "!CCC";}$a = AAA ? "AAA" : "!AAA";$b = BBB ? "BBB" : "!BBB";$c = CCC ? "CCC" : "!CCC";echo "$a$b$c\n";
\ No newline at end of file
+define('AAA', true);
+define('BBB', false);
+define('CCC', null);
+if (AAA){
+  echo "AAA";
+}
+ else {
+  echo "!AAA";
+}
+if (BBB) {
+  echo "BBB";
+}
+ else {
+  echo "!BBB";
+}
+if (CCC) {
+  echo "CCC";
+}
+ else {
+  echo "!CCC";
+}
+$a = AAA ? "AAA" : "!AAA";
+$b = BBB ? "BBB" : "!BBB";
+$c = CCC ? "CCC" : "!CCC";
+echo "$a$b$c\n";
diff --git a/hphp/test/slow/constant/1596.php b/hphp/test/slow/constant/1596.php
index 2549114b7..0e6df6716 100644
--- a/hphp/test/slow/constant/1596.php
+++ b/hphp/test/slow/constant/1596.php
@@ -1,3 +1,96 @@
 <?php
 
- echo strlen("he\0llo");echo php_uname();echo md5('1f3870be274f6c49b3e31a0c6728957f');echo sha1('1f3870be274f6c49b3e31a0c6728957f');echo crc32('1f3870be274f6c49b3e31a0c6728957f');echo pi();echo getrandmax();echo mt_getrandmax();echo ord('abc');echo chr(27);echo strtoupper("Mary Had A \0 Lamb");echo strtolower("Mary Had A \0 Lamb");echo strcmp("Mary Had A \0Lamb", "Mary Had A Lamb") < 0;echo strncmp("Mary Had A \0 Lamb", "Mary Had A  Lamb", 5) == 0;echo strcasecmp("Mary Had A \0 Lamb", "Mary Had A  Lamb") < 0;echo strncasecmp("Mary Had A \0 Lamb", "Mary Had A  Lamb", 5) == 0;echo addslashes("Is your name \0O'reilly?");echo htmlspecialchars("<a ref='test'>Test</a>", ENT_QUOTES);echo htmlspecialchars_decode("\0abc");echo htmlspecialchars_decode("abc\0def");echo htmlentities("<a ref='test'>Test</a>", ENT_QUOTES);echo dirname("<a ref='test'>Test</a>");echo basename("<a ref='test'>Test</a>");echo version_compare("5.1.2", "5.1.3");echo dechex(10);echo hexdec("See");echo decbin(12);echo decbin('000110011');echo decoct(264);echo octdec('77');echo octdec(decoct(45));echo str_repeat("-=", 10);echo intval(42);echo intval(4.2);echo intval('42');echo intval('+42');echo intval('-42');echo intval(042);echo intval('042');echo intval(1e10);echo intval('1e10');echo intval(0x1A);echo intval(42000000);echo intval(42, 8);echo intval('42', 8);echo substr("abcdef", -1);echo substr("abcdef", -2);echo substr("abcdef", -3, 1);echo substr("abcdef", 0, -1);echo substr("abcdef", 2, -1);echo substr("abcdef", 4, -4);echo substr("abcdef", -3, -1);echo substr("abcdef", 1);echo substr("abcdef", 1, 3);echo substr("abcdef", 0, 4);echo substr("abcdef", 0, 8);echo substr("abcdef", -1, 1);echo trim("\t\t\0These are a few words :) ... ");echo trim("\t\t\0These are a few words :) ... ", " \t.");echo trim("\x09Example string\x0A", "\x00..\x1F");echo ltrim("\t\t\0These are a few words :) ... ");echo ltrim("\t\t\0These are a few words :) ... ", " \t.");echo ltrim("\x09Example string\x0A", "\x00..\x1F");echo rtrim("\t\t\0These are a few words :) ... ");echo rtrim("\t\t\0These are a few words :) ... ", " \t.");echo rtrim("\x09Example string\x0A", "\x00..\x1F");echo chop("\t\t\0These are a few words :) ... ");echo chop("\t\t\0These are a few words :) ... ", " \t.");echo chop("\x09Example string\x0A", "\x00..\x1F");echo acos(0.5);echo acosh(0.5);echo asin(0.5);echo asinh(0.5);echo atan(0.5);echo atan2(0.5, 0.5);echo atanh(0.5);echo cos(0.5);echo cosh(0.5);echo sin(0.5);echo sinh(0.5);echo tan(0.5);echo tanh(0.5);echo exp(5.7);echo exp(12);echo log10(12);echo log(12);echo sqrt(2);echo ceil(7.9);echo floor(7.9);echo fmod(5.7, 1.3);echo ip2long("127.0.0.1");echo long2ip(pow(2,32) + 1024);echo rad2deg(M_PI_4);echo deg2rad(45);
\ No newline at end of file
+echo strlen("he\0llo");
+echo php_uname();
+echo md5('1f3870be274f6c49b3e31a0c6728957f');
+echo sha1('1f3870be274f6c49b3e31a0c6728957f');
+echo crc32('1f3870be274f6c49b3e31a0c6728957f');
+echo pi();
+echo getrandmax();
+echo mt_getrandmax();
+echo ord('abc');
+echo chr(27);
+echo strtoupper("Mary Had A \0 Lamb");
+echo strtolower("Mary Had A \0 Lamb");
+echo strcmp("Mary Had A \0Lamb", "Mary Had A Lamb") < 0;
+echo strncmp("Mary Had A \0 Lamb", "Mary Had A  Lamb", 5) == 0;
+echo strcasecmp("Mary Had A \0 Lamb", "Mary Had A  Lamb") < 0;
+echo strncasecmp("Mary Had A \0 Lamb", "Mary Had A  Lamb", 5) == 0;
+echo addslashes("Is your name \0O'reilly?");
+echo htmlspecialchars("<a ref='test'>Test</a>", ENT_QUOTES);
+echo htmlspecialchars_decode("\0abc");
+echo htmlspecialchars_decode("abc\0def");
+echo htmlentities("<a ref='test'>Test</a>", ENT_QUOTES);
+echo dirname("<a ref='test'>Test</a>");
+echo basename("<a ref='test'>Test</a>");
+echo version_compare("5.1.2", "5.1.3");
+echo dechex(10);
+echo hexdec("See");
+echo decbin(12);
+echo decbin('000110011');
+echo decoct(264);
+echo octdec('77');
+echo octdec(decoct(45));
+echo str_repeat("-=", 10);
+echo intval(42);
+echo intval(4.2);
+echo intval('42');
+echo intval('+42');
+echo intval('-42');
+echo intval(042);
+echo intval('042');
+echo intval(1e10);
+echo intval('1e10');
+echo intval(0x1A);
+echo intval(42000000);
+echo intval(42, 8);
+echo intval('42', 8);
+echo substr("abcdef", -1);
+echo substr("abcdef", -2);
+echo substr("abcdef", -3, 1);
+echo substr("abcdef", 0, -1);
+echo substr("abcdef", 2, -1);
+echo substr("abcdef", 4, -4);
+echo substr("abcdef", -3, -1);
+echo substr("abcdef", 1);
+echo substr("abcdef", 1, 3);
+echo substr("abcdef", 0, 4);
+echo substr("abcdef", 0, 8);
+echo substr("abcdef", -1, 1);
+echo trim("\t\t\0These are a few words :) ... ");
+echo trim("\t\t\0These are a few words :) ... ", " \t.");
+echo trim("\x09Example string\x0A", "\x00..\x1F");
+echo ltrim("\t\t\0These are a few words :) ... ");
+echo ltrim("\t\t\0These are a few words :) ... ", " \t.");
+echo ltrim("\x09Example string\x0A", "\x00..\x1F");
+echo rtrim("\t\t\0These are a few words :) ... ");
+echo rtrim("\t\t\0These are a few words :) ... ", " \t.");
+echo rtrim("\x09Example string\x0A", "\x00..\x1F");
+echo chop("\t\t\0These are a few words :) ... ");
+echo chop("\t\t\0These are a few words :) ... ", " \t.");
+echo chop("\x09Example string\x0A", "\x00..\x1F");
+echo acos(0.5);
+echo acosh(0.5);
+echo asin(0.5);
+echo asinh(0.5);
+echo atan(0.5);
+echo atan2(0.5, 0.5);
+echo atanh(0.5);
+echo cos(0.5);
+echo cosh(0.5);
+echo sin(0.5);
+echo sinh(0.5);
+echo tan(0.5);
+echo tanh(0.5);
+echo exp(5.7);
+echo exp(12);
+echo log10(12);
+echo log(12);
+echo sqrt(2);
+echo ceil(7.9);
+echo floor(7.9);
+echo fmod(5.7, 1.3);
+echo ip2long("127.0.0.1");
+echo long2ip(pow(2,32) + 1024);
+echo rad2deg(M_PI_4);
+echo deg2rad(45);
diff --git a/hphp/test/slow/constant/1597.php b/hphp/test/slow/constant/1597.php
index 861ce909d..85dca2c4f 100644
--- a/hphp/test/slow/constant/1597.php
+++ b/hphp/test/slow/constant/1597.php
@@ -1,3 +1,14 @@
 <?php
 
- var_dump(067);var_dump(077);var_dump(078);var_dump(0x78);var_dump(0x78f);var_dump(0xef);var_dump(-067);var_dump(-077);var_dump(-078);var_dump(-0x78);var_dump(-0x78f);var_dump(-0xef);
\ No newline at end of file
+var_dump(067);
+var_dump(077);
+var_dump(078);
+var_dump(0x78);
+var_dump(0x78f);
+var_dump(0xef);
+var_dump(-067);
+var_dump(-077);
+var_dump(-078);
+var_dump(-0x78);
+var_dump(-0x78f);
+var_dump(-0xef);
diff --git a/hphp/test/slow/constant/1598.php b/hphp/test/slow/constant/1598.php
index 23c4db1eb..f70158043 100644
--- a/hphp/test/slow/constant/1598.php
+++ b/hphp/test/slow/constant/1598.php
@@ -1,3 +1,7 @@
 <?php
 
- define('FOO', "\n");define('BAR', "\r");var_dump(PHP_EOL);var_dump(FOO);var_dump(BAR);
\ No newline at end of file
+define('FOO', "\n");
+define('BAR', "\r");
+var_dump(PHP_EOL);
+var_dump(FOO);
+var_dump(BAR);
diff --git a/hphp/test/slow/constant/1599.php b/hphp/test/slow/constant/1599.php
index 2a6dccd0f..18e7bfcd6 100644
--- a/hphp/test/slow/constant/1599.php
+++ b/hphp/test/slow/constant/1599.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(INF);var_dump(NAN);
\ No newline at end of file
+var_dump(INF);
+var_dump(NAN);
diff --git a/hphp/test/slow/constant/1600.php b/hphp/test/slow/constant/1600.php
index 7eb3ebc86..c6a8f4104 100644
--- a/hphp/test/slow/constant/1600.php
+++ b/hphp/test/slow/constant/1600.php
@@ -1,3 +1,4 @@
 <?php
 
- define('A_B', 555);define('A_'. 'B', 'B');
\ No newline at end of file
+define('A_B', 555);
+define('A_'. 'B', 'B');
diff --git a/hphp/test/slow/constant/1601.php b/hphp/test/slow/constant/1601.php
index e1aec26e5..9b7d04e13 100644
--- a/hphp/test/slow/constant/1601.php
+++ b/hphp/test/slow/constant/1601.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(define('AF_UNIX', 5));var_dump(AF_UNIX);
\ No newline at end of file
+var_dump(define('AF_UNIX', 5));
+var_dump(AF_UNIX);
diff --git a/hphp/test/slow/constant/1602.php b/hphp/test/slow/constant/1602.php
index 83f2985fe..9ddbf8994 100644
--- a/hphp/test/slow/constant/1602.php
+++ b/hphp/test/slow/constant/1602.php
@@ -1,3 +1,10 @@
 <?php
 
- var_dump(define('KONST', array('a', 'bc')));var_dump(KONST);var_dump(define('FLUB', 1230));var_dump(define('FLUB', array(1,23)));var_dump(FLUB);var_dump(define('BLAH', array_map('strlen', array('a', 'bc'))));var_dump(BLAH);define('FOO', array(1,2,3));
\ No newline at end of file
+var_dump(define('KONST', array('a', 'bc')));
+var_dump(KONST);
+var_dump(define('FLUB', 1230));
+var_dump(define('FLUB', array(1,23)));
+var_dump(FLUB);
+var_dump(define('BLAH', array_map('strlen', array('a', 'bc'))));
+var_dump(BLAH);
+define('FOO', array(1,2,3));
diff --git a/hphp/test/slow/constant/1603.php b/hphp/test/slow/constant/1603.php
index 4f3672733..12bbd643a 100644
--- a/hphp/test/slow/constant/1603.php
+++ b/hphp/test/slow/constant/1603.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(define('foo', false));var_dump(define('foo', true));
\ No newline at end of file
+var_dump(define('foo', false));
+var_dump(define('foo', true));
diff --git a/hphp/test/slow/constant/cns-autoload.php b/hphp/test/slow/constant/cns-autoload.php
index e03f26840..26b0f693f 100644
--- a/hphp/test/slow/constant/cns-autoload.php
+++ b/hphp/test/slow/constant/cns-autoload.php
@@ -1,8 +1,13 @@
 <?php
+
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-function def() { define('FOO', 1); }
-function show($a,$b) { var_dump($a,$b); }
+function def() {
+ define('FOO', 1);
+ }
+function show($a,$b) {
+ var_dump($a,$b);
+ }
 function test() {
   show(FOO, FOO);
 }
diff --git a/hphp/test/slow/constant_function/1621.php b/hphp/test/slow/constant_function/1621.php
index b1005b545..a6f46ad13 100644
--- a/hphp/test/slow/constant_function/1621.php
+++ b/hphp/test/slow/constant_function/1621.php
@@ -1,3 +1,19 @@
 <?php
 
- class JavaScriptPacker {  public function foo() {    $encode10 = $this->_getJSFunction('_encode10');    var_dump($encode10);    $encode36 = $this->_getJSFunction('_encode36');    var_dump($encode36);  }  private function _getJSFunction($aName) {    if (defined('self::JSFUNCTION'.$aName))      return constant('self::JSFUNCTION'.$aName);    else      return '';  }      const JSFUNCTION_encode10 =        'function($charCode) {    return $charCode;}';}$obj = new JavaScriptPacker;$obj->foo(); 
\ No newline at end of file
+class JavaScriptPacker {
+  public function foo() {
+    $encode10 = $this->_getJSFunction('_encode10');
+    var_dump($encode10);
+    $encode36 = $this->_getJSFunction('_encode36');
+    var_dump($encode36);
+  }
+  private function _getJSFunction($aName) {
+    if (defined('self::JSFUNCTION'.$aName))
+      return constant('self::JSFUNCTION'.$aName);
+    else
+      return '';
+  }
+  const JSFUNCTION_encode10 = 'function($charCode) { return $charCode; } ';
+}
+$obj = new JavaScriptPacker;
+$obj->foo();
diff --git a/hphp/test/slow/constant_function/1621.php.expect b/hphp/test/slow/constant_function/1621.php.expect
index 2dbc3075b..3a5b60351 100644
--- a/hphp/test/slow/constant_function/1621.php.expect
+++ b/hphp/test/slow/constant_function/1621.php.expect
@@ -1,2 +1,2 @@
-string(43) "function($charCode) {    return $charCode;}"
+string(42) "function($charCode) { return $charCode; } "
 string(0) ""
diff --git a/hphp/test/slow/constant_function/1622.php b/hphp/test/slow/constant_function/1622.php
index 24de4f60c..67ef5d93a 100644
--- a/hphp/test/slow/constant_function/1622.php
+++ b/hphp/test/slow/constant_function/1622.php
@@ -1,3 +1,18 @@
 <?php
 
- var_dump(constant('M_PI'));$a = 'M_PI';var_dump(constant($a));define('FOO', M_PI);var_dump(constant('FOO'));define('BAR', php_uname());var_dump(constant('BAR'));define(/*|Dynamic|*/'GOO', 1);var_dump(constant('GOO'));if (false) {  define('C', 1);} else {  define('C', 2);}var_dump(constant('C'));
\ No newline at end of file
+var_dump(constant('M_PI'));
+$a = 'M_PI';
+var_dump(constant($a));
+define('FOO', M_PI);
+var_dump(constant('FOO'));
+define('BAR', php_uname());
+var_dump(constant('BAR'));
+define(/*|Dynamic|*/'GOO', 1);
+var_dump(constant('GOO'));
+if (false) {
+  define('C', 1);
+}
+ else {
+  define('C', 2);
+}
+var_dump(constant('C'));
diff --git a/hphp/test/slow/constructor/1719.php b/hphp/test/slow/constructor/1719.php
index ce429b258..b7c2365fb 100644
--- a/hphp/test/slow/constructor/1719.php
+++ b/hphp/test/slow/constructor/1719.php
@@ -1,4 +1,13 @@
 <?php
 
- class A { function a() { echo "A
-"; }}function test() { $obj = new A(); $obj->a(); }test();
\ No newline at end of file
+class A {
+ function a() {
+ echo "A
+";
+ }
+}
+function test() {
+ $obj = new A();
+ $obj->a();
+ }
+test();
diff --git a/hphp/test/slow/constructor/1720.php b/hphp/test/slow/constructor/1720.php
index 24abd4c31..f936d95a6 100644
--- a/hphp/test/slow/constructor/1720.php
+++ b/hphp/test/slow/constructor/1720.php
@@ -1,5 +1,17 @@
 <?php
 
- class A {  function a() { echo "A
-"; }  function __construct() { echo "cons
-"; }} function test() { $obj = new A(); $obj->a(); } test();
\ No newline at end of file
+class A {
+  function a() {
+ echo "A
+";
+ }
+  function __construct() {
+ echo "cons
+";
+ }
+}
+ function test() {
+ $obj = new A();
+ $obj->a();
+ }
+ test();
diff --git a/hphp/test/slow/constructor/1721.php b/hphp/test/slow/constructor/1721.php
index 881401d48..ce1e10024 100644
--- a/hphp/test/slow/constructor/1721.php
+++ b/hphp/test/slow/constructor/1721.php
@@ -1,3 +1,57 @@
 <?php
 
- class A {  public function A() {    echo "In A\n";    $this->__construct();  }  public function __construct() {    echo "In A::__construct\n";  }}class B extends A {  public function B() {    echo "In B\n";    $this->A();  }}$obj = new B();class A2 {  public function __construct() {    echo "In A2::__construct\n";    $this->B2();  }  public function B2() {    echo "In B2\n";  }}class B2 extends A2 {  public function __construct() {    echo "In B2::__construct\n";    parent::__construct();  }}$obj = new B2();class C {  public function C() {}}class D extends C {  public function __construct() {    echo "In D::__construct\n";    C::__construct();  }}$obj = new D;$obj->c();class E {  public function E() {    echo "In E\n";  }  public function foo() {    $this->E();    E::__construct();  }}$obj = new E;$obj->foo();
\ No newline at end of file
+class A {
+  public function A() {
+    echo "In A\n";
+    $this->__construct();
+  }
+  public function __construct() {
+    echo "In A::__construct\n";
+  }
+}
+class B extends A {
+  public function B() {
+    echo "In B\n";
+    $this->A();
+  }
+}
+$obj = new B();
+class A2 {
+  public function __construct() {
+    echo "In A2::__construct\n";
+    $this->B2();
+  }
+  public function B2() {
+    echo "In B2\n";
+  }
+}
+class B2 extends A2 {
+  public function __construct() {
+    echo "In B2::__construct\n";
+    parent::__construct();
+  }
+}
+$obj = new B2();
+class C {
+  public function C() {
+}
+}
+class D extends C {
+  public function __construct() {
+    echo "In D::__construct\n";
+    C::__construct();
+  }
+}
+$obj = new D;
+$obj->c();
+class E {
+  public function E() {
+    echo "In E\n";
+  }
+  public function foo() {
+    $this->E();
+    E::__construct();
+  }
+}
+$obj = new E;
+$obj->foo();
diff --git a/hphp/test/slow/constructor/1722.php b/hphp/test/slow/constructor/1722.php
index 7cd22877e..322a5d72c 100644
--- a/hphp/test/slow/constructor/1722.php
+++ b/hphp/test/slow/constructor/1722.php
@@ -1,3 +1,20 @@
 <?php
 
- if (isset($g)) {  class X {}} else {  class X {function X() {var_dump(__METHOD__);}}}class Y extends X {  function __construct($a, $b) {    var_dump(__METHOD__);    parent::__construct($a,$b);  }}$y = new Y(1,2);
\ No newline at end of file
+if (isset($g)) {
+  class X {
+}
+}
+ else {
+  class X {
+function X() {
+var_dump(__METHOD__);
+}
+}
+}
+class Y extends X {
+  function __construct($a, $b) {
+    var_dump(__METHOD__);
+    parent::__construct($a,$b);
+  }
+}
+$y = new Y(1,2);
diff --git a/hphp/test/slow/constructor/1723.php b/hphp/test/slow/constructor/1723.php
index ae8601cec..fe6667c41 100644
--- a/hphp/test/slow/constructor/1723.php
+++ b/hphp/test/slow/constructor/1723.php
@@ -1,3 +1,35 @@
 <?php
 
- if (true) {  class A {    public function __construct($i, $j, $k) {      $this->a = $i * $i;      $this->b = $j * $j;      $this->c = $k * $k;    }    public $a;    protected $b;    private $c;    public $aa = 'aa';    protected $bb = false;    private $cc = 1.22;  }}class B extends A {  public function __construct($i, $j, $k) {    $this->a = $i + $i;    $this->b = $j + $j;    $this->c = $k + $k;  }  public $a;  protected $b;  private $c;  public $aa = 'aaa';  protected $bb = 4;  private $cc = 1.222;}function foo() {  $obj = new B(1, 2, 3);  var_dump($obj);}foo();
\ No newline at end of file
+if (true) {
+  class A {
+    public function __construct($i, $j, $k) {
+      $this->a = $i * $i;
+      $this->b = $j * $j;
+      $this->c = $k * $k;
+    }
+    public $a;
+    protected $b;
+    private $c;
+    public $aa = 'aa';
+    protected $bb = false;
+    private $cc = 1.22;
+  }
+}
+class B extends A {
+  public function __construct($i, $j, $k) {
+    $this->a = $i + $i;
+    $this->b = $j + $j;
+    $this->c = $k + $k;
+  }
+  public $a;
+  protected $b;
+  private $c;
+  public $aa = 'aaa';
+  protected $bb = 4;
+  private $cc = 1.222;
+}
+function foo() {
+  $obj = new B(1, 2, 3);
+  var_dump($obj);
+}
+foo();
diff --git a/hphp/test/slow/constructor_destructor/1568.php b/hphp/test/slow/constructor_destructor/1568.php
index a1d08f86f..132dff35e 100644
--- a/hphp/test/slow/constructor_destructor/1568.php
+++ b/hphp/test/slow/constructor_destructor/1568.php
@@ -1,3 +1,20 @@
 <?php
 
- class parent_c {  public function __construct() {    echo "parent__construct";  }  public function __destruct() {    echo "parent__destruct";  }}class child_c extends parent_c {  public function __construct() {    echo "child__construct";  }  public function __destruct() {    echo "child__destruct";  }}$v = new child_c;unset($v);
\ No newline at end of file
+class parent_c {
+  public function __construct() {
+    echo "parent__construct";
+  }
+  public function __destruct() {
+    echo "parent__destruct";
+  }
+}
+class child_c extends parent_c {
+  public function __construct() {
+    echo "child__construct";
+  }
+  public function __destruct() {
+    echo "child__destruct";
+  }
+}
+$v = new child_c;
+unset($v);
diff --git a/hphp/test/slow/constructor_destructor/1569.php b/hphp/test/slow/constructor_destructor/1569.php
index 568b5c95d..f9d752ef1 100644
--- a/hphp/test/slow/constructor_destructor/1569.php
+++ b/hphp/test/slow/constructor_destructor/1569.php
@@ -1,3 +1,22 @@
 <?php
 
- class parent_c {  public function __construct() {    echo "parent__construct";  }  public function __destruct() {    echo "parent__destruct";  }}class child_c extends parent_c {  public function __construct() {    echo "child__construct";    parent::__construct();  }  public function __destruct() {    echo "child__destruct";    parent::__destruct();  }}$v = new child_c;unset($v);
\ No newline at end of file
+class parent_c {
+  public function __construct() {
+    echo "parent__construct";
+  }
+  public function __destruct() {
+    echo "parent__destruct";
+  }
+}
+class child_c extends parent_c {
+  public function __construct() {
+    echo "child__construct";
+    parent::__construct();
+  }
+  public function __destruct() {
+    echo "child__destruct";
+    parent::__destruct();
+  }
+}
+$v = new child_c;
+unset($v);
diff --git a/hphp/test/slow/constructor_destructor/1570.php b/hphp/test/slow/constructor_destructor/1570.php
index a36e10fba..bf8e81e55 100644
--- a/hphp/test/slow/constructor_destructor/1570.php
+++ b/hphp/test/slow/constructor_destructor/1570.php
@@ -1,3 +1,79 @@
 <?php
 
- ;class B1 {}class C1 { function __construct() {} }class D1 { function __destruct() { var_dump(__METHOD__); } }class D2 extends C1 { function __destruct(){ var_dump(__METHOD__); } }class D3 extends D2 {}class D4 extends B1 { function __destruct(){ var_dump(__METHOD__); } }class D5 extends D4 {}class D6 extends D1 { function __construct($a) { if ($a) f(); } }function f() { throw new Exception('throw'); }function foo($a,$b) {  try {    $x = new D6($b?f():$a);  } catch (Exception $e) {    var_dump('caught');  }}function bar($x, $a, $b) {  try {    $x = new $x($b?f():$a);  } catch (Exception $e) {    var_dump('caught');  }}function n($x) { return new $x; }function baz($d) {  $x = new D1;  $x = new D2;  $x = new D3;  $x = new D4;  $x = new D5;  $x = new D6;  $x = n($d.'1');  $x = n($d.'2');  $x = n($d.'3');  $x = n($d.'4');  $x = n($d.'5');  $x = n($d.'6');  $x = n('B1');}foo(false,false);foo(false,true);foo(true,true);foo(true,false);bar('D6',false,false);bar('D6',false,true);bar('D6',true,false);bar('D6',true,true);baz('D');
\ No newline at end of file
+;
+class B1 {
+}
+class C1 {
+ function __construct() {
+}
+ }
+class D1 {
+ function __destruct() {
+ var_dump(__METHOD__);
+ }
+ }
+class D2 extends C1 {
+ function __destruct(){
+ var_dump(__METHOD__);
+ }
+ }
+class D3 extends D2 {
+}
+class D4 extends B1 {
+ function __destruct(){
+ var_dump(__METHOD__);
+ }
+ }
+class D5 extends D4 {
+}
+class D6 extends D1 {
+ function __construct($a) {
+ if ($a) f();
+ }
+ }
+function f() {
+ throw new Exception('throw');
+ }
+function foo($a,$b) {
+  try {
+    $x = new D6($b?f():$a);
+  }
+ catch (Exception $e) {
+    var_dump('caught');
+  }
+}
+function bar($x, $a, $b) {
+  try {
+    $x = new $x($b?f():$a);
+  }
+ catch (Exception $e) {
+    var_dump('caught');
+  }
+}
+function n($x) {
+ return new $x;
+ }
+function baz($d) {
+  $x = new D1;
+  $x = new D2;
+  $x = new D3;
+  $x = new D4;
+  $x = new D5;
+  $x = new D6;
+  $x = n($d.'1');
+  $x = n($d.'2');
+  $x = n($d.'3');
+  $x = n($d.'4');
+  $x = n($d.'5');
+  $x = n($d.'6');
+  $x = n('B1');
+}
+foo(false,false);
+foo(false,true);
+foo(true,true);
+foo(true,false);
+bar('D6',false,false);
+bar('D6',false,true);
+bar('D6',true,false);
+bar('D6',true,true);
+baz('D');
diff --git a/hphp/test/slow/continue_statement/1416.php b/hphp/test/slow/continue_statement/1416.php
index df681a9d5..2b29629ec 100644
--- a/hphp/test/slow/continue_statement/1416.php
+++ b/hphp/test/slow/continue_statement/1416.php
@@ -1,3 +1,26 @@
 <?php
 
- for ($i = 0;$i<3;$i++) {  echo "Start Of I loop\n";  for ($j=0;;$j++) {    if ($j >= 2) continue 2;      echo "I : $i J : $j"."\n";  }  echo "End\n";}for ($i = 0;$i<10;$i++) {  if ($i % 2 == 0) continue 1;  echo $i . "\n";}for ($i = 0;$i<10;$i++) {  if ($i % 2 == 0) continue;  echo $i . "\n";}
\ No newline at end of file
+for ($i = 0;
+$i<3;
+$i++) {
+  echo "Start Of I loop\n";
+  for ($j=0;
+;
+$j++) {
+    if ($j >= 2) continue 2;
+      echo "I : $i J : $j"."\n";
+  }
+  echo "End\n";
+}
+for ($i = 0;
+$i<10;
+$i++) {
+  if ($i % 2 == 0) continue 1;
+  echo $i . "\n";
+}
+for ($i = 0;
+$i<10;
+$i++) {
+  if ($i % 2 == 0) continue;
+  echo $i . "\n";
+}
diff --git a/hphp/test/slow/continue_statement/1417.php b/hphp/test/slow/continue_statement/1417.php
index bb7f5db9c..5af59a522 100644
--- a/hphp/test/slow/continue_statement/1417.php
+++ b/hphp/test/slow/continue_statement/1417.php
@@ -1,3 +1,16 @@
 <?php
 
- for ($i1 = 0; $i1 < 2; $i1++) {  for ($i2 = 0; $i2 < 2; $i2++) {    switch ($i2 % 2) {      case 0:        continue;        break;    }    print "[" . $i2 . "]\n";  }  print $i1 . "\n";}
\ No newline at end of file
+for ($i1 = 0;
+ $i1 < 2;
+ $i1++) {
+  for ($i2 = 0;
+ $i2 < 2;
+ $i2++) {
+    switch ($i2 % 2) {
+      case 0:        continue;
+        break;
+    }
+    print "[" . $i2 . "]\n";
+  }
+  print $i1 . "\n";
+}
diff --git a/hphp/test/slow/copy_prop/1845.php b/hphp/test/slow/copy_prop/1845.php
index 40cd60a54..9e9688b39 100644
--- a/hphp/test/slow/copy_prop/1845.php
+++ b/hphp/test/slow/copy_prop/1845.php
@@ -1,3 +1,19 @@
 <?php
 
- function test($tr_data) {  $temp_tr = null;  foreach ($tr_data as $tr_id => $tr_row) {    if ($tr_row == 45) $temp_tr = $tr_id;    if ($tr_id == 0) {      continue;    } else {      return $tr_row;    }  }  if ($temp_tr) {    return $temp_tr;  }  return null;}var_dump(test(array('a' => 1, 'b' => 45)));
\ No newline at end of file
+function test($tr_data) {
+  $temp_tr = null;
+  foreach ($tr_data as $tr_id => $tr_row) {
+    if ($tr_row == 45) $temp_tr = $tr_id;
+    if ($tr_id == 0) {
+      continue;
+    }
+ else {
+      return $tr_row;
+    }
+  }
+  if ($temp_tr) {
+    return $temp_tr;
+  }
+  return null;
+}
+var_dump(test(array('a' => 1, 'b' => 45)));
diff --git a/hphp/test/slow/copy_prop/1846.php b/hphp/test/slow/copy_prop/1846.php
index 46e52b137..8c605b1bc 100644
--- a/hphp/test/slow/copy_prop/1846.php
+++ b/hphp/test/slow/copy_prop/1846.php
@@ -1,3 +1,10 @@
 <?php
 
- /* Compile only test. Used to crash hphp */ class X {  protected $map;  protected $parents;  public function __construct(array $map, array $parents) {    $this->map = $map;    $this->parents = $parents;  }}
\ No newline at end of file
+/* Compile only test. Used to crash hphp */ class X {
+  protected $map;
+  protected $parents;
+  public function __construct(array $map, array $parents) {
+    $this->map = $map;
+    $this->parents = $parents;
+  }
+}
diff --git a/hphp/test/slow/copy_prop/1847.php b/hphp/test/slow/copy_prop/1847.php
index 7349846b4..fe0501843 100644
--- a/hphp/test/slow/copy_prop/1847.php
+++ b/hphp/test/slow/copy_prop/1847.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x, $y) {
   $z = 32;
   return $x && $y ?: $z;
diff --git a/hphp/test/slow/copy_prop/1848.php b/hphp/test/slow/copy_prop/1848.php
index 06951756d..6cd84759d 100644
--- a/hphp/test/slow/copy_prop/1848.php
+++ b/hphp/test/slow/copy_prop/1848.php
@@ -1,3 +1,11 @@
 <?php
 
-function foo() {  $a = &$b;  $b = 1;  yield $a;  $a = 3;  $b = 2;  yield $a;}foreach (foo() as $x) var_dump($x);
\ No newline at end of file
+function foo() {
+  $a = &$b;
+  $b = 1;
+  yield $a;
+  $a = 3;
+  $b = 2;
+  yield $a;
+}
+foreach (foo() as $x) var_dump($x);
diff --git a/hphp/test/slow/create_function/1566.php b/hphp/test/slow/create_function/1566.php
index 5c41b574b..b58a7a773 100644
--- a/hphp/test/slow/create_function/1566.php
+++ b/hphp/test/slow/create_function/1566.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(array_filter(array(1, 1003, 34, 5006), create_function('$x', 'return $x > 1000;')));
\ No newline at end of file
+var_dump(array_filter(array(1, 1003, 34, 5006), create_function('$x', 'return $x > 1000;
+')));
diff --git a/hphp/test/slow/create_function/1567.php b/hphp/test/slow/create_function/1567.php
index 5a5cf78df..9711136d4 100644
--- a/hphp/test/slow/create_function/1567.php
+++ b/hphp/test/slow/create_function/1567.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(array_filter(array(1, 1003, 34, 5006), create_function('$x', 'return '.'$x > 1000;')));
\ No newline at end of file
+var_dump(array_filter(array(1, 1003, 34, 5006), create_function('$x', 'return '.'$x > 1000;
+')));
diff --git a/hphp/test/slow/defined/1623.php b/hphp/test/slow/defined/1623.php
index 07a25cc82..d1894afb3 100644
--- a/hphp/test/slow/defined/1623.php
+++ b/hphp/test/slow/defined/1623.php
@@ -1,3 +1,4 @@
 <?php
 
- if (defined('FOO')) echo 'defined'; else echo 'undefined';
\ No newline at end of file
+if (defined('FOO')) echo 'defined';
+ else echo 'undefined';
diff --git a/hphp/test/slow/defined/1624.php b/hphp/test/slow/defined/1624.php
index 97b60649d..5e06b408e 100644
--- a/hphp/test/slow/defined/1624.php
+++ b/hphp/test/slow/defined/1624.php
@@ -1,3 +1,5 @@
 <?php
 
- define('FOO', 1);if (defined('FOO')) echo 'defined'; else echo 'undefined';
\ No newline at end of file
+define('FOO', 1);
+if (defined('FOO')) echo 'defined';
+ else echo 'undefined';
diff --git a/hphp/test/slow/defined/1625.php b/hphp/test/slow/defined/1625.php
index 892ad4564..16c19e281 100644
--- a/hphp/test/slow/defined/1625.php
+++ b/hphp/test/slow/defined/1625.php
@@ -1,3 +1,5 @@
 <?php
 
- echo FOO;if (defined('FOO')) echo 'defined'; else echo 'undefined';
\ No newline at end of file
+echo FOO;
+if (defined('FOO')) echo 'defined';
+ else echo 'undefined';
diff --git a/hphp/test/slow/defined/1626.php b/hphp/test/slow/defined/1626.php
index 04dac09e4..5153db648 100644
--- a/hphp/test/slow/defined/1626.php
+++ b/hphp/test/slow/defined/1626.php
@@ -1,3 +1,55 @@
 <?php
 
- define('THIRTEEN', 13);define('ONE', 1);class Foo {  const ZERO        = 0;  function f() {    if (defined('self::ZERO')) {      var_dump(self::ZERO);    }    if (defined('THIRTEEN')) {      var_dump(THIRTEEN);    }    if (defined('ONE')) {      var_dump(ONE);    }    $a = 'self::ZERO';    if (defined($a)) {      var_dump(self::ZERO);    }  }}class Bar extends Foo {  function f() {    if (defined('self::ZERO')) {      var_dump(self::ZERO);    }    if (defined('parent::ZERO')) {      var_dump(parent::ZERO);    }    $a = 'parent::ZERO';    if (defined($a)) {      var_dump(parent::ZERO);    }  }}class Goo {  const ZERO = Bar::ZERO;}$a = 'Foo::ZERO';if (defined($a)) {  var_dump(Foo::ZERO);}$a = 'Bar::ZERO';if (defined($a)) {  var_dump(Bar::ZERO);}$a = 'Goo::ZERO';if (defined($a)) {  var_dump(Goo::ZERO);}$obj = new Foo;$obj->f();$obj = new Bar;$obj->f();
\ No newline at end of file
+define('THIRTEEN', 13);
+define('ONE', 1);
+class Foo {
+  const ZERO        = 0;
+  function f() {
+    if (defined('self::ZERO')) {
+      var_dump(self::ZERO);
+    }
+    if (defined('THIRTEEN')) {
+      var_dump(THIRTEEN);
+    }
+    if (defined('ONE')) {
+      var_dump(ONE);
+    }
+    $a = 'self::ZERO';
+    if (defined($a)) {
+      var_dump(self::ZERO);
+    }
+  }
+}
+class Bar extends Foo {
+  function f() {
+    if (defined('self::ZERO')) {
+      var_dump(self::ZERO);
+    }
+    if (defined('parent::ZERO')) {
+      var_dump(parent::ZERO);
+    }
+    $a = 'parent::ZERO';
+    if (defined($a)) {
+      var_dump(parent::ZERO);
+    }
+  }
+}
+class Goo {
+  const ZERO = Bar::ZERO;
+}
+$a = 'Foo::ZERO';
+if (defined($a)) {
+  var_dump(Foo::ZERO);
+}
+$a = 'Bar::ZERO';
+if (defined($a)) {
+  var_dump(Bar::ZERO);
+}
+$a = 'Goo::ZERO';
+if (defined($a)) {
+  var_dump(Goo::ZERO);
+}
+$obj = new Foo;
+$obj->f();
+$obj = new Bar;
+$obj->f();
diff --git a/hphp/test/slow/defined/1627.php b/hphp/test/slow/defined/1627.php
index 7eb6c2f25..761e8b6fd 100644
--- a/hphp/test/slow/defined/1627.php
+++ b/hphp/test/slow/defined/1627.php
@@ -1,3 +1,18 @@
 <?php
 
- function handler($errno, $errstr) {  var_dump($errno);  return true;}set_error_handler('handler');unserialize();define();define('u');define('a','X');define('b','Y',false);define('c',1,2,3,4,foo());var_dump(a,b,c);var_dump(defined('a'),defined('b'),defined('c'));function foo() {  var_dump('FOO');}
\ No newline at end of file
+function handler($errno, $errstr) {
+  var_dump($errno);
+  return true;
+}
+set_error_handler('handler');
+unserialize();
+define();
+define('u');
+define('a','X');
+define('b','Y',false);
+define('c',1,2,3,4,foo());
+var_dump(a,b,c);
+var_dump(defined('a'),defined('b'),defined('c'));
+function foo() {
+  var_dump('FOO');
+}
diff --git a/hphp/test/slow/defined/1628.php b/hphp/test/slow/defined/1628.php
index c7b61cf5b..1d4e8cb81 100644
--- a/hphp/test/slow/defined/1628.php
+++ b/hphp/test/slow/defined/1628.php
@@ -1,6 +1,5 @@
 <?php
 
-
 abstract class class1 {
   public function getConstViaThis() {
     return defined('static::SOME_CONST') ? static::SOME_CONST : false;
diff --git a/hphp/test/slow/directory/1702.php b/hphp/test/slow/directory/1702.php
index e9161b872..f7aaa62cf 100644
--- a/hphp/test/slow/directory/1702.php
+++ b/hphp/test/slow/directory/1702.php
@@ -2,7 +2,8 @@
 
 $d = dir(__DIR__."/../../sample_dir/");
 echo "Path: " . $d->path . "\n";
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 while (false !== ($entry = $d->read())) {
    $files[] = $entry."\n";
 }
@@ -10,7 +11,8 @@ asort($files);
 var_dump(array_values($files));
 
 $d->rewind();
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 while (false !== ($entry = $d->read())) {
    $files[] = $entry."\n";
 }
diff --git a/hphp/test/slow/divide/1427.php b/hphp/test/slow/divide/1427.php
index 7026c1903..0f72178b6 100644
--- a/hphp/test/slow/divide/1427.php
+++ b/hphp/test/slow/divide/1427.php
@@ -1,3 +1,6 @@
 <?php
 
- printf("%s\n", 30 / 30);printf("%s\n", "30" / 30);printf("%s\n", 30 / "30");printf("%s\n", "30" / "30");
\ No newline at end of file
+printf("%s\n", 30 / 30);
+printf("%s\n", "30" / 30);
+printf("%s\n", 30 / "30");
+printf("%s\n", "30" / "30");
diff --git a/hphp/test/slow/divide/1428.php b/hphp/test/slow/divide/1428.php
index b0735fa83..4a82e0fe5 100644
--- a/hphp/test/slow/divide/1428.php
+++ b/hphp/test/slow/divide/1428.php
@@ -1,3 +1,30 @@
 <?php
 
- $a = "123.456" / 123;var_dump($a);$a = "123.456" / 456.123;var_dump($a);$a = "123.456" / "123";var_dump($a);$a = "123.456" / "456.123";var_dump($a);$a = "123.456";$a /= 123;var_dump($a);$a = "123.456";$a /= 456.123;var_dump($a);$a = "123.456";$a /= "123";var_dump($a);$a = "123.456";$a /= "456.123";var_dump($a);$a = "123" / 123;var_dump($a);$a = "123" / "123";var_dump($a);$a = "321" / 123;var_dump($a);$a = "321" / 123.456;var_dump($a);
\ No newline at end of file
+$a = "123.456" / 123;
+var_dump($a);
+$a = "123.456" / 456.123;
+var_dump($a);
+$a = "123.456" / "123";
+var_dump($a);
+$a = "123.456" / "456.123";
+var_dump($a);
+$a = "123.456";
+$a /= 123;
+var_dump($a);
+$a = "123.456";
+$a /= 456.123;
+var_dump($a);
+$a = "123.456";
+$a /= "123";
+var_dump($a);
+$a = "123.456";
+$a /= "456.123";
+var_dump($a);
+$a = "123" / 123;
+var_dump($a);
+$a = "123" / "123";
+var_dump($a);
+$a = "321" / 123;
+var_dump($a);
+$a = "321" / 123.456;
+var_dump($a);
diff --git a/hphp/test/slow/dom_document/1669.php b/hphp/test/slow/dom_document/1669.php
index 83971651f..d148e17d0 100644
--- a/hphp/test/slow/dom_document/1669.php
+++ b/hphp/test/slow/dom_document/1669.php
@@ -1,3 +1,4 @@
 <?php
 
- $obj = new DOMText(); var_dump($obj instanceof DOMNode);
\ No newline at end of file
+$obj = new DOMText();
+ var_dump($obj instanceof DOMNode);
diff --git a/hphp/test/slow/dom_document/1670.php b/hphp/test/slow/dom_document/1670.php
index 6bbc816bd..a2bde5130 100644
--- a/hphp/test/slow/dom_document/1670.php
+++ b/hphp/test/slow/dom_document/1670.php
@@ -1,6 +1,6 @@
 <?php
 
- $xml = '<?xml version="1.0"?><dependencies><dependency dependency_id="0" dependent_id="1"/><dependency dependency_id="4" dependent_id="5"/><dependency dependency_id="5" dependent_id="6"/><dependency dependency_id="9" dependent_id="8"/><dependency dependency_id="10" dependent_id="8"/><dependency dependency_id="12" dependent_id="13"/><dependency dependency_id="12" dependent_id="14"/></dependencies>';
+$xml = '<?xml version="1.0"?><dependencies><dependency dependency_id="0" dependent_id="1"/><dependency dependency_id="4" dependent_id="5"/><dependency dependency_id="5" dependent_id="6"/><dependency dependency_id="9" dependent_id="8"/><dependency dependency_id="10" dependent_id="8"/><dependency dependency_id="12" dependent_id="13"/><dependency dependency_id="12" dependent_id="14"/></dependencies>';
 $dom = new domDocument;
 $dom->loadxml($xml);
 $xpath = new DOMXPath($dom);
diff --git a/hphp/test/slow/dom_document/1671.php b/hphp/test/slow/dom_document/1671.php
index 533691fce..fe0f2c521 100644
--- a/hphp/test/slow/dom_document/1671.php
+++ b/hphp/test/slow/dom_document/1671.php
@@ -1,6 +1,6 @@
 <?php
 
- $xml = '<?xml version="1.0"?><dependencies><dependency dependency_id="0" dependent_id="1"/><dependency dependency_id="4" dependent_id="5"/><dependency dependency_id="5" dependent_id="6"/><dependency dependency_id="9" dependent_id="8"/><dependency dependency_id="10" dependent_id="8"/><dependency dependency_id="12" dependent_id="13"/><dependency dependency_id="12" dependent_id="14"/></dependencies>';
+$xml = '<?xml version="1.0"?><dependencies><dependency dependency_id="0" dependent_id="1"/><dependency dependency_id="4" dependent_id="5"/><dependency dependency_id="5" dependent_id="6"/><dependency dependency_id="9" dependent_id="8"/><dependency dependency_id="10" dependent_id="8"/><dependency dependency_id="12" dependent_id="13"/><dependency dependency_id="12" dependent_id="14"/></dependencies>';
 $dom = new domDocument;
 $dom->loadxml($xml);
 $xpath = new DOMXPath($dom);
diff --git a/hphp/test/slow/dom_document/1672.php b/hphp/test/slow/dom_document/1672.php
index 61ffbc631..1f7b62c17 100644
--- a/hphp/test/slow/dom_document/1672.php
+++ b/hphp/test/slow/dom_document/1672.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $xmlstr = "<?xml version='1.0' standalone='yes'?>
 <!DOCTYPE chapter SYSTEM '/share/sgml/Norman_Walsh/db3xml10/db3xml10.dtd'
 [ <!ENTITY sp \"spanish\">
@@ -29,7 +28,8 @@ function print_node($node)
 Node Type: " . $node->nodeType;
   if ($node->nodeType != 3) {
       $child_count = $node->childNodes->length;
-  } else {
+  }
+ else {
       $child_count = 0;
   }
   print "
diff --git a/hphp/test/slow/dom_document/1673.php b/hphp/test/slow/dom_document/1673.php
index 4b59d4db4..94dbea3e0 100644
--- a/hphp/test/slow/dom_document/1673.php
+++ b/hphp/test/slow/dom_document/1673.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $xml = <<<HERE
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <foo xmlns="http://www.example.com/ns/foo"
diff --git a/hphp/test/slow/dom_document/1674.php b/hphp/test/slow/dom_document/1674.php
index 68f436bc4..f7c60b971 100644
--- a/hphp/test/slow/dom_document/1674.php
+++ b/hphp/test/slow/dom_document/1674.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $dom = new domdocument;
 $html = <<<EOM
 <html><head>
diff --git a/hphp/test/slow/dom_document/1675.php b/hphp/test/slow/dom_document/1675.php
index 0812a176f..6701f84a3 100644
--- a/hphp/test/slow/dom_document/1675.php
+++ b/hphp/test/slow/dom_document/1675.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class books extends domDocument {
   function addBook($title, $author) {
     $titleElement = $this->createElement('title');
@@ -29,4 +28,4 @@ EOM;
 
 $dom->loadXML($xml);
 $dom->addBook('PHP de Luxe', 'Richard Samar, Christian Stocker');
-print $dom->saveXML();
\ No newline at end of file
+print $dom->saveXML();
diff --git a/hphp/test/slow/dom_document/1676.php b/hphp/test/slow/dom_document/1676.php
index 423a11133..bd5679d2a 100644
--- a/hphp/test/slow/dom_document/1676.php
+++ b/hphp/test/slow/dom_document/1676.php
@@ -47,7 +47,9 @@ foreach ($nots AS $key=>$node) {
 }
 print "
 ";
-for($x=0; $x < $length; $x++) {
+for($x=0;
+ $x < $length;
+ $x++) {
   echo "Index $x: ".$nots->item($x)->nodeName." (".
        $nots->item($x)->systemId.") (".$nots->item($x)->publicId.")\n";
 }
diff --git a/hphp/test/slow/dom_document/1677.php b/hphp/test/slow/dom_document/1677.php
index 465fcbb39..7fe4d14e2 100644
--- a/hphp/test/slow/dom_document/1677.php
+++ b/hphp/test/slow/dom_document/1677.php
@@ -1,7 +1,49 @@
 <?php
 
-    function rerender($html, $frag = false) {    $doc = new DOMDocument();    if ($frag) {      $body = $doc->createDocumentFragment();      $body->appendXML($html);    } else {      $doc->loadHTML($html);      $body = $doc->documentElement;    }    return helper($body);  }  function helper($element) {    if ($element instanceof DOMText) {      return htmlspecialchars($element->nodeValue);    } else {      $body = '';      foreach ($element->childNodes as $child) {        $body .= helper($child);      }      if ($element instanceof DOMElement) {        $attrs = array();        foreach ($element->attributes as $attr) {          $attrs[] = htmlspecialchars($attr->name) . '="' .             htmlspecialchars($attr->value) . '"';        }        if ($attrs) {          $attrs = ' ' . implode(' ', $attrs);        } else {          $attrs = '';        }        return '<' . $element->tagName . $attrs . '>' . $body .           '</' . $element->tagName . '>';      } else {        return $body;      }    }  }  $fragment = 'Hello, <b>world</b>.';  $document = '<html><body><div style="color:red">    <p class="thing">'.$fragment.'</p></div>';  echo rerender($fragment, true)."
+function rerender($html, $frag = false) {
+    $doc = new DOMDocument();
+    if ($frag) {
+      $body = $doc->createDocumentFragment();
+      $body->appendXML($html);
+    }
+ else {
+      $doc->loadHTML($html);
+      $body = $doc->documentElement;
+    }
+    return helper($body);
+  }
+  function helper($element) {
+    if ($element instanceof DOMText) {
+      return htmlspecialchars($element->nodeValue);
+    }
+ else {
+      $body = '';
+      foreach ($element->childNodes as $child) {
+        $body .= helper($child);
+      }
+      if ($element instanceof DOMElement) {
+        $attrs = array();
+        foreach ($element->attributes as $attr) {
+          $attrs[] = htmlspecialchars($attr->name) . '="' .             htmlspecialchars($attr->value) . '"';
+        }
+        if ($attrs) {
+          $attrs = ' ' . implode(' ', $attrs);
+        }
+ else {
+          $attrs = '';
+        }
+        return '<' . $element->tagName . $attrs . '>' . $body .           '</' . $element->tagName . '>';
+      }
+ else {
+        return $body;
+      }
+    }
+  }
+  $fragment = 'Hello, <b>world</b>.';
+  $document = '<html><body><div style="color:red">    <p class="thing">'.$fragment.'</p></div>';
+  echo rerender($fragment, true)."
 
-";  echo rerender($document, false)."
+";
+  echo rerender($document, false)."
 
-";
\ No newline at end of file
+";
diff --git a/hphp/test/slow/dom_document/1678.php b/hphp/test/slow/dom_document/1678.php
index 08f604979..1ce8cb1e5 100644
--- a/hphp/test/slow/dom_document/1678.php
+++ b/hphp/test/slow/dom_document/1678.php
@@ -1,3 +1,11 @@
 <?php
 
- $xml =  '<root>$1 - <template><title>SITENAME</title></template></root>';$dom = new DOMDocument();$dom->loadXML($xml);new foo($dom->documentElement);class foo {  function foo($a) {    var_dump($a);  }}
\ No newline at end of file
+$xml =  '<root>$1 - <template><title>SITENAME</title></template></root>';
+$dom = new DOMDocument();
+$dom->loadXML($xml);
+new foo($dom->documentElement);
+class foo {
+  function foo($a) {
+    var_dump($a);
+  }
+}
diff --git a/hphp/test/slow/dom_document/1679.php b/hphp/test/slow/dom_document/1679.php
index e96f8536e..634a6cfbe 100644
--- a/hphp/test/slow/dom_document/1679.php
+++ b/hphp/test/slow/dom_document/1679.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $dom = new DOMDocument();
 $dom->loadXML('<a><b><c /></b></a>');
 $remove = array();
diff --git a/hphp/test/slow/dom_document/1680.php b/hphp/test/slow/dom_document/1680.php
index 87cbea5f2..509fb6811 100644
--- a/hphp/test/slow/dom_document/1680.php
+++ b/hphp/test/slow/dom_document/1680.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo() {
   $html = '<b>Hello</b><i>World</i>';
   $doc = new DOMDocument();
diff --git a/hphp/test/slow/dom_document/1681.php b/hphp/test/slow/dom_document/1681.php
index f07ce964f..8402577d7 100644
--- a/hphp/test/slow/dom_document/1681.php
+++ b/hphp/test/slow/dom_document/1681.php
@@ -1,3 +1,9 @@
 <?php
 
- class MyNode extends DOMNode {}class MyElement extends DOMElement {}$dom = new DOMDocument;var_dump($dom->registerNodeClass('DOMNode', 'MyNode'));var_dump($dom->registerNodeClass('DOMElement', 'MyElement'));
\ No newline at end of file
+class MyNode extends DOMNode {
+}
+class MyElement extends DOMElement {
+}
+$dom = new DOMDocument;
+var_dump($dom->registerNodeClass('DOMNode', 'MyNode'));
+var_dump($dom->registerNodeClass('DOMElement', 'MyElement'));
diff --git a/hphp/test/slow/double/106.php b/hphp/test/slow/double/106.php
index 728abc545..4ef6ae382 100644
--- a/hphp/test/slow/double/106.php
+++ b/hphp/test/slow/double/106.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(1.0);
\ No newline at end of file
+var_dump(1.0);
diff --git a/hphp/test/slow/double/107.php b/hphp/test/slow/double/107.php
index a94bb093f..966318610 100644
--- a/hphp/test/slow/double/107.php
+++ b/hphp/test/slow/double/107.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(0.0);
\ No newline at end of file
+var_dump(0.0);
diff --git a/hphp/test/slow/double/108.php b/hphp/test/slow/double/108.php
index 6c971ab36..590e73768 100644
--- a/hphp/test/slow/double/108.php
+++ b/hphp/test/slow/double/108.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(-1.0);
\ No newline at end of file
+var_dump(-1.0);
diff --git a/hphp/test/slow/double/109.php b/hphp/test/slow/double/109.php
index a602333e6..25e72e1a6 100644
--- a/hphp/test/slow/double/109.php
+++ b/hphp/test/slow/double/109.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(1/3);
\ No newline at end of file
+var_dump(1/3);
diff --git a/hphp/test/slow/double/110.php b/hphp/test/slow/double/110.php
index db0b1ff1c..ca0840839 100644
--- a/hphp/test/slow/double/110.php
+++ b/hphp/test/slow/double/110.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 1/3; var_dump($a);
\ No newline at end of file
+$a = 1/3;
+ var_dump($a);
diff --git a/hphp/test/slow/double/111.php b/hphp/test/slow/double/111.php
index 7b6962f2f..56cfae5f8 100644
--- a/hphp/test/slow/double/111.php
+++ b/hphp/test/slow/double/111.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 1/3; $b = $a; var_dump($b);
\ No newline at end of file
+$a = 1/3;
+ $b = $a;
+ var_dump($b);
diff --git a/hphp/test/slow/double/112.php b/hphp/test/slow/double/112.php
index 572cee756..a912f35e6 100644
--- a/hphp/test/slow/double/112.php
+++ b/hphp/test/slow/double/112.php
@@ -1,3 +1,16 @@
 <?php
 
- $a = 1.234;echo $a;$b = 1.2e3;echo $b;$c = 7E-10;echo $c;echo floor((0.1+0.7)*10);echo round((69.1-floor(69.1)));echo round(69.1-floor(69.1));echo (63.1-floor(63.1));echo (64.0-floor(64.0));echo round(64.1-floor(64.1));echo round(3.1415927,2);echo round(1092,-2);
\ No newline at end of file
+$a = 1.234;
+echo $a;
+$b = 1.2e3;
+echo $b;
+$c = 7E-10;
+echo $c;
+echo floor((0.1+0.7)*10);
+echo round((69.1-floor(69.1)));
+echo round(69.1-floor(69.1));
+echo (63.1-floor(63.1));
+echo (64.0-floor(64.0));
+echo round(64.1-floor(64.1));
+echo round(3.1415927,2);
+echo round(1092,-2);
diff --git a/hphp/test/slow/double/113.php b/hphp/test/slow/double/113.php
index 45ab57712..5d776c4a5 100644
--- a/hphp/test/slow/double/113.php
+++ b/hphp/test/slow/double/113.php
@@ -1,3 +1,18 @@
 <?php
 
- $foo = 1 + "10.5";print("$foo ");$foo = 1 + "-1.3e3";print("$foo ");$foo = 1 + "bob-1.3e3";print("$foo ");$foo = 1 + "bob3";print("$foo ");$foo = 1 + "10 Small Pigs";print("$foo ");$foo = 4 + "10.2 Little Piggies";print("$foo ");$foo = "10.0 pigs " + 1;print("$foo ");$foo = "10.0 pigs " + 1.0;print("$foo ");
\ No newline at end of file
+$foo = 1 + "10.5";
+print("$foo ");
+$foo = 1 + "-1.3e3";
+print("$foo ");
+$foo = 1 + "bob-1.3e3";
+print("$foo ");
+$foo = 1 + "bob3";
+print("$foo ");
+$foo = 1 + "10 Small Pigs";
+print("$foo ");
+$foo = 4 + "10.2 Little Piggies";
+print("$foo ");
+$foo = "10.0 pigs " + 1;
+print("$foo ");
+$foo = "10.0 pigs " + 1.0;
+print("$foo ");
diff --git a/hphp/test/slow/double/114.php b/hphp/test/slow/double/114.php
index 98ed27f55..80adbb375 100644
--- a/hphp/test/slow/double/114.php
+++ b/hphp/test/slow/double/114.php
@@ -1,3 +1,22 @@
 <?php
 
- var_dump(1E1);var_dump(1E2);var_dump(1E3);var_dump(1E4);var_dump(1E5);var_dump(1E6);var_dump(1E7);var_dump(1E8);var_dump(1E9);var_dump(1E10);var_dump(1E11);var_dump(1E12);var_dump(1E13);var_dump(1E14);var_dump(1E15);var_dump(1E16);var_dump(1E17);var_dump(1E18);var_dump(1E19);var_dump(1E20);
\ No newline at end of file
+var_dump(1E1);
+var_dump(1E2);
+var_dump(1E3);
+var_dump(1E4);
+var_dump(1E5);
+var_dump(1E6);
+var_dump(1E7);
+var_dump(1E8);
+var_dump(1E9);
+var_dump(1E10);
+var_dump(1E11);
+var_dump(1E12);
+var_dump(1E13);
+var_dump(1E14);
+var_dump(1E15);
+var_dump(1E16);
+var_dump(1E17);
+var_dump(1E18);
+var_dump(1E19);
+var_dump(1E20);
diff --git a/hphp/test/slow/double/115.php b/hphp/test/slow/double/115.php
index efc224817..5e6b8139f 100644
--- a/hphp/test/slow/double/115.php
+++ b/hphp/test/slow/double/115.php
@@ -1,3 +1,7 @@
 <?php
 
- var_dump((double)'10');var_dump((double)'0x10');var_dump((double)'010');var_dump(10.0 + 0x10);var_dump(10.0 + 010.0);
\ No newline at end of file
+var_dump((double)'10');
+var_dump((double)'0x10');
+var_dump((double)'010');
+var_dump(10.0 + 0x10);
+var_dump(10.0 + 010.0);
diff --git a/hphp/test/slow/double/116.php b/hphp/test/slow/double/116.php
index 0645f5c42..159ff5a52 100644
--- a/hphp/test/slow/double/116.php
+++ b/hphp/test/slow/double/116.php
@@ -1,3 +1,4 @@
 <?php
 
- $t=floor(1316700000/300)*300;var_dump($t);
\ No newline at end of file
+$t=floor(1316700000/300)*300;
+var_dump($t);
diff --git a/hphp/test/slow/dynamic_constants/1127.php b/hphp/test/slow/dynamic_constants/1127.php
index 45acf11ca..8ff0d4090 100644
--- a/hphp/test/slow/dynamic_constants/1127.php
+++ b/hphp/test/slow/dynamic_constants/1127.php
@@ -1,3 +1,7 @@
 <?php
 
- function foo($a) { return $a + 10;} define('TEST', foo(10)); var_dump(TEST);
\ No newline at end of file
+function foo($a) {
+ return $a + 10;
+}
+ define('TEST', foo(10));
+ var_dump(TEST);
diff --git a/hphp/test/slow/dynamic_constants/1128.php b/hphp/test/slow/dynamic_constants/1128.php
index 811e934ed..380b8d4c4 100644
--- a/hphp/test/slow/dynamic_constants/1128.php
+++ b/hphp/test/slow/dynamic_constants/1128.php
@@ -1,3 +1,9 @@
 <?php
 
- function foo() { global $g; return $g ? -1 : 15;} var_dump(TEST); define('TEST', foo()); var_dump(TEST);
\ No newline at end of file
+function foo() {
+ global $g;
+ return $g ? -1 : 15;
+}
+ var_dump(TEST);
+ define('TEST', foo());
+ var_dump(TEST);
diff --git a/hphp/test/slow/dynamic_constants/1129.php b/hphp/test/slow/dynamic_constants/1129.php
index dd518206c..46e65ad3e 100644
--- a/hphp/test/slow/dynamic_constants/1129.php
+++ b/hphp/test/slow/dynamic_constants/1129.php
@@ -1,3 +1,5 @@
 <?php
 
- if (true) define('TEST', 1); else define('TEST', 2); var_dump(TEST);
\ No newline at end of file
+if (true) define('TEST', 1);
+ else define('TEST', 2);
+ var_dump(TEST);
diff --git a/hphp/test/slow/dynamic_constants/1130.php b/hphp/test/slow/dynamic_constants/1130.php
index ec35e848b..7c54ff752 100644
--- a/hphp/test/slow/dynamic_constants/1130.php
+++ b/hphp/test/slow/dynamic_constants/1130.php
@@ -1,3 +1,7 @@
 <?php
 
- var_dump(TEST); define('TEST', 1); var_dump(TEST); define('TEST', 2); var_dump(TEST);
\ No newline at end of file
+var_dump(TEST);
+ define('TEST', 1);
+ var_dump(TEST);
+ define('TEST', 2);
+ var_dump(TEST);
diff --git a/hphp/test/slow/dynamic_constants/1131.php b/hphp/test/slow/dynamic_constants/1131.php
index c10182912..976d77549 100644
--- a/hphp/test/slow/dynamic_constants/1131.php
+++ b/hphp/test/slow/dynamic_constants/1131.php
@@ -1,3 +1,5 @@
 <?php
 
- if (false) define('TEST', 1); else define('TEST', 2); var_dump(TEST);
\ No newline at end of file
+if (false) define('TEST', 1);
+ else define('TEST', 2);
+ var_dump(TEST);
diff --git a/hphp/test/slow/dynamic_constants/1132.php b/hphp/test/slow/dynamic_constants/1132.php
index 48fb8487a..0b21c30df 100644
--- a/hphp/test/slow/dynamic_constants/1132.php
+++ b/hphp/test/slow/dynamic_constants/1132.php
@@ -1,3 +1,7 @@
 <?php
 
- var_dump(defined('TEST')); var_dump(TEST);define('TEST', 13);var_dump(defined('TEST')); var_dump(TEST);
\ No newline at end of file
+var_dump(defined('TEST'));
+ var_dump(TEST);
+define('TEST', 13);
+var_dump(defined('TEST'));
+ var_dump(TEST);
diff --git a/hphp/test/slow/dynamic_constants/1133.php b/hphp/test/slow/dynamic_constants/1133.php
index f98c2f3c3..8606832ee 100644
--- a/hphp/test/slow/dynamic_constants/1133.php
+++ b/hphp/test/slow/dynamic_constants/1133.php
@@ -1,3 +1,6 @@
 <?php
 
- define('FOO', BAR); define('BAR', FOO); echo FOO; echo BAR;
\ No newline at end of file
+define('FOO', BAR);
+ define('BAR', FOO);
+ echo FOO;
+ echo BAR;
diff --git a/hphp/test/slow/dynamic_constants/1134.php b/hphp/test/slow/dynamic_constants/1134.php
index c4c0b5188..26f3e60de 100644
--- a/hphp/test/slow/dynamic_constants/1134.php
+++ b/hphp/test/slow/dynamic_constants/1134.php
@@ -1,3 +1,8 @@
 <?php
 
- define('A', 10); class T { static $a = array(A); } define('A', 20); var_dump(T::$a);
\ No newline at end of file
+define('A', 10);
+ class T {
+ static $a = array(A);
+ }
+ define('A', 20);
+ var_dump(T::$a);
diff --git a/hphp/test/slow/dynamic_functions/1171.php b/hphp/test/slow/dynamic_functions/1171.php
index f17f74a00..c3c4a611a 100644
--- a/hphp/test/slow/dynamic_functions/1171.php
+++ b/hphp/test/slow/dynamic_functions/1171.php
@@ -1,3 +1,7 @@
 <?php
 
- function test() { print 'ok';} $a = 'Test'; $a();
\ No newline at end of file
+function test() {
+ print 'ok';
+}
+ $a = 'Test';
+ $a();
diff --git a/hphp/test/slow/dynamic_functions/1172.php b/hphp/test/slow/dynamic_functions/1172.php
index e664e639c..505ea4d9b 100644
--- a/hphp/test/slow/dynamic_functions/1172.php
+++ b/hphp/test/slow/dynamic_functions/1172.php
@@ -1,3 +1,7 @@
 <?php
 
- function test($a) { print $a;} $a = 'Test'; $a('ok');
\ No newline at end of file
+function test($a) {
+ print $a;
+}
+ $a = 'Test';
+ $a('ok');
diff --git a/hphp/test/slow/dynamic_functions/1173.php b/hphp/test/slow/dynamic_functions/1173.php
index e3c430eeb..5476a81a4 100644
--- a/hphp/test/slow/dynamic_functions/1173.php
+++ b/hphp/test/slow/dynamic_functions/1173.php
@@ -1,3 +1,7 @@
 <?php
 
- function test($a, $b) { print $a.$b;} $a = 'Test'; $a('o','k');
\ No newline at end of file
+function test($a, $b) {
+ print $a.$b;
+}
+ $a = 'Test';
+ $a('o','k');
diff --git a/hphp/test/slow/dynamic_functions/1174.php b/hphp/test/slow/dynamic_functions/1174.php
index f946f7351..62f83877d 100644
--- a/hphp/test/slow/dynamic_functions/1174.php
+++ b/hphp/test/slow/dynamic_functions/1174.php
@@ -1,3 +1,8 @@
 <?php
 
- function t($a = 'k') { print $a;} $a = 'T'; $a(); $a('o');
\ No newline at end of file
+function t($a = 'k') {
+ print $a;
+}
+ $a = 'T';
+ $a();
+ $a('o');
diff --git a/hphp/test/slow/dynamic_functions/1175.php b/hphp/test/slow/dynamic_functions/1175.php
index c57595fe3..2853ad440 100644
--- a/hphp/test/slow/dynamic_functions/1175.php
+++ b/hphp/test/slow/dynamic_functions/1175.php
@@ -1,3 +1,8 @@
 <?php
 
- function t($a, $b = 'k') { print $a.$b;} $a = 'T'; $a('o'); $a('o', 'p');
\ No newline at end of file
+function t($a, $b = 'k') {
+ print $a.$b;
+}
+ $a = 'T';
+ $a('o');
+ $a('o', 'p');
diff --git a/hphp/test/slow/dynamic_functions/1176.php b/hphp/test/slow/dynamic_functions/1176.php
index fee9c20ec..c0ffdc38d 100644
--- a/hphp/test/slow/dynamic_functions/1176.php
+++ b/hphp/test/slow/dynamic_functions/1176.php
@@ -1,3 +1,9 @@
 <?php
 
- function t($a, $b = 'k', $c = 'm') { print $a.$b.$c;} $a = 'T'; $a('o'); $a('o', 'p'); $a('o', 'p', 'q');
\ No newline at end of file
+function t($a, $b = 'k', $c = 'm') {
+ print $a.$b.$c;
+}
+ $a = 'T';
+ $a('o');
+ $a('o', 'p');
+ $a('o', 'p', 'q');
diff --git a/hphp/test/slow/dynamic_functions/1177.php b/hphp/test/slow/dynamic_functions/1177.php
index 3dbe7ebc9..90540e5d5 100644
--- a/hphp/test/slow/dynamic_functions/1177.php
+++ b/hphp/test/slow/dynamic_functions/1177.php
@@ -1,3 +1,7 @@
 <?php
 
- function test() { var_dump(func_get_args());} $a = 'Test'; $a();
\ No newline at end of file
+function test() {
+ var_dump(func_get_args());
+}
+ $a = 'Test';
+ $a();
diff --git a/hphp/test/slow/dynamic_functions/1178.php b/hphp/test/slow/dynamic_functions/1178.php
index ea7531a9f..96379d149 100644
--- a/hphp/test/slow/dynamic_functions/1178.php
+++ b/hphp/test/slow/dynamic_functions/1178.php
@@ -1,3 +1,8 @@
 <?php
 
- function test($a) { var_dump(func_get_args());} $a = 'Test'; $a(1); $a(1, 2);
\ No newline at end of file
+function test($a) {
+ var_dump(func_get_args());
+}
+ $a = 'Test';
+ $a(1);
+ $a(1, 2);
diff --git a/hphp/test/slow/dynamic_functions/1179.php b/hphp/test/slow/dynamic_functions/1179.php
index 43087bca3..1ae773ef4 100644
--- a/hphp/test/slow/dynamic_functions/1179.php
+++ b/hphp/test/slow/dynamic_functions/1179.php
@@ -1,3 +1,9 @@
 <?php
 
- function test($a, $b) { var_dump(func_get_args());} $a = 'Test'; $a(1, 2); $a(1, 2, 3); $a(1, 2, 3, 4);
\ No newline at end of file
+function test($a, $b) {
+ var_dump(func_get_args());
+}
+ $a = 'Test';
+ $a(1, 2);
+ $a(1, 2, 3);
+ $a(1, 2, 3, 4);
diff --git a/hphp/test/slow/dynamic_functions/1180.php b/hphp/test/slow/dynamic_functions/1180.php
index 844e0f741..259a84ce8 100644
--- a/hphp/test/slow/dynamic_functions/1180.php
+++ b/hphp/test/slow/dynamic_functions/1180.php
@@ -1,3 +1,10 @@
 <?php
 
- function t($a = 'k') { var_dump(func_get_args());} $a = 'T'; $a(); $a('o'); $a('o', 'p'); $a('o', 'p', 'q');
\ No newline at end of file
+function t($a = 'k') {
+ var_dump(func_get_args());
+}
+ $a = 'T';
+ $a();
+ $a('o');
+ $a('o', 'p');
+ $a('o', 'p', 'q');
diff --git a/hphp/test/slow/dynamic_functions/1181.php b/hphp/test/slow/dynamic_functions/1181.php
index 9853d07b0..f2ffccc28 100644
--- a/hphp/test/slow/dynamic_functions/1181.php
+++ b/hphp/test/slow/dynamic_functions/1181.php
@@ -1,3 +1,9 @@
 <?php
 
- function t($a, $b = 'k') { var_dump(func_get_args());} $a = 'T'; $a('o'); $a('o', 'p'); $a('o', 'p', 'q');
\ No newline at end of file
+function t($a, $b = 'k') {
+ var_dump(func_get_args());
+}
+ $a = 'T';
+ $a('o');
+ $a('o', 'p');
+ $a('o', 'p', 'q');
diff --git a/hphp/test/slow/dynamic_functions/1182.php b/hphp/test/slow/dynamic_functions/1182.php
index fee2d8087..3675fea98 100644
--- a/hphp/test/slow/dynamic_functions/1182.php
+++ b/hphp/test/slow/dynamic_functions/1182.php
@@ -1,3 +1,9 @@
 <?php
 
- function t($a, $b = 'k', $c = 'q') { var_dump(func_get_args());} $a = 'T'; $a('o'); $a('o', 'p'); $a('o', 'p', 'q');
\ No newline at end of file
+function t($a, $b = 'k', $c = 'q') {
+ var_dump(func_get_args());
+}
+ $a = 'T';
+ $a('o');
+ $a('o', 'p');
+ $a('o', 'p', 'q');
diff --git a/hphp/test/slow/dynamic_functions/1183.php b/hphp/test/slow/dynamic_functions/1183.php
index f9235c637..f727836e9 100644
--- a/hphp/test/slow/dynamic_functions/1183.php
+++ b/hphp/test/slow/dynamic_functions/1183.php
@@ -1,3 +1,8 @@
 <?php
 
- function test(&$a, $b) { $a = 'ok';} $a = 'Test'; $a($a, 10); print $a;
\ No newline at end of file
+function test(&$a, $b) {
+ $a = 'ok';
+}
+ $a = 'Test';
+ $a($a, 10);
+ print $a;
diff --git a/hphp/test/slow/dynamic_functions/1184.php b/hphp/test/slow/dynamic_functions/1184.php
index 6a3c2d4ef..f917761ab 100644
--- a/hphp/test/slow/dynamic_functions/1184.php
+++ b/hphp/test/slow/dynamic_functions/1184.php
@@ -1,3 +1,13 @@
 <?php
 
- $a = 'test'; function &test() { global $a; return $a;}  $b = $a(); $b = 'ok'; var_dump($a);  $b = &$a(); $b = 'ok'; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ function &test() {
+ global $a;
+ return $a;
+}
+  $b = $a();
+ $b = 'ok';
+ var_dump($a);
+  $b = &$a();
+ $b = 'ok';
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_functions/1185.php b/hphp/test/slow/dynamic_functions/1185.php
index 1368e2f6c..08dd6f7a2 100644
--- a/hphp/test/slow/dynamic_functions/1185.php
+++ b/hphp/test/slow/dynamic_functions/1185.php
@@ -1,3 +1,8 @@
 <?php
 
- function test($a, $b) { print $a.$b;} $a = 'Test'; $y = 'kqq'; $a('o',$y[0]);
\ No newline at end of file
+function test($a, $b) {
+ print $a.$b;
+}
+ $a = 'Test';
+ $y = 'kqq';
+ $a('o',$y[0]);
diff --git a/hphp/test/slow/dynamic_functions/1186.php b/hphp/test/slow/dynamic_functions/1186.php
index b44a5c4fa..997b633e3 100644
--- a/hphp/test/slow/dynamic_functions/1186.php
+++ b/hphp/test/slow/dynamic_functions/1186.php
@@ -1,3 +1,8 @@
 <?php
 
- function test($a, $b) { print $a.$b;} $a = 'Test'; $y = array('k','q','q'); $a('o',$y[0]);
\ No newline at end of file
+function test($a, $b) {
+ print $a.$b;
+}
+ $a = 'Test';
+ $y = array('k','q','q');
+ $a('o',$y[0]);
diff --git a/hphp/test/slow/dynamic_functions/1187.php b/hphp/test/slow/dynamic_functions/1187.php
index 5ca540bfc..ec9d64abc 100644
--- a/hphp/test/slow/dynamic_functions/1187.php
+++ b/hphp/test/slow/dynamic_functions/1187.php
@@ -1,3 +1,19 @@
 <?php
 
- $a = 'test';if ($a) {  function bar() {}} else {  function bar() {}}function foo() {}function goo(&$p) {}$goo = 'goo';goo(foo());$goo(foo());bar(foo());
\ No newline at end of file
+$a = 'test';
+if ($a) {
+  function bar() {
+}
+}
+ else {
+  function bar() {
+}
+}
+function foo() {
+}
+function goo(&$p) {
+}
+$goo = 'goo';
+goo(foo());
+$goo(foo());
+bar(foo());
diff --git a/hphp/test/slow/dynamic_functions/1188.php b/hphp/test/slow/dynamic_functions/1188.php
index facbc59a8..71ae3ace9 100644
--- a/hphp/test/slow/dynamic_functions/1188.php
+++ b/hphp/test/slow/dynamic_functions/1188.php
@@ -1,3 +1,11 @@
 <?php
 
- if ($argc > 100) { $f = 'var_dump'; } else { $f = 'sscanf'; }$auth = "24\tLewis Carroll";$n = $f($auth, "%d\t%s %s", $id, $first, $last);echo "$id,$first,$last\n";
\ No newline at end of file
+if ($argc > 100) {
+ $f = 'var_dump';
+ }
+ else {
+ $f = 'sscanf';
+ }
+$auth = "24\tLewis Carroll";
+$n = $f($auth, "%d\t%s %s", $id, $first, $last);
+echo "$id,$first,$last\n";
diff --git a/hphp/test/slow/dynamic_functions/1189.php b/hphp/test/slow/dynamic_functions/1189.php
index 18f5ba722..c384c5394 100644
--- a/hphp/test/slow/dynamic_functions/1189.php
+++ b/hphp/test/slow/dynamic_functions/1189.php
@@ -1,3 +1,14 @@
 <?php
 
- function bar($flag) {  $arr = array(array('b' => 3, 'a' => 2, 'c' => 1),               array('x' => 6, 'y' => 4, 'z' => 5),               array('p' => 8, 'q' => 9, 'r' => 7));  if ($flag) { $f = 'var_dump'; } else { $f = 'array_multisort'; }  $f($arr[0], $arr[1], $arr[2]);  var_dump($arr);}bar($argc > 100);
\ No newline at end of file
+function bar($flag) {
+  $arr = array(array('b' => 3, 'a' => 2, 'c' => 1),               array('x' => 6, 'y' => 4, 'z' => 5),               array('p' => 8, 'q' => 9, 'r' => 7));
+  if ($flag) {
+ $f = 'var_dump';
+ }
+ else {
+ $f = 'array_multisort';
+ }
+  $f($arr[0], $arr[1], $arr[2]);
+  var_dump($arr);
+}
+bar($argc > 100);
diff --git a/hphp/test/slow/dynamic_methods/1202.php b/hphp/test/slow/dynamic_methods/1202.php
index 7f7d41f22..e24e478ce 100644
--- a/hphp/test/slow/dynamic_methods/1202.php
+++ b/hphp/test/slow/dynamic_methods/1202.php
@@ -1,3 +1,14 @@
 <?php
 
- class A { public function test() { print 'in A';} } class B extends A { public function test() { print 'in B';} } $obj = new B(); call_user_func_array(array($obj, 'A::test'), array());
\ No newline at end of file
+class A {
+ public function test() {
+ print 'in A';
+}
+ }
+ class B extends A {
+ public function test() {
+ print 'in B';
+}
+ }
+ $obj = new B();
+ call_user_func_array(array($obj, 'A::test'), array());
diff --git a/hphp/test/slow/dynamic_methods/1203.php b/hphp/test/slow/dynamic_methods/1203.php
index d86e59463..a75eb757c 100644
--- a/hphp/test/slow/dynamic_methods/1203.php
+++ b/hphp/test/slow/dynamic_methods/1203.php
@@ -1,3 +1,16 @@
 <?php
 
- $i = 'gi'; $s = 'gs'; class A { public function &dyn_test(&$a) { global $i; $a = $i; return $i;}} $obj = new A(); $f = 'dyn_test'; $c = &$obj->$f($b); var_dump($b); var_dump($c);
\ No newline at end of file
+$i = 'gi';
+ $s = 'gs';
+ class A {
+ public function &dyn_test(&$a) {
+ global $i;
+ $a = $i;
+ return $i;
+}
+}
+ $obj = new A();
+ $f = 'dyn_test';
+ $c = &$obj->$f($b);
+ var_dump($b);
+ var_dump($c);
diff --git a/hphp/test/slow/dynamic_methods/1204.php b/hphp/test/slow/dynamic_methods/1204.php
index 616d0abff..8c032b0dc 100644
--- a/hphp/test/slow/dynamic_methods/1204.php
+++ b/hphp/test/slow/dynamic_methods/1204.php
@@ -1,3 +1,15 @@
 <?php
 
- $i = 'gi'; $s = 'gs'; class A { public static function &dyn_test(&$a) { global $s; $a = $s; return $s;}} $f = 'dyn_test'; $e = A::$f($d); var_dump($d); var_dump($e);
\ No newline at end of file
+$i = 'gi';
+ $s = 'gs';
+ class A {
+ public static function &dyn_test(&$a) {
+ global $s;
+ $a = $s;
+ return $s;
+}
+}
+ $f = 'dyn_test';
+ $e = A::$f($d);
+ var_dump($d);
+ var_dump($e);
diff --git a/hphp/test/slow/dynamic_methods/1205.php b/hphp/test/slow/dynamic_methods/1205.php
index 264deb81e..8b07318a2 100644
--- a/hphp/test/slow/dynamic_methods/1205.php
+++ b/hphp/test/slow/dynamic_methods/1205.php
@@ -1,3 +1,8 @@
 <?php
 
- class dyn_A{} class B{} $cls = 'dyn_a'; $a = new $cls();
\ No newline at end of file
+class dyn_A{
+}
+ class B{
+}
+ $cls = 'dyn_a';
+ $a = new $cls();
diff --git a/hphp/test/slow/dynamic_methods/1206.php b/hphp/test/slow/dynamic_methods/1206.php
index 335531d96..c55d18ef5 100644
--- a/hphp/test/slow/dynamic_methods/1206.php
+++ b/hphp/test/slow/dynamic_methods/1206.php
@@ -1,3 +1,13 @@
 <?php
 
- class A { function _test() { print 'ok';} function __call($name, $args) { $name = '_'.$name; $this->$name();} } $obj = new A(); $obj->test();
\ No newline at end of file
+class A {
+ function _test() {
+ print 'ok';
+}
+ function __call($name, $args) {
+ $name = '_'.$name;
+ $this->$name();
+}
+ }
+ $obj = new A();
+ $obj->test();
diff --git a/hphp/test/slow/dynamic_methods/1207.php b/hphp/test/slow/dynamic_methods/1207.php
index 8392c8d3e..3d1951822 100644
--- a/hphp/test/slow/dynamic_methods/1207.php
+++ b/hphp/test/slow/dynamic_methods/1207.php
@@ -1,3 +1,13 @@
 <?php
 
- class A { function test($a, $b) { var_dump($a, $b);} } $m = 'test'; $o = new A();$ar = array(0,1); $st = 'abc';$o->$m($ar[0], $st[0]); A::$m($ar[1], $st[1]);
\ No newline at end of file
+class A {
+ function test($a, $b) {
+ var_dump($a, $b);
+}
+ }
+ $m = 'test';
+ $o = new A();
+$ar = array(0,1);
+ $st = 'abc';
+$o->$m($ar[0], $st[0]);
+ A::$m($ar[1], $st[1]);
diff --git a/hphp/test/slow/dynamic_methods/1208.php b/hphp/test/slow/dynamic_methods/1208.php
index d5ae7d63f..c12ce683d 100644
--- a/hphp/test/slow/dynamic_methods/1208.php
+++ b/hphp/test/slow/dynamic_methods/1208.php
@@ -1,3 +1,13 @@
 <?php
 
- class A { function _test() { print 'ok';} function __call($name, $args) { $name = '_'.$name; $this->$name();} }$obj = new A(); $obj->test();
\ No newline at end of file
+class A {
+ function _test() {
+ print 'ok';
+}
+ function __call($name, $args) {
+ $name = '_'.$name;
+ $this->$name();
+}
+ }
+$obj = new A();
+ $obj->test();
diff --git a/hphp/test/slow/dynamic_methods/1209.php b/hphp/test/slow/dynamic_methods/1209.php
index d825815fe..d8d3e87d3 100644
--- a/hphp/test/slow/dynamic_methods/1209.php
+++ b/hphp/test/slow/dynamic_methods/1209.php
@@ -1,3 +1,54 @@
 <?php
 
- class z {  function minArgTest($a1, $a2, $a3, $a4, $a5, $a6, $a7, $a8, $a9, $a10,                      $a11=true, $a12 = true) {    var_dump($a1);    var_dump($a2);    var_dump($a3);    var_dump($a4);    var_dump($a5);    var_dump($a6);    var_dump($a7);    var_dump($a8);    var_dump($a9);    var_dump($a10);    var_dump($a11);    var_dump($a12);  }  function varArgsTest() {    $args = func_get_args();    var_dump($args);  }  function varArgsTest2($a1, $a2) {    $args = func_get_args();    var_dump($args);  }  function refTestHelper(&$x) {    $x *= 2;  }}function refTest($q) {  if (false) { $q = 1; }  $x = 1;  $q->refTestHelper($x);  var_dump($x);}$q = new z;$f = 'minArgTest';$q->minArgTest('one',2,3.333,4,5,6,7,8,9,10);$q->minArgTest('one',2,3.333,4,5,6,7,8,9,10,11,12);$q->$f('one',2,3.333,4,5,6,7,8,9,10);$q->$f('one',2,3.333,4,5,6,7,8,9,10,11,12);refTest($q);$f = 'varArgsTest';$q->varArgsTest('one',2,3.333,4,5,6,7,8,9,10);$q->varArgsTest('one',2,3.333,4,5,6,7,8,9,10,11,12);$q->$f('one',2,3.333,4,5,6,7,8,9,10);$q->$f('one',2,3.333,4,5,6,7,8,9,10,11,12);$f = 'varArgsTest2';$q->varArgsTest2('one',2,3.333,4,5,6,7,8,9,10);$q->varArgsTest2('one',2,3.333,4,5,6,7,8,9,10,11,12);$q->$f('one',2,3.333,4,5,6,7,8,9,10);$q->$f('one',2,3.333,4,5,6,7,8,9,10,11,12);
\ No newline at end of file
+class z {
+  function minArgTest($a1, $a2, $a3, $a4, $a5, $a6, $a7, $a8, $a9, $a10,                      $a11=true, $a12 = true) {
+    var_dump($a1);
+    var_dump($a2);
+    var_dump($a3);
+    var_dump($a4);
+    var_dump($a5);
+    var_dump($a6);
+    var_dump($a7);
+    var_dump($a8);
+    var_dump($a9);
+    var_dump($a10);
+    var_dump($a11);
+    var_dump($a12);
+  }
+  function varArgsTest() {
+    $args = func_get_args();
+    var_dump($args);
+  }
+  function varArgsTest2($a1, $a2) {
+    $args = func_get_args();
+    var_dump($args);
+  }
+  function refTestHelper(&$x) {
+    $x *= 2;
+  }
+}
+function refTest($q) {
+  if (false) {
+ $q = 1;
+ }
+  $x = 1;
+  $q->refTestHelper($x);
+  var_dump($x);
+}
+$q = new z;
+$f = 'minArgTest';
+$q->minArgTest('one',2,3.333,4,5,6,7,8,9,10);
+$q->minArgTest('one',2,3.333,4,5,6,7,8,9,10,11,12);
+$q->$f('one',2,3.333,4,5,6,7,8,9,10);
+$q->$f('one',2,3.333,4,5,6,7,8,9,10,11,12);
+refTest($q);
+$f = 'varArgsTest';
+$q->varArgsTest('one',2,3.333,4,5,6,7,8,9,10);
+$q->varArgsTest('one',2,3.333,4,5,6,7,8,9,10,11,12);
+$q->$f('one',2,3.333,4,5,6,7,8,9,10);
+$q->$f('one',2,3.333,4,5,6,7,8,9,10,11,12);
+$f = 'varArgsTest2';
+$q->varArgsTest2('one',2,3.333,4,5,6,7,8,9,10);
+$q->varArgsTest2('one',2,3.333,4,5,6,7,8,9,10,11,12);
+$q->$f('one',2,3.333,4,5,6,7,8,9,10);
+$q->$f('one',2,3.333,4,5,6,7,8,9,10,11,12);
diff --git a/hphp/test/slow/dynamic_methods/1210.php b/hphp/test/slow/dynamic_methods/1210.php
index bf61e42e7..d3ee1956f 100644
--- a/hphp/test/slow/dynamic_methods/1210.php
+++ b/hphp/test/slow/dynamic_methods/1210.php
@@ -1,3 +1,12 @@
 <?php
 
- class z {  function __construct() { echo 'construct'; }  function z() { echo 'method'; }}$z = new z;$z->z();
\ No newline at end of file
+class z {
+  function __construct() {
+ echo 'construct';
+ }
+  function z() {
+ echo 'method';
+ }
+}
+$z = new z;
+$z->z();
diff --git a/hphp/test/slow/dynamic_methods/1211.php b/hphp/test/slow/dynamic_methods/1211.php
index ff2503021..91fcbd562 100644
--- a/hphp/test/slow/dynamic_methods/1211.php
+++ b/hphp/test/slow/dynamic_methods/1211.php
@@ -1,3 +1,16 @@
 <?php
 
- function bar() {  echo 'bar called';}class foo {  public $functions = array();  function foo() {    $function = 'bar';    print($function);    print($function());    $this->functions['test'] = $function;    print($this->functions['test']());  }}$a = new foo ();
\ No newline at end of file
+function bar() {
+  echo 'bar called';
+}
+class foo {
+  public $functions = array();
+  function foo() {
+    $function = 'bar';
+    print($function);
+    print($function());
+    $this->functions['test'] = $function;
+    print($this->functions['test']());
+  }
+}
+$a = new foo ();
diff --git a/hphp/test/slow/dynamic_methods/1212.php b/hphp/test/slow/dynamic_methods/1212.php
index 74ea87b0b..25899833f 100644
--- a/hphp/test/slow/dynamic_methods/1212.php
+++ b/hphp/test/slow/dynamic_methods/1212.php
@@ -1,3 +1,18 @@
 <?php
 
- function t($x) {  var_dump($x);}$x = array(1,2,3);array_map('t', $x);class z {  function q() {    $x = array(1,2,3);    array_map(array('self', 'p'), $x);  }  function p($x) {    var_dump($x);  }}$m = new z();$m->q();
\ No newline at end of file
+function t($x) {
+  var_dump($x);
+}
+$x = array(1,2,3);
+array_map('t', $x);
+class z {
+  function q() {
+    $x = array(1,2,3);
+    array_map(array('self', 'p'), $x);
+  }
+  function p($x) {
+    var_dump($x);
+  }
+}
+$m = new z();
+$m->q();
diff --git a/hphp/test/slow/dynamic_methods/1213.php b/hphp/test/slow/dynamic_methods/1213.php
index 86adf0149..118a7641c 100644
--- a/hphp/test/slow/dynamic_methods/1213.php
+++ b/hphp/test/slow/dynamic_methods/1213.php
@@ -1,3 +1,11 @@
 <?php
 
- class A {  function foo(&$test) {    $test = 10;  }}$obj = new A();$method = 'foo';$obj->$method($aa[3]);var_dump($aa);
\ No newline at end of file
+class A {
+  function foo(&$test) {
+    $test = 10;
+  }
+}
+$obj = new A();
+$method = 'foo';
+$obj->$method($aa[3]);
+var_dump($aa);
diff --git a/hphp/test/slow/dynamic_methods/1214.php b/hphp/test/slow/dynamic_methods/1214.php
index 10a93a0ff..faf682cba 100644
--- a/hphp/test/slow/dynamic_methods/1214.php
+++ b/hphp/test/slow/dynamic_methods/1214.php
@@ -1,3 +1,38 @@
 <?php
 
- abstract class Parent_ {  protected function overridden() {    var_dump(isset($this), __METHOD__);  }  protected function calledHere() {    if (isset($this)) {      $this->overridden();    } else {      static::overridden();    }  }}class Child extends Parent_ {  protected final function overridden() {    var_dump(isset($this), __METHOD__);  }  protected function calledHere() {    var_dump(__METHOD__);  }  public function entry($fun = 'calledHere') {    self::callParent($fun);  }  function callParent($fun) {    parent::$fun();    if (isset($this)) {      $this::$fun();    }  }}$c = new Child;$c->entry();$c->entry('overridden');Child::entry();Child::callParent('calledHere');Child::callParent('overridden');
\ No newline at end of file
+abstract class Parent_ {
+  protected function overridden() {
+    var_dump(isset($this), __METHOD__);
+  }
+  protected function calledHere() {
+    if (isset($this)) {
+      $this->overridden();
+    }
+ else {
+      static::overridden();
+    }
+  }
+}
+class Child extends Parent_ {
+  protected final function overridden() {
+    var_dump(isset($this), __METHOD__);
+  }
+  protected function calledHere() {
+    var_dump(__METHOD__);
+  }
+  public function entry($fun = 'calledHere') {
+    self::callParent($fun);
+  }
+  function callParent($fun) {
+    parent::$fun();
+    if (isset($this)) {
+      $this::$fun();
+    }
+  }
+}
+$c = new Child;
+$c->entry();
+$c->entry('overridden');
+Child::entry();
+Child::callParent('calledHere');
+Child::callParent('overridden');
diff --git a/hphp/test/slow/dynamic_properties/1168.php b/hphp/test/slow/dynamic_properties/1168.php
index 64597ec9d..edfcf5beb 100644
--- a/hphp/test/slow/dynamic_properties/1168.php
+++ b/hphp/test/slow/dynamic_properties/1168.php
@@ -1,3 +1,19 @@
 <?php
 
- class A { public $a = 1;} class B extends A {   public $m = 10;  public function test() {     $b = 'a';    $this->$b = 'test'; var_dump($this->$b); var_dump($this->a);    $c = &$this->$b; $c = array(1); var_dump($this->a);  }} $obj = new B(); $obj->test();
\ No newline at end of file
+class A {
+ public $a = 1;
+}
+ class B extends A {
+   public $m = 10;
+  public function test() {
+     $b = 'a';
+    $this->$b = 'test';
+ var_dump($this->$b);
+ var_dump($this->a);
+    $c = &$this->$b;
+ $c = array(1);
+ var_dump($this->a);
+  }
+}
+ $obj = new B();
+ $obj->test();
diff --git a/hphp/test/slow/dynamic_properties/1169.php b/hphp/test/slow/dynamic_properties/1169.php
index 6e96933ca..96072093e 100644
--- a/hphp/test/slow/dynamic_properties/1169.php
+++ b/hphp/test/slow/dynamic_properties/1169.php
@@ -1,3 +1,11 @@
 <?php
 
- class A { public $a = 1;} class B { public $a = 2;} $obj = 1; $obj = new A(); var_dump($obj->a);
\ No newline at end of file
+class A {
+ public $a = 1;
+}
+ class B {
+ public $a = 2;
+}
+ $obj = 1;
+ $obj = new A();
+ var_dump($obj->a);
diff --git a/hphp/test/slow/dynamic_properties/1170.php b/hphp/test/slow/dynamic_properties/1170.php
index d214c5f91..5b5cd81f5 100644
--- a/hphp/test/slow/dynamic_properties/1170.php
+++ b/hphp/test/slow/dynamic_properties/1170.php
@@ -1,3 +1,20 @@
 <?php
 
- class A { } function f(&$a) { $a = 1000; } $a = new A(); $f = 10; $a->$f = 100; var_dump($a); var_dump((array)$a); $f = 100; f($a->$f); foreach ($a as $k => &$v) { var_dump($k); $v = 1; } var_dump($a); 
\ No newline at end of file
+class A {
+ }
+ function f(&$a) {
+ $a = 1000;
+ }
+ $a = new A();
+ $f = 10;
+ $a->$f = 100;
+ var_dump($a);
+ var_dump((array)$a);
+ $f = 100;
+ f($a->$f);
+ foreach ($a as $k => &$v) {
+ var_dump($k);
+ $v = 1;
+ }
+ var_dump($a);
+
diff --git a/hphp/test/slow/dynamic_variables/1135.php b/hphp/test/slow/dynamic_variables/1135.php
index 49d5edd63..e64223ca7 100644
--- a/hphp/test/slow/dynamic_variables/1135.php
+++ b/hphp/test/slow/dynamic_variables/1135.php
@@ -1,3 +1,9 @@
 <?php
 
- $a = 1; function t() { global $a;$b = 'a'; var_dump($$b);} t();
\ No newline at end of file
+$a = 1;
+ function t() {
+ global $a;
+$b = 'a';
+ var_dump($$b);
+}
+ t();
diff --git a/hphp/test/slow/dynamic_variables/1136.php b/hphp/test/slow/dynamic_variables/1136.php
index 8d235ac9c..46ae73ed7 100644
--- a/hphp/test/slow/dynamic_variables/1136.php
+++ b/hphp/test/slow/dynamic_variables/1136.php
@@ -1,3 +1,8 @@
 <?php
 
- $a = 1; function t() { $b = 'a'; var_dump($$b);} t();
\ No newline at end of file
+$a = 1;
+ function t() {
+ $b = 'a';
+ var_dump($$b);
+}
+ t();
diff --git a/hphp/test/slow/dynamic_variables/1137.php b/hphp/test/slow/dynamic_variables/1137.php
index 69c6ed2ad..c9419a089 100644
--- a/hphp/test/slow/dynamic_variables/1137.php
+++ b/hphp/test/slow/dynamic_variables/1137.php
@@ -1,3 +1,8 @@
 <?php
 
- function t() { $a = 'test'; $b = 'a'; var_dump($$b);} t();
\ No newline at end of file
+function t() {
+ $a = 'test';
+ $b = 'a';
+ var_dump($$b);
+}
+ t();
diff --git a/hphp/test/slow/dynamic_variables/1138.php b/hphp/test/slow/dynamic_variables/1138.php
index 02c15f881..751449808 100644
--- a/hphp/test/slow/dynamic_variables/1138.php
+++ b/hphp/test/slow/dynamic_variables/1138.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $b = 'a'; var_dump($$b);
\ No newline at end of file
+$a = 'test';
+ $b = 'a';
+ var_dump($$b);
diff --git a/hphp/test/slow/dynamic_variables/1139.php b/hphp/test/slow/dynamic_variables/1139.php
index 9d99a1bda..e0ced4ad2 100644
--- a/hphp/test/slow/dynamic_variables/1139.php
+++ b/hphp/test/slow/dynamic_variables/1139.php
@@ -1,3 +1,12 @@
 <?php
 
- $a = 1; class A { public function t() { global $a; $b = 'a'; var_dump($$b);}} $obj = new A(); $obj->t();
\ No newline at end of file
+$a = 1;
+ class A {
+ public function t() {
+ global $a;
+ $b = 'a';
+ var_dump($$b);
+}
+}
+ $obj = new A();
+ $obj->t();
diff --git a/hphp/test/slow/dynamic_variables/1140.php b/hphp/test/slow/dynamic_variables/1140.php
index 94001dbe3..58c64691f 100644
--- a/hphp/test/slow/dynamic_variables/1140.php
+++ b/hphp/test/slow/dynamic_variables/1140.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; $b = 'a'; $$b = 'ok'; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $b = 'a';
+ $$b = 'ok';
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1141.php b/hphp/test/slow/dynamic_variables/1141.php
index 3205278e0..42c83305e 100644
--- a/hphp/test/slow/dynamic_variables/1141.php
+++ b/hphp/test/slow/dynamic_variables/1141.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; $b = 'a'; $$b = 10; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $b = 'a';
+ $$b = 10;
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1142.php b/hphp/test/slow/dynamic_variables/1142.php
index b24b03fc6..3aad091ee 100644
--- a/hphp/test/slow/dynamic_variables/1142.php
+++ b/hphp/test/slow/dynamic_variables/1142.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 'd'; var_dump($$a); $$a = 10; var_dump($$a); var_dump($d);
\ No newline at end of file
+$a = 'd';
+ var_dump($$a);
+ $$a = 10;
+ var_dump($$a);
+ var_dump($d);
diff --git a/hphp/test/slow/dynamic_variables/1143.php b/hphp/test/slow/dynamic_variables/1143.php
index 7130fa33d..8e1d4486e 100644
--- a/hphp/test/slow/dynamic_variables/1143.php
+++ b/hphp/test/slow/dynamic_variables/1143.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 'test'; $b = 'a'; $c = &$$b; $c = 10; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $b = 'a';
+ $c = &$$b;
+ $c = 10;
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1144.php b/hphp/test/slow/dynamic_variables/1144.php
index d8d0946f1..2798f2fe3 100644
--- a/hphp/test/slow/dynamic_variables/1144.php
+++ b/hphp/test/slow/dynamic_variables/1144.php
@@ -1,3 +1,4 @@
 <?php
 
- extract(array('a' => 'aval')); var_dump($a);
\ No newline at end of file
+extract(array('a' => 'aval'));
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1145.php b/hphp/test/slow/dynamic_variables/1145.php
index ce3d73e33..f3c375800 100644
--- a/hphp/test/slow/dynamic_variables/1145.php
+++ b/hphp/test/slow/dynamic_variables/1145.php
@@ -1,3 +1,5 @@
 <?php
 
- extract(array('a' => 'ok')); $a = 1; var_dump($a);
\ No newline at end of file
+extract(array('a' => 'ok'));
+ $a = 1;
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1146.php b/hphp/test/slow/dynamic_variables/1146.php
index c808ccd76..7caaad5c2 100644
--- a/hphp/test/slow/dynamic_variables/1146.php
+++ b/hphp/test/slow/dynamic_variables/1146.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 1; extract(array('a' => 'ok'), EXTR_SKIP); var_dump($a);
\ No newline at end of file
+$a = 1;
+ extract(array('a' => 'ok'), EXTR_SKIP);
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1147.php b/hphp/test/slow/dynamic_variables/1147.php
index 6fa314510..6d5ab9490 100644
--- a/hphp/test/slow/dynamic_variables/1147.php
+++ b/hphp/test/slow/dynamic_variables/1147.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 1; extract(array('a' => 'ok'), EXTR_PREFIX_SAME, 'p'); var_dump($p_a);
\ No newline at end of file
+$a = 1;
+ extract(array('a' => 'ok'), EXTR_PREFIX_SAME, 'p');
+ var_dump($p_a);
diff --git a/hphp/test/slow/dynamic_variables/1148.php b/hphp/test/slow/dynamic_variables/1148.php
index 6ff032208..e1329645b 100644
--- a/hphp/test/slow/dynamic_variables/1148.php
+++ b/hphp/test/slow/dynamic_variables/1148.php
@@ -1,3 +1,4 @@
 <?php
 
- extract(array('a' => 'ok'), EXTR_PREFIX_ALL, 'p'); var_dump($p_a);
\ No newline at end of file
+extract(array('a' => 'ok'), EXTR_PREFIX_ALL, 'p');
+ var_dump($p_a);
diff --git a/hphp/test/slow/dynamic_variables/1149.php b/hphp/test/slow/dynamic_variables/1149.php
index e41613873..5cecc8b75 100644
--- a/hphp/test/slow/dynamic_variables/1149.php
+++ b/hphp/test/slow/dynamic_variables/1149.php
@@ -1,3 +1,4 @@
 <?php
 
- extract(array('ok'), EXTR_PREFIX_INVALID, 'p'); var_dump($p_0);
\ No newline at end of file
+extract(array('ok'), EXTR_PREFIX_INVALID, 'p');
+ var_dump($p_0);
diff --git a/hphp/test/slow/dynamic_variables/1150.php b/hphp/test/slow/dynamic_variables/1150.php
index 2a4f2eda9..c6073b51c 100644
--- a/hphp/test/slow/dynamic_variables/1150.php
+++ b/hphp/test/slow/dynamic_variables/1150.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = null; extract(array('a' => 'ok'), EXTR_IF_EXISTS); var_dump($a);
\ No newline at end of file
+$a = null;
+ extract(array('a' => 'ok'), EXTR_IF_EXISTS);
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1151.php b/hphp/test/slow/dynamic_variables/1151.php
index d5ae35b7f..3620b1e5c 100644
--- a/hphp/test/slow/dynamic_variables/1151.php
+++ b/hphp/test/slow/dynamic_variables/1151.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = null; extract(array('a' => 'ok', 'b' => 'no'), EXTR_PREFIX_IF_EXISTS, 'p'); var_dump($p_a); var_dump($b); var_dump($p_b);
\ No newline at end of file
+$a = null;
+ extract(array('a' => 'ok', 'b' => 'no'), EXTR_PREFIX_IF_EXISTS, 'p');
+ var_dump($p_a);
+ var_dump($b);
+ var_dump($p_b);
diff --git a/hphp/test/slow/dynamic_variables/1152.php b/hphp/test/slow/dynamic_variables/1152.php
index 87efc706e..ece489fcd 100644
--- a/hphp/test/slow/dynamic_variables/1152.php
+++ b/hphp/test/slow/dynamic_variables/1152.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'ok'; extract(array('b' => &$a), EXTR_REFS); $b = 'no'; var_dump($a);
\ No newline at end of file
+$a = 'ok';
+ extract(array('b' => &$a), EXTR_REFS);
+ $b = 'no';
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1153.php b/hphp/test/slow/dynamic_variables/1153.php
index 5664df94b..c19f955b8 100644
--- a/hphp/test/slow/dynamic_variables/1153.php
+++ b/hphp/test/slow/dynamic_variables/1153.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 'ok'; $arr = array('b' => &$a); extract($arr, EXTR_REFS); $b = 'no'; var_dump($a);
\ No newline at end of file
+$a = 'ok';
+ $arr = array('b' => &$a);
+ extract($arr, EXTR_REFS);
+ $b = 'no';
+ var_dump($a);
diff --git a/hphp/test/slow/dynamic_variables/1154.php b/hphp/test/slow/dynamic_variables/1154.php
index ff6c36a9d..6e1faf0f5 100644
--- a/hphp/test/slow/dynamic_variables/1154.php
+++ b/hphp/test/slow/dynamic_variables/1154.php
@@ -1,9 +1,10 @@
 <?php
 
-
 function f() {
   $arr = array(1 => 2, '1d' => 3);
   extract($arr);
-  $vars = get_defined_vars(); asort($vars); var_dump($vars);
+  $vars = get_defined_vars();
+ asort($vars);
+ var_dump($vars);
 }
 f();
diff --git a/hphp/test/slow/dynamic_variables/1155.php b/hphp/test/slow/dynamic_variables/1155.php
index a14dee5a1..3688e9f5d 100644
--- a/hphp/test/slow/dynamic_variables/1155.php
+++ b/hphp/test/slow/dynamic_variables/1155.php
@@ -1,19 +1,25 @@
 <?php
 
-
 $a = 123;
 $b = 456;
 function foo() {
   global $a;
   $b = &$GLOBALS['b'];
-  $d = 789; $e = 111;
+  $d = 789;
+ $e = 111;
   $c = &$d;
- $arr = get_defined_vars(); ksort($arr); var_dump($arr); return $arr;
+ $arr = get_defined_vars();
+ ksort($arr);
+ var_dump($arr);
+ return $arr;
 }
 function bar($arr) {
   extract($arr, EXTR_REFS);
   var_dump($a, $b, $c, $d, $e);
-  $a = 'aaa'; $b = 'bbb'; $c = 'ccc';
+  $a = 'aaa';
+ $b = 'bbb';
+ $c = 'ccc';
   var_dump($d);
-}bar(foo());
+}
+bar(foo());
 var_dump($a, $b);
diff --git a/hphp/test/slow/dynamic_variables/1156.php b/hphp/test/slow/dynamic_variables/1156.php
index 1cfa13aa2..e73aef8d0 100644
--- a/hphp/test/slow/dynamic_variables/1156.php
+++ b/hphp/test/slow/dynamic_variables/1156.php
@@ -1,3 +1,11 @@
 <?php
 
- function test() { $a = 10; $b = 'test';   var_dump(compact('ab'));   var_dump(compact('a', 'ab', 'b'));   var_dump(compact('a', array('ab', 'b')));} test(); 
\ No newline at end of file
+function test() {
+ $a = 10;
+ $b = 'test';
+   var_dump(compact('ab'));
+   var_dump(compact('a', 'ab', 'b'));
+   var_dump(compact('a', array('ab', 'b')));
+}
+ test();
+
diff --git a/hphp/test/slow/dynamic_variables/1157.php b/hphp/test/slow/dynamic_variables/1157.php
index bf8817b0a..c1426fb95 100644
--- a/hphp/test/slow/dynamic_variables/1157.php
+++ b/hphp/test/slow/dynamic_variables/1157.php
@@ -1,12 +1,15 @@
 <?php
 
-
-function f() { return true; }
+function f() {
+ return true;
+ }
 function test() {
   $a = 100;
-  if (compact('a', 'b')) { }
+  if (compact('a', 'b')) {
+ }
   var_dump(compact('a', 'b'));
-  if (f()) $b = 1; else $b = new Exception();
+  if (f()) $b = 1;
+ else $b = new Exception();
   return $b;
 }
 test();
diff --git a/hphp/test/slow/dynamic_variables/1158.php b/hphp/test/slow/dynamic_variables/1158.php
index ebd53c8c7..07365b09e 100644
--- a/hphp/test/slow/dynamic_variables/1158.php
+++ b/hphp/test/slow/dynamic_variables/1158.php
@@ -1,3 +1,10 @@
 <?php
 
- function f() { return 3; }function test($f) {  $x = $f();  return compact('x');}var_dump(test('f'));
\ No newline at end of file
+function f() {
+ return 3;
+ }
+function test($f) {
+  $x = $f();
+  return compact('x');
+}
+var_dump(test('f'));
diff --git a/hphp/test/slow/dynamic_variables/1159.php b/hphp/test/slow/dynamic_variables/1159.php
index 1a0415e02..604d36b58 100644
--- a/hphp/test/slow/dynamic_variables/1159.php
+++ b/hphp/test/slow/dynamic_variables/1159.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo($a) {
   while ($a--) {
     if (!$a) {
diff --git a/hphp/test/slow/dynamic_variables/1160.php b/hphp/test/slow/dynamic_variables/1160.php
index 5011df412..05c9b41ce 100644
--- a/hphp/test/slow/dynamic_variables/1160.php
+++ b/hphp/test/slow/dynamic_variables/1160.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function simple_getdefined_test() {
   $a = 'a';
   var_dump(get_defined_vars());
diff --git a/hphp/test/slow/dynamic_variables/1161.php b/hphp/test/slow/dynamic_variables/1161.php
index 366cefb5f..8aa17703a 100644
--- a/hphp/test/slow/dynamic_variables/1161.php
+++ b/hphp/test/slow/dynamic_variables/1161.php
@@ -1,3 +1,24 @@
 <?php
 
- function foo() {  static $b = 20;  global $d;  $a = 10;  $b = 'c';  $$b = 20;  $gdv = get_defined_vars();  var_dump(isset($gdv['a']) && $gdv['a'] === 10);  var_dump(isset($gdv['b']) && $gdv['b'] === 'c');  var_dump(isset($gdv['c']) && $gdv['c'] === 20);  var_dump(isset($gdv['d']) && $gdv['d'] === 2.1);}$d = 2.1;foo();var_dump(isset($ggdv['argc']));var_dump(isset($ggdv['argv']));var_dump(isset($ggdv['_SERVER']));var_dump(isset($ggdv['_GET']));var_dump(isset($ggdv['_POST']));var_dump(isset($ggdv['_COOKIE']));var_dump(isset($ggdv['_FILES']));var_dump(isset($ggdv['d']));
\ No newline at end of file
+function foo() {
+  static $b = 20;
+  global $d;
+  $a = 10;
+  $b = 'c';
+  $$b = 20;
+  $gdv = get_defined_vars();
+  var_dump(isset($gdv['a']) && $gdv['a'] === 10);
+  var_dump(isset($gdv['b']) && $gdv['b'] === 'c');
+  var_dump(isset($gdv['c']) && $gdv['c'] === 20);
+  var_dump(isset($gdv['d']) && $gdv['d'] === 2.1);
+}
+$d = 2.1;
+foo();
+var_dump(isset($ggdv['argc']));
+var_dump(isset($ggdv['argv']));
+var_dump(isset($ggdv['_SERVER']));
+var_dump(isset($ggdv['_GET']));
+var_dump(isset($ggdv['_POST']));
+var_dump(isset($ggdv['_COOKIE']));
+var_dump(isset($ggdv['_FILES']));
+var_dump(isset($ggdv['d']));
diff --git a/hphp/test/slow/dynamic_variables/1162.php b/hphp/test/slow/dynamic_variables/1162.php
index 5c5212ea0..f18a6c972 100644
--- a/hphp/test/slow/dynamic_variables/1162.php
+++ b/hphp/test/slow/dynamic_variables/1162.php
@@ -1,3 +1,10 @@
 <?php
 
- function foo(array $test) {  foreach ($test AS $var) {    global $$var;    $$var = $var . 'foo';  }}foo(array('a', 'b'));var_dump($a, $b);
\ No newline at end of file
+function foo(array $test) {
+  foreach ($test AS $var) {
+    global $$var;
+    $$var = $var . 'foo';
+  }
+}
+foo(array('a', 'b'));
+var_dump($a, $b);
diff --git a/hphp/test/slow/dynamic_variables/1163.php b/hphp/test/slow/dynamic_variables/1163.php
index 0f464aa33..a0348090e 100644
--- a/hphp/test/slow/dynamic_variables/1163.php
+++ b/hphp/test/slow/dynamic_variables/1163.php
@@ -1,3 +1,8 @@
 <?php
 
- function test($a) {  $b = 5;  global $$a;  var_dump($b);}test('b');
\ No newline at end of file
+function test($a) {
+  $b = 5;
+  global $$a;
+  var_dump($b);
+}
+test('b');
diff --git a/hphp/test/slow/dynamic_variables/1164.php b/hphp/test/slow/dynamic_variables/1164.php
index 0834f4424..ea5e5f229 100644
--- a/hphp/test/slow/dynamic_variables/1164.php
+++ b/hphp/test/slow/dynamic_variables/1164.php
@@ -1,3 +1,5 @@
 <?php
 
- $x = 'stuff';$stuff = 1234;echo "${$x}";
\ No newline at end of file
+$x = 'stuff';
+$stuff = 1234;
+echo "${$x}";
diff --git a/hphp/test/slow/dynamic_variables/1165.php b/hphp/test/slow/dynamic_variables/1165.php
index 7f7809b08..27a0a4b9a 100644
--- a/hphp/test/slow/dynamic_variables/1165.php
+++ b/hphp/test/slow/dynamic_variables/1165.php
@@ -1,3 +1,29 @@
 <?php
 
- $i = 1;$j = 2;$k = 3;$v = 'i';var_dump($$v);$v = 'j';var_dump($$v);$v = 'k';var_dump($$v);$v = '_FILES';var_dump($$v);$v = 'l';var_dump($$v);if (true) {  class A{    const C = 1;  }} else {  class A{    const C = 1;  }}function foo($p) {  var_dump($p::C);}foo('A');
\ No newline at end of file
+$i = 1;
+$j = 2;
+$k = 3;
+$v = 'i';
+var_dump($$v);
+$v = 'j';
+var_dump($$v);
+$v = 'k';
+var_dump($$v);
+$v = '_FILES';
+var_dump($$v);
+$v = 'l';
+var_dump($$v);
+if (true) {
+  class A{
+    const C = 1;
+  }
+}
+ else {
+  class A{
+    const C = 1;
+  }
+}
+function foo($p) {
+  var_dump($p::C);
+}
+foo('A');
diff --git a/hphp/test/slow/dynamic_variables/1166.php b/hphp/test/slow/dynamic_variables/1166.php
index 977de2685..8eb5306d9 100644
--- a/hphp/test/slow/dynamic_variables/1166.php
+++ b/hphp/test/slow/dynamic_variables/1166.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $MY_VAR_a = 123;
 function foo() {
   global $MY_VAR_a;
diff --git a/hphp/test/slow/dynamic_variables/1167.php b/hphp/test/slow/dynamic_variables/1167.php
index 444f313e6..dd0181959 100644
--- a/hphp/test/slow/dynamic_variables/1167.php
+++ b/hphp/test/slow/dynamic_variables/1167.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function foo() {
   $arr = get_defined_vars();
   var_dump($arr);
diff --git a/hphp/test/slow/error_handler/1366.php b/hphp/test/slow/error_handler/1366.php
index 605d74a53..42e574597 100644
--- a/hphp/test/slow/error_handler/1366.php
+++ b/hphp/test/slow/error_handler/1366.php
@@ -1,3 +1,13 @@
 <?php
 
- function handler($code, $msg) {   var_dump(strpos($msg, 'system error') !== false); return true;} set_error_handler('handler');function a() {} set_error_handler('a');restore_error_handler();trigger_error('system error'); 
\ No newline at end of file
+function handler($code, $msg) {
+   var_dump(strpos($msg, 'system error') !== false);
+ return true;
+}
+ set_error_handler('handler');
+function a() {
+}
+ set_error_handler('a');
+restore_error_handler();
+trigger_error('system error');
+
diff --git a/hphp/test/slow/error_handler/1367.php b/hphp/test/slow/error_handler/1367.php
index 487474d07..ffa231201 100644
--- a/hphp/test/slow/error_handler/1367.php
+++ b/hphp/test/slow/error_handler/1367.php
@@ -1,3 +1,9 @@
 <?php
 
- function handler($code, $msg) {   var_dump(strpos($msg, 'system error') !== false); return true;} set_error_handler('handler');user_error('system error'); 
\ No newline at end of file
+function handler($code, $msg) {
+   var_dump(strpos($msg, 'system error') !== false);
+ return true;
+}
+ set_error_handler('handler');
+user_error('system error');
+
diff --git a/hphp/test/slow/error_handler/1368.php b/hphp/test/slow/error_handler/1368.php
index 0eb03bf33..15b28d588 100644
--- a/hphp/test/slow/error_handler/1368.php
+++ b/hphp/test/slow/error_handler/1368.php
@@ -1,3 +1,13 @@
 <?php
 
- function handler($e) {   var_dump(strpos((string)$e, 'bomb') !== false); return true;} set_exception_handler('handler');function a() {} set_exception_handler('a');restore_exception_handler();throw new Exception('bomb'); 
\ No newline at end of file
+function handler($e) {
+   var_dump(strpos((string)$e, 'bomb') !== false);
+ return true;
+}
+ set_exception_handler('handler');
+function a() {
+}
+ set_exception_handler('a');
+restore_exception_handler();
+throw new Exception('bomb');
+
diff --git a/hphp/test/slow/error_handler/1369.php b/hphp/test/slow/error_handler/1369.php
index a3a490290..bde500f38 100644
--- a/hphp/test/slow/error_handler/1369.php
+++ b/hphp/test/slow/error_handler/1369.php
@@ -1,3 +1,12 @@
 <?php
 
- ob_start();set_exception_handler('user_exception_handler');echo 'Hello World';throw new Exception;function user_exception_handler($e) {  ob_end_clean();  var_dump(error_get_last());  echo 'Goodbye';  var_dump(error_get_last());}
\ No newline at end of file
+ob_start();
+set_exception_handler('user_exception_handler');
+echo 'Hello World';
+throw new Exception;
+function user_exception_handler($e) {
+  ob_end_clean();
+  var_dump(error_get_last());
+  echo 'Goodbye';
+  var_dump(error_get_last());
+}
diff --git a/hphp/test/slow/error_handler/1370.php b/hphp/test/slow/error_handler/1370.php
index 1b41667a1..0bace36fa 100644
--- a/hphp/test/slow/error_handler/1370.php
+++ b/hphp/test/slow/error_handler/1370.php
@@ -1,7 +1,8 @@
 <?php
 
-
-function handler($code, $msg, $file, $line) { var_dump($line); }
+function handler($code, $msg, $file, $line) {
+ var_dump($line);
+}
 set_error_handler('handler');
 function f($a) {
   $b = $a[100];
diff --git a/hphp/test/slow/error_handler/1370.php.expect b/hphp/test/slow/error_handler/1370.php.expect
index 158940119..d110ab2bc 100644
--- a/hphp/test/slow/error_handler/1370.php.expect
+++ b/hphp/test/slow/error_handler/1370.php.expect
@@ -1 +1 @@
-int(7)
+int(8)
diff --git a/hphp/test/slow/error_handler/1371.php b/hphp/test/slow/error_handler/1371.php
index cb2db585d..a9a7d157b 100644
--- a/hphp/test/slow/error_handler/1371.php
+++ b/hphp/test/slow/error_handler/1371.php
@@ -1,4 +1,14 @@
 <?php
 
-
-class C {  public static function log(Exception $exception) {    $msg = get_class($exception).': '.$exception->getMessage();    var_dump($msg);  }  public static function setup() {    set_exception_handler(array(__CLASS__, 'log'));  }}$obj = new C;$obj->setup();throw new Exception('test');
\ No newline at end of file
+class C {
+  public static function log(Exception $exception) {
+    $msg = get_class($exception).': '.$exception->getMessage();
+    var_dump($msg);
+  }
+  public static function setup() {
+    set_exception_handler(array(__CLASS__, 'log'));
+  }
+}
+$obj = new C;
+$obj->setup();
+throw new Exception('test');
diff --git a/hphp/test/slow/eval_order/1499.php b/hphp/test/slow/eval_order/1499.php
index 3d35d981f..0debac880 100644
--- a/hphp/test/slow/eval_order/1499.php
+++ b/hphp/test/slow/eval_order/1499.php
@@ -1,7 +1,8 @@
 <?php
 
-
 set_error_handler('h');
 foo(var_dump('123'));
 var_dump('end');
-function h() { var_dump('errored');}
\ No newline at end of file
+function h() {
+ var_dump('errored');
+}
diff --git a/hphp/test/slow/eval_order/1500.php b/hphp/test/slow/eval_order/1500.php
index a12f9ad01..b4273d0d9 100644
--- a/hphp/test/slow/eval_order/1500.php
+++ b/hphp/test/slow/eval_order/1500.php
@@ -1,7 +1,11 @@
 <?php
 
-
 set_error_handler('h');
-class A {} $obj = new A; $obj->foo(var_dump('123'));
+class A {
+}
+ $obj = new A;
+ $obj->foo(var_dump('123'));
 var_dump('end');
-function h() { var_dump('errored');}
\ No newline at end of file
+function h() {
+ var_dump('errored');
+}
diff --git a/hphp/test/slow/eval_order/1501.php b/hphp/test/slow/eval_order/1501.php
index 175983696..97ebade6a 100644
--- a/hphp/test/slow/eval_order/1501.php
+++ b/hphp/test/slow/eval_order/1501.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(123); foreach ($a as $x => $x) {   var_dump($x); }
\ No newline at end of file
+$a = array(123);
+ foreach ($a as $x => $x) {
+   var_dump($x);
+ }
diff --git a/hphp/test/slow/eval_order/1502.php b/hphp/test/slow/eval_order/1502.php
index efdd447d5..89ce20111 100644
--- a/hphp/test/slow/eval_order/1502.php
+++ b/hphp/test/slow/eval_order/1502.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 class MyIterator implements Iterator{
   private $var = array();
   public function __construct($array) {
@@ -42,8 +40,14 @@ class MyIterator implements Iterator{
   }
 }
 
-function f() { var_dump('f'); return 0; }
-function g() { var_dump('g'); return 0; }
+function f() {
+ var_dump('f');
+ return 0;
+ }
+function g() {
+ var_dump('g');
+ return 0;
+ }
 
 $a = array(1, 2);
 $values = array('a' => 1, 'b' => 2, 'c' => 3);
diff --git a/hphp/test/slow/eval_order/1503.php b/hphp/test/slow/eval_order/1503.php
index 261281b51..7f00315c6 100644
--- a/hphp/test/slow/eval_order/1503.php
+++ b/hphp/test/slow/eval_order/1503.php
@@ -1,3 +1,10 @@
 <?php
 
- class X {} function foo() { var_dump('foo');} $x = new X; unset($x->a[foo()]->y); 
\ No newline at end of file
+class X {
+}
+ function foo() {
+ var_dump('foo');
+}
+ $x = new X;
+ unset($x->a[foo()]->y);
+
diff --git a/hphp/test/slow/eval_order/1504.php b/hphp/test/slow/eval_order/1504.php
index e245aed65..1916b8a34 100644
--- a/hphp/test/slow/eval_order/1504.php
+++ b/hphp/test/slow/eval_order/1504.php
@@ -1,3 +1,10 @@
 <?php
 
- function foo($i) {   var_dump($i);   return 'a'; } ${foo(1)}[foo(2)][foo(3)] = foo(4); 
\ No newline at end of file
+function foo($i) {
+   var_dump($i);
+   return 'a';
+ }
+ ${
+foo(1)}
+[foo(2)][foo(3)] = foo(4);
+
diff --git a/hphp/test/slow/eval_order/1505.php b/hphp/test/slow/eval_order/1505.php
index 725111734..d0c2d7dca 100644
--- a/hphp/test/slow/eval_order/1505.php
+++ b/hphp/test/slow/eval_order/1505.php
@@ -1,3 +1,37 @@
 <?php
 
- class A {  public $foo;  public $bar;  function q($a) {    echo $a;    $this->foo = 9;    $this->bar = '3';    return $this;  }}$a = new A();var_dump($a->q('1')->foo + $a->q('2')->bar);var_dump($a->q('1')->foo - $a->q('2')->bar);var_dump($a->q('1')->foo / $a->q('2')->bar);var_dump($a->q('1')->foo * $a->q('2')->bar);var_dump($a->q('1')->foo % $a->q('2')->bar);var_dump($a->q('1')->foo << $a->q('2')->bar);var_dump($a->q('1')->foo >> $a->q('2')->bar);var_dump($a->q('1')->foo && $a->q('2')->bar);var_dump($a->q('1')->foo || $a->q('2')->bar);var_dump($a->q('1')->foo and $a->q('2')->bar);var_dump($a->q('1')->foo or $a->q('2')->bar);var_dump($a->q('1')->foo xor $a->q('2')->bar);var_dump($a->q('1')->foo . $a->q('2')->bar);var_dump($a->q('1')->foo & $a->q('2')->bar);var_dump($a->q('1')->foo | $a->q('2')->bar);var_dump($a->q('1')->foo ^ $a->q('2')->bar);var_dump($a->q('1')->foo == $a->q('2')->bar);var_dump($a->q('1')->foo === $a->q('2')->bar);var_dump($a->q('1')->foo != $a->q('2')->bar);var_dump($a->q('1')->foo !== $a->q('2')->bar);var_dump($a->q('1')->foo > $a->q('2')->bar);var_dump($a->q('1')->foo >= $a->q('2')->bar);var_dump($a->q('1')->foo < $a->q('2')->bar);var_dump($a->q('1')->foo <= $a->q('2')->bar);
\ No newline at end of file
+class A {
+  public $foo;
+  public $bar;
+  function q($a) {
+    echo $a;
+    $this->foo = 9;
+    $this->bar = '3';
+    return $this;
+  }
+}
+$a = new A();
+var_dump($a->q('1')->foo + $a->q('2')->bar);
+var_dump($a->q('1')->foo - $a->q('2')->bar);
+var_dump($a->q('1')->foo / $a->q('2')->bar);
+var_dump($a->q('1')->foo * $a->q('2')->bar);
+var_dump($a->q('1')->foo % $a->q('2')->bar);
+var_dump($a->q('1')->foo << $a->q('2')->bar);
+var_dump($a->q('1')->foo >> $a->q('2')->bar);
+var_dump($a->q('1')->foo && $a->q('2')->bar);
+var_dump($a->q('1')->foo || $a->q('2')->bar);
+var_dump($a->q('1')->foo and $a->q('2')->bar);
+var_dump($a->q('1')->foo or $a->q('2')->bar);
+var_dump($a->q('1')->foo xor $a->q('2')->bar);
+var_dump($a->q('1')->foo . $a->q('2')->bar);
+var_dump($a->q('1')->foo & $a->q('2')->bar);
+var_dump($a->q('1')->foo | $a->q('2')->bar);
+var_dump($a->q('1')->foo ^ $a->q('2')->bar);
+var_dump($a->q('1')->foo == $a->q('2')->bar);
+var_dump($a->q('1')->foo === $a->q('2')->bar);
+var_dump($a->q('1')->foo != $a->q('2')->bar);
+var_dump($a->q('1')->foo !== $a->q('2')->bar);
+var_dump($a->q('1')->foo > $a->q('2')->bar);
+var_dump($a->q('1')->foo >= $a->q('2')->bar);
+var_dump($a->q('1')->foo < $a->q('2')->bar);
+var_dump($a->q('1')->foo <= $a->q('2')->bar);
diff --git a/hphp/test/slow/eval_order/1506.php b/hphp/test/slow/eval_order/1506.php
index 2a6876eae..bfa19cf03 100644
--- a/hphp/test/slow/eval_order/1506.php
+++ b/hphp/test/slow/eval_order/1506.php
@@ -1,13 +1,61 @@
 <?php
 
- function x($a, $b, $c, $d) {}function p($x) { echo $x . "
-"; return $x; }class c {  function __construct($a, $b, $c, $d) {}  function f($a, $b, $c, $d) {}  static function g($a, $b, $c, $d) {}}function rt(&$a, $v) {  $a = $v;}function id($x) { return $x; }function dump($a, $b) {  var_dump($a, $b);}echo "sfc
-";x(p(1), p(2), p(3), 4);$y = 'x';echo "dfc
-";$y(p(1), p(2), p(3), 4);echo "smc
-";c::g(p(1), p(2), p(3), 4);$y = 'g';echo "dsmc
-";c::$y(p(1), p(2), p(3), 4);echo "occ
-";$q = new c(p(1), p(2), p(3), 4);echo "omc
-";$q->f(p(1), p(2), p(3), 4);echo "rsfc
-";rt($a, id(10));var_dump($a);dump($v++, $v++);$v = 10;dump($v, $v = 0);echo "nest
-";x(p(1), x(p(2), p(3), p(4), p(5)), p(6), x(p(7), p(8), p(9), p(10)));echo "arr
-";$z = array(p(1), p(2), x(p(3), p(4), p(5), p(6)), p(7));$q = 1;$z = array(1, 2, $q);
\ No newline at end of file
+function x($a, $b, $c, $d) {
+}
+function p($x) {
+ echo $x . "
+";
+ return $x;
+ }
+class c {
+  function __construct($a, $b, $c, $d) {
+}
+  function f($a, $b, $c, $d) {
+}
+  static function g($a, $b, $c, $d) {
+}
+}
+function rt(&$a, $v) {
+  $a = $v;
+}
+function id($x) {
+ return $x;
+ }
+function dump($a, $b) {
+  var_dump($a, $b);
+}
+echo "sfc
+";
+x(p(1), p(2), p(3), 4);
+$y = 'x';
+echo "dfc
+";
+$y(p(1), p(2), p(3), 4);
+echo "smc
+";
+c::g(p(1), p(2), p(3), 4);
+$y = 'g';
+echo "dsmc
+";
+c::$y(p(1), p(2), p(3), 4);
+echo "occ
+";
+$q = new c(p(1), p(2), p(3), 4);
+echo "omc
+";
+$q->f(p(1), p(2), p(3), 4);
+echo "rsfc
+";
+rt($a, id(10));
+var_dump($a);
+dump($v++, $v++);
+$v = 10;
+dump($v, $v = 0);
+echo "nest
+";
+x(p(1), x(p(2), p(3), p(4), p(5)), p(6), x(p(7), p(8), p(9), p(10)));
+echo "arr
+";
+$z = array(p(1), p(2), x(p(3), p(4), p(5), p(6)), p(7));
+$q = 1;
+$z = array(1, 2, $q);
diff --git a/hphp/test/slow/eval_order/1507.php b/hphp/test/slow/eval_order/1507.php
index 0a43f2ad8..452b0e0ec 100644
--- a/hphp/test/slow/eval_order/1507.php
+++ b/hphp/test/slow/eval_order/1507.php
@@ -1,4 +1,29 @@
 <?php
 
- error_reporting(E_ALL & ~E_NOTICE);function id($x,$y) { return $x; }function id1($x) { return $x; }function pid($x) { var_dump($x); return $x; }class cls {  function __construct() { print 'ctor
-'; }  function f($x) { return $this; }  function ttest() {    return $this->f(pid('arg1'),pid('arg2'));  }}$d = id1(new cls())  ->f('arg1')  ->f('arg2')  ->f('arg3');$d = id1(new cls())  ->f('arg1', 'argex1')  ->f('arg2', 'argex2')  ->f('arg3', 'argex3');$d = id(new cls(), pid('idarg'))  ->f(pid('arg1'), pid('argex1'))  ->f(pid('arg2'), pid('argex2'))  ->f(pid('arg3'), pid('argex3'));$d->ttest();
\ No newline at end of file
+error_reporting(E_ALL & ~E_NOTICE);
+function id($x,$y) {
+ return $x;
+ }
+function id1($x) {
+ return $x;
+ }
+function pid($x) {
+ var_dump($x);
+ return $x;
+ }
+class cls {
+  function __construct() {
+ print 'ctor
+';
+ }
+  function f($x) {
+ return $this;
+ }
+  function ttest() {
+    return $this->f(pid('arg1'),pid('arg2'));
+  }
+}
+$d = id1(new cls())  ->f('arg1')  ->f('arg2')  ->f('arg3');
+$d = id1(new cls())  ->f('arg1', 'argex1')  ->f('arg2', 'argex2')  ->f('arg3', 'argex3');
+$d = id(new cls(), pid('idarg'))  ->f(pid('arg1'), pid('argex1'))  ->f(pid('arg2'), pid('argex2'))  ->f(pid('arg3'), pid('argex3'));
+$d->ttest();
diff --git a/hphp/test/slow/eval_order/1508.php b/hphp/test/slow/eval_order/1508.php
index 8745e688b..b4c0c088e 100644
--- a/hphp/test/slow/eval_order/1508.php
+++ b/hphp/test/slow/eval_order/1508.php
@@ -1,3 +1,13 @@
 <?php
 
- class a {  function r(&$x) {    $x = 20;  }}function id($x) { return $x; }$a = new a();id($a)->r($x);var_dump($x);
\ No newline at end of file
+class a {
+  function r(&$x) {
+    $x = 20;
+  }
+}
+function id($x) {
+ return $x;
+ }
+$a = new a();
+id($a)->r($x);
+var_dump($x);
diff --git a/hphp/test/slow/eval_order/1509.php b/hphp/test/slow/eval_order/1509.php
index 704600f29..132aa394e 100644
--- a/hphp/test/slow/eval_order/1509.php
+++ b/hphp/test/slow/eval_order/1509.php
@@ -1,5 +1,16 @@
 <?php
 
- class c {  function x($y) {    echo $y . "
-";    return $this;  }}function p($x) {  echo $x . "
-";  return $x;}$x = new c;$x->x(3, p(1), p(2))->x(6, p(4), p(5));
\ No newline at end of file
+class c {
+  function x($y) {
+    echo $y . "
+";
+    return $this;
+  }
+}
+function p($x) {
+  echo $x . "
+";
+  return $x;
+}
+$x = new c;
+$x->x(3, p(1), p(2))->x(6, p(4), p(5));
diff --git a/hphp/test/slow/eval_order/1510.php b/hphp/test/slow/eval_order/1510.php
index 9e13e83a8..595180a05 100644
--- a/hphp/test/slow/eval_order/1510.php
+++ b/hphp/test/slow/eval_order/1510.php
@@ -1,3 +1,25 @@
 <?php
 
- class Q {  public $val;  function __construct($v) {    $this->val = $v;  }  public function blah() {    return $this;  }}class A {  public $v;  function set($v) {    $this->v = $v;    return $this;  }}function id($x) { return $x; }$x = new Q(0);$a = id(new A)->set($x);$x = id(new Q(1))->blah();var_dump($a);
\ No newline at end of file
+class Q {
+  public $val;
+  function __construct($v) {
+    $this->val = $v;
+  }
+  public function blah() {
+    return $this;
+  }
+}
+class A {
+  public $v;
+  function set($v) {
+    $this->v = $v;
+    return $this;
+  }
+}
+function id($x) {
+ return $x;
+ }
+$x = new Q(0);
+$a = id(new A)->set($x);
+$x = id(new Q(1))->blah();
+var_dump($a);
diff --git a/hphp/test/slow/eval_order/1511.php b/hphp/test/slow/eval_order/1511.php
index 1fe8591c7..ad08d4c76 100644
--- a/hphp/test/slow/eval_order/1511.php
+++ b/hphp/test/slow/eval_order/1511.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(array($id = 1, $id), array($id = 2, $id));var_dump($a);$a = array(+($id = 1), $id, -($id = 2), $id,            !($id = 3), $id, ~($id = 4), $id,            isset($a[$id = 5]), $id);var_dump($a);
\ No newline at end of file
+$a = array(array($id = 1, $id), array($id = 2, $id));
+var_dump($a);
+$a = array(+($id = 1), $id, -($id = 2), $id,            !($id = 3), $id, ~($id = 4), $id,            isset($a[$id = 5]), $id);
+var_dump($a);
diff --git a/hphp/test/slow/eval_order/1512.php b/hphp/test/slow/eval_order/1512.php
index 245383cbf..bfeff2cc0 100644
--- a/hphp/test/slow/eval_order/1512.php
+++ b/hphp/test/slow/eval_order/1512.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($a){  echo "$a\n";}test(1, test(2), test(3, test(4), test(5)));
\ No newline at end of file
+function test($a){
+  echo "$a\n";
+}
+test(1, test(2), test(3, test(4), test(5)));
diff --git a/hphp/test/slow/eval_order/1513.php b/hphp/test/slow/eval_order/1513.php
index 3dbfda7e9..74c9eeced 100644
--- a/hphp/test/slow/eval_order/1513.php
+++ b/hphp/test/slow/eval_order/1513.php
@@ -1,3 +1,12 @@
 <?php
 
- $v = 1;function foo($a, $b, $c) {  var_dump($a, $b, $c);}function bar($a) {  foo($a, $a++, $a);  $arr = array($a, $a++, $a);  var_dump($arr);}bar($v);
\ No newline at end of file
+$v = 1;
+function foo($a, $b, $c) {
+  var_dump($a, $b, $c);
+}
+function bar($a) {
+  foo($a, $a++, $a);
+  $arr = array($a, $a++, $a);
+  var_dump($arr);
+}
+bar($v);
diff --git a/hphp/test/slow/eval_order/1514.php b/hphp/test/slow/eval_order/1514.php
index 1ba4d6416..bbdd599a9 100644
--- a/hphp/test/slow/eval_order/1514.php
+++ b/hphp/test/slow/eval_order/1514.php
@@ -1,3 +1,113 @@
 <?php
 
- $GLOBALS['t'] = 0;$GLOBALS['f'] = 0;$GLOBALS['i'] = 0;$GLOBALS['d'] = 0;$GLOBALS['v'] = 'a';function t() {  global $t;  $t++;  return true;}function f() {  global $f;  $f++;  return false;}function i() {  global $i;  $i++;  return 1;}function d() {  global $d;  $d++;  return 3.14;}function v() {  global $v;  $v++;  return $v;}function foo() {  var_dump(t() + t());  var_dump(t() + f());  var_dump(t() + i());  var_dump(t() + d());  var_dump(t() + v());  var_dump(f() + t());  var_dump(f() + f());  var_dump(f() + i());  var_dump(f() + d());  var_dump(f() + v());  var_dump(i() + t());  var_dump(i() + f());  var_dump(i() + i());  var_dump(i() + d());  var_dump(i() + v());  var_dump(d() + t());  var_dump(d() + f());  var_dump(d() + i());  var_dump(d() + d());  var_dump(d() + v());  var_dump(v() + t());  var_dump(v() + f());  var_dump(v() + i());  var_dump(v() + d());  var_dump(v() + v());  var_dump($GLOBALS['t'], $GLOBALS['f'],           $GLOBALS['i'], $GLOBALS['d'],           $GLOBALS['v']);  var_dump(t() - t());  var_dump(t() - f());  var_dump(t() - i());  var_dump(t() - d());  var_dump(t() - v());  var_dump(f() - t());  var_dump(f() - f());  var_dump(f() - i());  var_dump(f() - d());  var_dump(f() - v());  var_dump(i() - t());  var_dump(i() - f());  var_dump(i() - i());  var_dump(i() - d());  var_dump(i() - v());  var_dump(d() - t());  var_dump(d() - f());  var_dump(d() - i());  var_dump(d() - d());  var_dump(d() - v());  var_dump(v() - t());  var_dump(v() - f());  var_dump(v() - i());  var_dump(v() - d());  var_dump(v() - v());  var_dump($GLOBALS['t'], $GLOBALS['f'],           $GLOBALS['i'], $GLOBALS['d'],           $GLOBALS['v']);  var_dump(t() * t());  var_dump(t() * f());  var_dump(t() * i());  var_dump(t() * d());  var_dump(t() * v());  var_dump(f() * t());  var_dump(f() * f());  var_dump(f() * i());  var_dump(f() * d());  var_dump(f() * v());  var_dump(i() * t());  var_dump(i() * f());  var_dump(i() * i());  var_dump(i() * d());  var_dump(i() * v());  var_dump(d() * t());  var_dump(d() * f());  var_dump(d() * i());  var_dump(d() * d());  var_dump(d() * v());  var_dump(v() * t());  var_dump(v() * f());  var_dump(v() * i());  var_dump(v() * d());  var_dump(v() * v());  var_dump($GLOBALS['t'], $GLOBALS['f'],           $GLOBALS['i'], $GLOBALS['d'],           $GLOBALS['v']);}foo();
\ No newline at end of file
+$GLOBALS['t'] = 0;
+$GLOBALS['f'] = 0;
+$GLOBALS['i'] = 0;
+$GLOBALS['d'] = 0;
+$GLOBALS['v'] = 'a';
+function t() {
+  global $t;
+  $t++;
+  return true;
+}
+function f() {
+  global $f;
+  $f++;
+  return false;
+}
+function i() {
+  global $i;
+  $i++;
+  return 1;
+}
+function d() {
+  global $d;
+  $d++;
+  return 3.14;
+}
+function v() {
+  global $v;
+  $v++;
+  return $v;
+}
+function foo() {
+  var_dump(t() + t());
+  var_dump(t() + f());
+  var_dump(t() + i());
+  var_dump(t() + d());
+  var_dump(t() + v());
+  var_dump(f() + t());
+  var_dump(f() + f());
+  var_dump(f() + i());
+  var_dump(f() + d());
+  var_dump(f() + v());
+  var_dump(i() + t());
+  var_dump(i() + f());
+  var_dump(i() + i());
+  var_dump(i() + d());
+  var_dump(i() + v());
+  var_dump(d() + t());
+  var_dump(d() + f());
+  var_dump(d() + i());
+  var_dump(d() + d());
+  var_dump(d() + v());
+  var_dump(v() + t());
+  var_dump(v() + f());
+  var_dump(v() + i());
+  var_dump(v() + d());
+  var_dump(v() + v());
+  var_dump($GLOBALS['t'], $GLOBALS['f'],           $GLOBALS['i'], $GLOBALS['d'],           $GLOBALS['v']);
+  var_dump(t() - t());
+  var_dump(t() - f());
+  var_dump(t() - i());
+  var_dump(t() - d());
+  var_dump(t() - v());
+  var_dump(f() - t());
+  var_dump(f() - f());
+  var_dump(f() - i());
+  var_dump(f() - d());
+  var_dump(f() - v());
+  var_dump(i() - t());
+  var_dump(i() - f());
+  var_dump(i() - i());
+  var_dump(i() - d());
+  var_dump(i() - v());
+  var_dump(d() - t());
+  var_dump(d() - f());
+  var_dump(d() - i());
+  var_dump(d() - d());
+  var_dump(d() - v());
+  var_dump(v() - t());
+  var_dump(v() - f());
+  var_dump(v() - i());
+  var_dump(v() - d());
+  var_dump(v() - v());
+  var_dump($GLOBALS['t'], $GLOBALS['f'],           $GLOBALS['i'], $GLOBALS['d'],           $GLOBALS['v']);
+  var_dump(t() * t());
+  var_dump(t() * f());
+  var_dump(t() * i());
+  var_dump(t() * d());
+  var_dump(t() * v());
+  var_dump(f() * t());
+  var_dump(f() * f());
+  var_dump(f() * i());
+  var_dump(f() * d());
+  var_dump(f() * v());
+  var_dump(i() * t());
+  var_dump(i() * f());
+  var_dump(i() * i());
+  var_dump(i() * d());
+  var_dump(i() * v());
+  var_dump(d() * t());
+  var_dump(d() * f());
+  var_dump(d() * i());
+  var_dump(d() * d());
+  var_dump(d() * v());
+  var_dump(v() * t());
+  var_dump(v() * f());
+  var_dump(v() * i());
+  var_dump(v() * d());
+  var_dump(v() * v());
+  var_dump($GLOBALS['t'], $GLOBALS['f'],           $GLOBALS['i'], $GLOBALS['d'],           $GLOBALS['v']);
+}
+foo();
diff --git a/hphp/test/slow/eval_order/1515.php b/hphp/test/slow/eval_order/1515.php
index 1bec4bfa1..3545d9565 100644
--- a/hphp/test/slow/eval_order/1515.php
+++ b/hphp/test/slow/eval_order/1515.php
@@ -1,3 +1,10 @@
 <?php
 
- function f($a) { echo "test$a\n"; return 1; }function bug2($a, $b) {  return isset($b[f($a++)], $b[f($a++)], $b[f($a++)]);}bug2(0, array());
\ No newline at end of file
+function f($a) {
+ echo "test$a\n";
+ return 1;
+ }
+function bug2($a, $b) {
+  return isset($b[f($a++)], $b[f($a++)], $b[f($a++)]);
+}
+bug2(0, array());
diff --git a/hphp/test/slow/eval_order/1516.php b/hphp/test/slow/eval_order/1516.php
index 8f41477a9..7ed0ac5c0 100644
--- a/hphp/test/slow/eval_order/1516.php
+++ b/hphp/test/slow/eval_order/1516.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump($v++, $v++);
\ No newline at end of file
+var_dump($v++, $v++);
diff --git a/hphp/test/slow/eval_order/1517.php b/hphp/test/slow/eval_order/1517.php
index d088f34bd..fb4dfab29 100644
--- a/hphp/test/slow/eval_order/1517.php
+++ b/hphp/test/slow/eval_order/1517.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump($v, $v = 0);
\ No newline at end of file
+var_dump($v, $v = 0);
diff --git a/hphp/test/slow/eval_order/1518.php b/hphp/test/slow/eval_order/1518.php
index 320bd097d..c6d4878c0 100644
--- a/hphp/test/slow/eval_order/1518.php
+++ b/hphp/test/slow/eval_order/1518.php
@@ -1,11 +1,21 @@
 <?php
 
-
-function f(&$a, &$b) { $a = 1; $b = 2; return 3; }
-class A { }
+function f(&$a, &$b) {
+ $a = 1;
+ $b = 2;
+ return 3;
+ }
+class A {
+ }
 function test() {
-  $a = array(); f($a[0], $a[1]); var_dump($a);
-  $a = array(); $a[0] = f($a[1], $a[2]); var_dump($a);
-  $a = new A(); f($a->f, $a->g); var_dump($a);
+  $a = array();
+ f($a[0], $a[1]);
+ var_dump($a);
+  $a = array();
+ $a[0] = f($a[1], $a[2]);
+ var_dump($a);
+  $a = new A();
+ f($a->f, $a->g);
+ var_dump($a);
 }
 test();
diff --git a/hphp/test/slow/eval_order/1519.php b/hphp/test/slow/eval_order/1519.php
index 6a95ab9b0..d5a62ce47 100644
--- a/hphp/test/slow/eval_order/1519.php
+++ b/hphp/test/slow/eval_order/1519.php
@@ -1,3 +1,27 @@
 <?php
 
- class C {  function __construct() {    echo "class C\n";  }  public function __get( $what ) {    echo "get C\n";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C\n";    $this->_p[ $what ] = $value;  }  private $_p = array();}function f() {  echo "f()\n";  return 1;}function foo() {  $obj = new C;  $obj->a = f();  $obj->b = new C;  $obj->b->a = f();}foo();
\ No newline at end of file
+class C {
+  function __construct() {
+    echo "class C\n";
+  }
+  public function __get( $what ) {
+    echo "get C\n";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C\n";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+function f() {
+  echo "f()\n";
+  return 1;
+}
+function foo() {
+  $obj = new C;
+  $obj->a = f();
+  $obj->b = new C;
+  $obj->b->a = f();
+}
+foo();
diff --git a/hphp/test/slow/eval_order/1520.php b/hphp/test/slow/eval_order/1520.php
index 622e2fa3f..f98f9d415 100644
--- a/hphp/test/slow/eval_order/1520.php
+++ b/hphp/test/slow/eval_order/1520.php
@@ -1,3 +1,38 @@
 <?php
 
- class C implements ArrayAccess {  private $data = array();  public function __construct() {    echo "C\n";  }  public function offsetGet($name) {    echo "offsetGet: $name\n";    return $this->data[$name];  }  public function offsetSet($name, $value) {    $a = serialize($value);    echo "offsetSet: $name=$a\n";    $this->data[$name]=$value;  }  public function offsetExists($name) {    echo "offsetExists: $name\n"; return true;  }  public function offsetUnset($name) {    echo "offsetUnset: $name\n";  }}function f() {  echo "f()\n";  return 1;}function f2() {  echo "f2()\n";  return 'foo';}function foo($a) {  $a['foo'] = new C;  $a['foo']['bar'] = new C;  $a['foo']['bar']['goo'] = f();}foo(new C);
\ No newline at end of file
+class C implements ArrayAccess {
+  private $data = array();
+  public function __construct() {
+    echo "C\n";
+  }
+  public function offsetGet($name) {
+    echo "offsetGet: $name\n";
+    return $this->data[$name];
+  }
+  public function offsetSet($name, $value) {
+    $a = serialize($value);
+    echo "offsetSet: $name=$a\n";
+    $this->data[$name]=$value;
+  }
+  public function offsetExists($name) {
+    echo "offsetExists: $name\n";
+ return true;
+  }
+  public function offsetUnset($name) {
+    echo "offsetUnset: $name\n";
+  }
+}
+function f() {
+  echo "f()\n";
+  return 1;
+}
+function f2() {
+  echo "f2()\n";
+  return 'foo';
+}
+function foo($a) {
+  $a['foo'] = new C;
+  $a['foo']['bar'] = new C;
+  $a['foo']['bar']['goo'] = f();
+}
+foo(new C);
diff --git a/hphp/test/slow/eval_order/1521.php b/hphp/test/slow/eval_order/1521.php
index 5fcc97bd0..b429ad1a7 100644
--- a/hphp/test/slow/eval_order/1521.php
+++ b/hphp/test/slow/eval_order/1521.php
@@ -1,3 +1,16 @@
 <?php
 
- class X {  function __destruct() { var_dump('done'); }}function f() {  $x = new X;}function g() {  var_dump('start');  f();  var_dump('end');}g();
\ No newline at end of file
+class X {
+  function __destruct() {
+ var_dump('done');
+ }
+}
+function f() {
+  $x = new X;
+}
+function g() {
+  var_dump('start');
+  f();
+  var_dump('end');
+}
+g();
diff --git a/hphp/test/slow/eval_order/1522.php b/hphp/test/slow/eval_order/1522.php
index a9d4ecb27..246f1ca7a 100644
--- a/hphp/test/slow/eval_order/1522.php
+++ b/hphp/test/slow/eval_order/1522.php
@@ -1,3 +1,12 @@
 <?php
 
- function foo($v) {  $a = array('key' => &$v);  return $a;}function goo($v) {  return $v . 1;}var_dump(foo('1.0'));var_dump(foo(foo('1.0')));var_dump(foo(goo('1.0')));
\ No newline at end of file
+function foo($v) {
+  $a = array('key' => &$v);
+  return $a;
+}
+function goo($v) {
+  return $v . 1;
+}
+var_dump(foo('1.0'));
+var_dump(foo(foo('1.0')));
+var_dump(foo(goo('1.0')));
diff --git a/hphp/test/slow/eval_order/1523.php b/hphp/test/slow/eval_order/1523.php
index b4c763490..97d5c10d7 100644
--- a/hphp/test/slow/eval_order/1523.php
+++ b/hphp/test/slow/eval_order/1523.php
@@ -1,3 +1,83 @@
 <?php
 
- function f(&$a, $v = 5) {  $a = $v;  return 0;}$a = 2;var_dump($a . f($a));$a = 2;var_dump(($a.'') . f($a));$a = 2;var_dump(($a.$a) . f($a));f($a,2);var_dump($a . f($a));f($a,2);var_dump(($a.'') . f($a));f($a,2);var_dump(($a.$a) . f($a));class c {  public static $a;}c::$a = 2;var_dump(c::$a . f(c::$a));function g(&$a) {  $a[0] = 5;  return 0;}$a = array(2);var_dump($a[0] . g($a));$a = array(2);var_dump(($a[0] . '') . g($a));function h(&$a) {  $a = 5;  return 0;}$a = array(2);var_dump($a[0] . h($a[0]));$a = array(2);var_dump(($a[0] . '') . h($a[0]));function k($a) {  $a->prop = 5;  return 0;}$a = new stdclass;$a->prop = 2;var_dump($a->prop . k($a));$a = new stdclass;$a->prop = 2;var_dump(($a->prop . '') . k($a));$i = 0;var_dump($i . ++$i);$i = 0;var_dump(($i . '') . ++$i);function foo() {  return 'foo';}f($a, 'test');var_dump(($a . 'x') . foo($a = ''));$a = array(2);var_dump($a[$a = 0]);$a = new stdclass;$a->foo = 42;var_dump($a->{$a = 'foo'});var_dump($a);$b = new stdclass;$a = null;$a->{f($a,$b)} = 5;var_dump($a, $b);function dump($a, $b) {  var_dump($a, $b);}f($a, 'foo');dump($a, $a = 'bar');$a = 'foo';dump($a, $a = 'bar');f($a, 'foo');dump($a.'', $a = 'bar');f($a, 'foo');dump($a.$a, $a = 'bar');
\ No newline at end of file
+function f(&$a, $v = 5) {
+  $a = $v;
+  return 0;
+}
+$a = 2;
+var_dump($a . f($a));
+$a = 2;
+var_dump(($a.'') . f($a));
+$a = 2;
+var_dump(($a.$a) . f($a));
+f($a,2);
+var_dump($a . f($a));
+f($a,2);
+var_dump(($a.'') . f($a));
+f($a,2);
+var_dump(($a.$a) . f($a));
+class c {
+  public static $a;
+}
+c::$a = 2;
+var_dump(c::$a . f(c::$a));
+function g(&$a) {
+  $a[0] = 5;
+  return 0;
+}
+$a = array(2);
+var_dump($a[0] . g($a));
+$a = array(2);
+var_dump(($a[0] . '') . g($a));
+function h(&$a) {
+  $a = 5;
+  return 0;
+}
+$a = array(2);
+var_dump($a[0] . h($a[0]));
+$a = array(2);
+var_dump(($a[0] . '') . h($a[0]));
+function k($a) {
+  $a->prop = 5;
+  return 0;
+}
+$a = new stdclass;
+$a->prop = 2;
+var_dump($a->prop . k($a));
+$a = new stdclass;
+$a->prop = 2;
+var_dump(($a->prop . '') . k($a));
+$i = 0;
+var_dump($i . ++$i);
+$i = 0;
+var_dump(($i . '') . ++$i);
+function foo() {
+  return 'foo';
+}
+f($a, 'test');
+var_dump(($a . 'x') . foo($a = ''));
+$a = array(2);
+var_dump($a[$a = 0]);
+$a = new stdclass;
+$a->foo = 42;
+var_dump($a->{
+$a = 'foo'}
+);
+var_dump($a);
+$b = new stdclass;
+$a = null;
+$a->{
+f($a,$b)}
+ = 5;
+var_dump($a, $b);
+function dump($a, $b) {
+  var_dump($a, $b);
+}
+f($a, 'foo');
+dump($a, $a = 'bar');
+$a = 'foo';
+dump($a, $a = 'bar');
+f($a, 'foo');
+dump($a.'', $a = 'bar');
+f($a, 'foo');
+dump($a.$a, $a = 'bar');
diff --git a/hphp/test/slow/eval_order/1524.php b/hphp/test/slow/eval_order/1524.php
index 637a121cb..48ea1c21a 100644
--- a/hphp/test/slow/eval_order/1524.php
+++ b/hphp/test/slow/eval_order/1524.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = Array(1,2,3); $b = Array(4,5,6); $i = 1; $a[$i++] = $b[$i++]; var_dump($a);
\ No newline at end of file
+$a = Array(1,2,3);
+ $b = Array(4,5,6);
+ $i = 1;
+ $a[$i++] = $b[$i++];
+ var_dump($a);
diff --git a/hphp/test/slow/eval_order/1525.php b/hphp/test/slow/eval_order/1525.php
index 4d1a93138..aa0ccdafe 100644
--- a/hphp/test/slow/eval_order/1525.php
+++ b/hphp/test/slow/eval_order/1525.php
@@ -1,3 +1,53 @@
 <?php
 
- function f($x) {  global $a;  var_dump($x, $a);  return $x;}class X implements ArrayAccess {  function OffsetGet($n) {    echo 'get:'; var_dump($n);    return (string)(int)$n == (string)$n ? $this : $n;  }  function OffsetSet($n, $v) {    $this->{$n} = $v;    echo 'set:'; var_dump($n, $v);  }  function OffsetExists($n) { return $n == 'foo'; }  function OffsetUnset($n) {}  function __get($n) { return $this->OffsetGet($n); }  function __set($n,$v) { return $this->OffsetSet($n, $v); }}$a = new X;function ref(&$a, &$b, &$c) {}function test() {  global $a;  $a[f(0)]->{f(1)}[f(2)] = $a[f(3)][f(4)][f(5)]->foo;  var_dump($a[f(6)]['fuz'] . f(7));  ref($a[f(10)][f(11)][f(12)],$a[f(20)][f(21)][f(22)],      $a[f(30)][f(31)][f(32)]);  $a->{f(0)}[f(1)]->{f(2)} = $a->{f(3)}->{f(4)}->bar;}test();
\ No newline at end of file
+function f($x) {
+  global $a;
+  var_dump($x, $a);
+  return $x;
+}
+class X implements ArrayAccess {
+  function OffsetGet($n) {
+    echo 'get:';
+ var_dump($n);
+    return (string)(int)$n == (string)$n ? $this : $n;
+  }
+  function OffsetSet($n, $v) {
+    $this->{
+$n}
+ = $v;
+    echo 'set:';
+ var_dump($n, $v);
+  }
+  function OffsetExists($n) {
+ return $n == 'foo';
+ }
+  function OffsetUnset($n) {
+}
+  function __get($n) {
+ return $this->OffsetGet($n);
+ }
+  function __set($n,$v) {
+ return $this->OffsetSet($n, $v);
+ }
+}
+$a = new X;
+function ref(&$a, &$b, &$c) {
+}
+function test() {
+  global $a;
+  $a[f(0)]->{
+f(1)}
+[f(2)] = $a[f(3)][f(4)][f(5)]->foo;
+  var_dump($a[f(6)]['fuz'] . f(7));
+  ref($a[f(10)][f(11)][f(12)],$a[f(20)][f(21)][f(22)],      $a[f(30)][f(31)][f(32)]);
+  $a->{
+f(0)}
+[f(1)]->{
+f(2)}
+ = $a->{
+f(3)}
+->{
+f(4)}
+->bar;
+}
+test();
diff --git a/hphp/test/slow/eval_order/1526.php b/hphp/test/slow/eval_order/1526.php
index 4d563d739..e3f8dbf55 100644
--- a/hphp/test/slow/eval_order/1526.php
+++ b/hphp/test/slow/eval_order/1526.php
@@ -1,3 +1,17 @@
 <?php
 
- class X { function foo($a) { echo 'In foo:'; var_dump($a); } }function y($y) { echo 'In y:'; var_dump($y); }function test($x, $y) {  $x->foo($x = null);  $y($y = null);}test(new X, 'y');
\ No newline at end of file
+class X {
+ function foo($a) {
+ echo 'In foo:';
+ var_dump($a);
+ }
+ }
+function y($y) {
+ echo 'In y:';
+ var_dump($y);
+ }
+function test($x, $y) {
+  $x->foo($x = null);
+  $y($y = null);
+}
+test(new X, 'y');
diff --git a/hphp/test/slow/eval_order/1527.php b/hphp/test/slow/eval_order/1527.php
index ae0d067ac..dbbeebe47 100644
--- a/hphp/test/slow/eval_order/1527.php
+++ b/hphp/test/slow/eval_order/1527.php
@@ -1,3 +1,7 @@
 <?php
 
- function f() { global $a; return ++$a; }var_dump(array($a,f(),$a));
\ No newline at end of file
+function f() {
+ global $a;
+ return ++$a;
+ }
+var_dump(array($a,f(),$a));
diff --git a/hphp/test/slow/eval_order/1528.php b/hphp/test/slow/eval_order/1528.php
index dcbb01117..aa4130804 100644
--- a/hphp/test/slow/eval_order/1528.php
+++ b/hphp/test/slow/eval_order/1528.php
@@ -1,3 +1,38 @@
 <?php
 
- function foo() {  global $a;  $a = 1;}$a = 'a'; $r = ++$a . $a; var_dump($r);$a = 'a'; $r = $a++ . $a; var_dump($r);$a = 'a'; $r = $a . ++$a; var_dump($r);$a = 'a'; $r = $a . $a++; var_dump($r);$a = 'a'; $r = ++$a . ++$a; var_dump($r);$a = 'a'; $r = ++$a . $a++; var_dump($r);$a = 'a'; $r = $a++ . ++$a; var_dump($r);$a = 'a'; $r = $a++ . $a++; var_dump($r);$a = 'a'; $b = 'b'; $r = $a . foo() . $b; var_dump($r);$a = 'a'; $b = 'b'; $r = $a . (foo() . $b); var_dump($r);
\ No newline at end of file
+function foo() {
+  global $a;
+  $a = 1;
+}
+$a = 'a';
+ $r = ++$a . $a;
+ var_dump($r);
+$a = 'a';
+ $r = $a++ . $a;
+ var_dump($r);
+$a = 'a';
+ $r = $a . ++$a;
+ var_dump($r);
+$a = 'a';
+ $r = $a . $a++;
+ var_dump($r);
+$a = 'a';
+ $r = ++$a . ++$a;
+ var_dump($r);
+$a = 'a';
+ $r = ++$a . $a++;
+ var_dump($r);
+$a = 'a';
+ $r = $a++ . ++$a;
+ var_dump($r);
+$a = 'a';
+ $r = $a++ . $a++;
+ var_dump($r);
+$a = 'a';
+ $b = 'b';
+ $r = $a . foo() . $b;
+ var_dump($r);
+$a = 'a';
+ $b = 'b';
+ $r = $a . (foo() . $b);
+ var_dump($r);
diff --git a/hphp/test/slow/eval_order/1529.php b/hphp/test/slow/eval_order/1529.php
index 453e21d74..9c2d1d751 100644
--- a/hphp/test/slow/eval_order/1529.php
+++ b/hphp/test/slow/eval_order/1529.php
@@ -1,3 +1,7 @@
 <?php
 
- function test($x) {  $a = array($a => $x[$a = 'foo']);  return $a;}var_dump(test(array('foo' => 5)));
\ No newline at end of file
+function test($x) {
+  $a = array($a => $x[$a = 'foo']);
+  return $a;
+}
+var_dump(test(array('foo' => 5)));
diff --git a/hphp/test/slow/eval_order/1530.php b/hphp/test/slow/eval_order/1530.php
index 73257c08f..7f8c76742 100644
--- a/hphp/test/slow/eval_order/1530.php
+++ b/hphp/test/slow/eval_order/1530.php
@@ -1,3 +1,12 @@
 <?php
 
- interface I {}function __autoload($c) {  var_dump($c);  class A implements I {}}var_dump(class_implements("A", false));var_dump(class_implements("A"));var_dump(class_exists("A"));
\ No newline at end of file
+interface I {
+}
+function __autoload($c) {
+  var_dump($c);
+  class A implements I {
+}
+}
+var_dump(class_implements("A", false));
+var_dump(class_implements("A"));
+var_dump(class_exists("A"));
diff --git a/hphp/test/slow/eval_order/1531.php b/hphp/test/slow/eval_order/1531.php
index 43aee2108..acb069439 100644
--- a/hphp/test/slow/eval_order/1531.php
+++ b/hphp/test/slow/eval_order/1531.php
@@ -1,3 +1,12 @@
 <?php
 
- class B {}function __autoload($c) {  var_dump($c);  class A extends B {}}var_dump(class_parents("A", false));var_dump(class_parents("A"));var_dump(class_exists("A"));
\ No newline at end of file
+class B {
+}
+function __autoload($c) {
+  var_dump($c);
+  class A extends B {
+}
+}
+var_dump(class_parents("A", false));
+var_dump(class_parents("A"));
+var_dump(class_exists("A"));
diff --git a/hphp/test/slow/eval_order/1532.php b/hphp/test/slow/eval_order/1532.php
index 817b3f230..7eb5efb82 100644
--- a/hphp/test/slow/eval_order/1532.php
+++ b/hphp/test/slow/eval_order/1532.php
@@ -1,3 +1,13 @@
 <?php
 
- trait T {}function __autoload($c) {  var_dump($c);  class A { use T; }}var_dump(class_uses("A", false));var_dump(class_uses("A"));var_dump(class_exists("A"));
\ No newline at end of file
+trait T {
+}
+function __autoload($c) {
+  var_dump($c);
+  class A {
+ use T;
+ }
+}
+var_dump(class_uses("A", false));
+var_dump(class_uses("A"));
+var_dump(class_exists("A"));
diff --git a/hphp/test/slow/exceptions/51.php b/hphp/test/slow/exceptions/51.php
index 1211f5ff2..0578af207 100644
--- a/hphp/test/slow/exceptions/51.php
+++ b/hphp/test/slow/exceptions/51.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class MyException extends Exception {
   public function __construct() {
   }
@@ -10,8 +9,10 @@ function thrower() {
 }
 try {
   thrower();
-} catch (Exception $exn) {
-  $a = $exn->getTrace(); foreach ($a as &$b) $b['file'] = 'string';
+}
+ catch (Exception $exn) {
+  $a = $exn->getTrace();
+ foreach ($a as &$b) $b['file'] = 'string';
   var_dump($a);
   var_dump($exn->getLine());
 }
diff --git a/hphp/test/slow/exceptions/51.php.expect b/hphp/test/slow/exceptions/51.php.expect
index 1b183a496..0a95f040c 100644
--- a/hphp/test/slow/exceptions/51.php.expect
+++ b/hphp/test/slow/exceptions/51.php.expect
@@ -4,7 +4,7 @@ array(1) {
     ["file"]=>
     string(6) "string"
     ["line"]=>
-    int(12)
+    int(11)
     ["function"]=>
     string(7) "thrower"
     ["args"]=>
@@ -12,4 +12,4 @@ array(1) {
     }
   }
 }
-int(9)
+int(8)
diff --git a/hphp/test/slow/exceptions/52.php b/hphp/test/slow/exceptions/52.php
index ed0be2a19..e85ff6b8e 100644
--- a/hphp/test/slow/exceptions/52.php
+++ b/hphp/test/slow/exceptions/52.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 class Exception1 extends Exception {
   public function __Construct() {
     parent::__construct();
@@ -21,8 +19,10 @@ function foo() {
 function bar() {
   try {
     foo();
-  } catch (Exception $exn) {
-    $a = $exn->getTrace(); foreach ($a as &$b) $b['file'] = 'string';
+  }
+ catch (Exception $exn) {
+    $a = $exn->getTrace();
+ foreach ($a as &$b) $b['file'] = 'string';
     var_dump($a);
     var_dump($exn->getLine());
   }
diff --git a/hphp/test/slow/exceptions/52.php.expect b/hphp/test/slow/exceptions/52.php.expect
index 21c8efafa..bb0fc113c 100644
--- a/hphp/test/slow/exceptions/52.php.expect
+++ b/hphp/test/slow/exceptions/52.php.expect
@@ -4,7 +4,7 @@ array(2) {
     ["file"]=>
     string(6) "string"
     ["line"]=>
-    int(23)
+    int(21)
     ["function"]=>
     string(3) "foo"
     ["args"]=>
@@ -24,4 +24,4 @@ array(2) {
     }
   }
 }
-int(18)
+int(16)
diff --git a/hphp/test/slow/exceptions/53.php b/hphp/test/slow/exceptions/53.php
index ef7e336a7..cf8950668 100644
--- a/hphp/test/slow/exceptions/53.php
+++ b/hphp/test/slow/exceptions/53.php
@@ -1,3 +1,7 @@
 <?php
 
- try { throw new Exception('test');} catch (Exception $e) {}
\ No newline at end of file
+try {
+ throw new Exception('test');
+}
+ catch (Exception $e) {
+}
diff --git a/hphp/test/slow/exceptions/54.php b/hphp/test/slow/exceptions/54.php
index 7372192e2..1707592c2 100644
--- a/hphp/test/slow/exceptions/54.php
+++ b/hphp/test/slow/exceptions/54.php
@@ -1,3 +1,12 @@
 <?php
 
- try { try { throw new Exception('test');} catch (InvalidArgumentException $e) {} } catch (Exception $e) { print 'ok';}
\ No newline at end of file
+try {
+ try {
+ throw new Exception('test');
+}
+ catch (InvalidArgumentException $e) {
+}
+ }
+ catch (Exception $e) {
+ print 'ok';
+}
diff --git a/hphp/test/slow/exceptions/55.php b/hphp/test/slow/exceptions/55.php
index f2d502218..b9553190e 100644
--- a/hphp/test/slow/exceptions/55.php
+++ b/hphp/test/slow/exceptions/55.php
@@ -1,3 +1,10 @@
 <?php
 
- class E extends Exception {} try { throw new E(); } catch (E $e) { print 'ok';}
\ No newline at end of file
+class E extends Exception {
+}
+ try {
+ throw new E();
+ }
+ catch (E $e) {
+ print 'ok';
+}
diff --git a/hphp/test/slow/exceptions/56.php b/hphp/test/slow/exceptions/56.php
index bf6b7623f..0385db0a9 100644
--- a/hphp/test/slow/exceptions/56.php
+++ b/hphp/test/slow/exceptions/56.php
@@ -1,3 +1,12 @@
 <?php
 
- class E extends Exception {} class F extends E {}try { throw new F(); } catch (E $e) { print 'ok';}
\ No newline at end of file
+class E extends Exception {
+}
+ class F extends E {
+}
+try {
+ throw new F();
+ }
+ catch (E $e) {
+ print 'ok';
+}
diff --git a/hphp/test/slow/exceptions/57.php b/hphp/test/slow/exceptions/57.php
index 62a0bd75d..5ab60b8f3 100644
--- a/hphp/test/slow/exceptions/57.php
+++ b/hphp/test/slow/exceptions/57.php
@@ -1,3 +1,18 @@
 <?php
 
- class E extends Exception { function __toString(){ return 'E';}} class F extends E { function __toString() { return 'F';}}try { throw new F(); } catch (E $e) { print $e;}
\ No newline at end of file
+class E extends Exception {
+ function __toString(){
+ return 'E';
+}
+}
+ class F extends E {
+ function __toString() {
+ return 'F';
+}
+}
+try {
+ throw new F();
+ }
+ catch (E $e) {
+ print $e;
+}
diff --git a/hphp/test/slow/exceptions/58.php b/hphp/test/slow/exceptions/58.php
index e20a89993..9e9dbc8e0 100644
--- a/hphp/test/slow/exceptions/58.php
+++ b/hphp/test/slow/exceptions/58.php
@@ -1,3 +1,19 @@
 <?php
 
- class a extends Exception {  function __destruct() {    var_dump('__destruct');  }};function foo() {  $ex = null;  try {    throw new A;  } catch (Exception $ex) {    var_dump(1);  }  var_dump(2);}foo();
\ No newline at end of file
+class a extends Exception {
+  function __destruct() {
+    var_dump('__destruct');
+  }
+}
+;
+function foo() {
+  $ex = null;
+  try {
+    throw new A;
+  }
+ catch (Exception $ex) {
+    var_dump(1);
+  }
+  var_dump(2);
+}
+foo();
diff --git a/hphp/test/slow/exceptions/59.php b/hphp/test/slow/exceptions/59.php
index 4a567716f..9d19f7b6d 100644
--- a/hphp/test/slow/exceptions/59.php
+++ b/hphp/test/slow/exceptions/59.php
@@ -1,3 +1,17 @@
 <?php
 
- function foo($a, $b) { return $a + $b; }function myErrorHandler($errno, $errstr, $errfile, $errline) {  var_dump($errstr, $errline);}$old_error_handler = set_error_handler('myErrorHandler');function bar($a, $b) {  if ($a) {    $value = $a * foo(1, 2);  }  return 1 / $b;}set_error_handler('myErrorHandler');$r = bar(1, 0);
\ No newline at end of file
+function foo($a, $b) {
+ return $a + $b;
+ }
+function myErrorHandler($errno, $errstr, $errfile, $errline) {
+  var_dump($errstr, $errline);
+}
+$old_error_handler = set_error_handler('myErrorHandler');
+function bar($a, $b) {
+  if ($a) {
+    $value = $a * foo(1, 2);
+  }
+  return 1 / $b;
+}
+set_error_handler('myErrorHandler');
+$r = bar(1, 0);
diff --git a/hphp/test/slow/exceptions/59.php.expect b/hphp/test/slow/exceptions/59.php.expect
index 36ea9d3a2..4d868c802 100644
--- a/hphp/test/slow/exceptions/59.php.expect
+++ b/hphp/test/slow/exceptions/59.php.expect
@@ -1,2 +1,2 @@
 string(16) "Division by zero"
-int(3)
+int(14)
diff --git a/hphp/test/slow/exceptions/60.php b/hphp/test/slow/exceptions/60.php
index 919c95b38..2a2e85e6f 100644
--- a/hphp/test/slow/exceptions/60.php
+++ b/hphp/test/slow/exceptions/60.php
@@ -1,7 +1,25 @@
 <?php
 
- class a extends Exception {};class b extends a {  function dump() {    echo 'c:', $this->code, '
+class a extends Exception {
+}
+;
+class b extends a {
+  function dump() {
+    echo 'c:', $this->code, '
 m:', $this->message, '
-';    echo 'x:', $this->x, '
+';
+    echo 'x:', $this->x, '
 y:', $this->y, '
-';  }}if (0) { class a extends Exception {} }try {  throw(new b(1, 2));} catch (b $e) {  $e->dump();}
\ No newline at end of file
+';
+  }
+}
+if (0) {
+ class a extends Exception {
+}
+ }
+try {
+  throw(new b(1, 2));
+}
+ catch (b $e) {
+  $e->dump();
+}
diff --git a/hphp/test/slow/exceptions/61.php b/hphp/test/slow/exceptions/61.php
index 51f722c62..da846c9cc 100644
--- a/hphp/test/slow/exceptions/61.php
+++ b/hphp/test/slow/exceptions/61.php
@@ -1,3 +1,12 @@
 <?php
 
- class X {  static function eh($errno, $errstr) {    echo "eh: $errno\n";    die;  }};set_error_handler(array('X', 'eh'));$g = array();echo $g['foobar'];
\ No newline at end of file
+class X {
+  static function eh($errno, $errstr) {
+    echo "eh: $errno\n";
+    die;
+  }
+}
+;
+set_error_handler(array('X', 'eh'));
+$g = array();
+echo $g['foobar'];
diff --git a/hphp/test/slow/exceptions/62.php b/hphp/test/slow/exceptions/62.php
index ea457f722..521e4992e 100644
--- a/hphp/test/slow/exceptions/62.php
+++ b/hphp/test/slow/exceptions/62.php
@@ -1,12 +1,14 @@
 <?php
 
-
-function f() { throw new Exception('foo'); }
+function f() {
+ throw new Exception('foo');
+ }
 class X {
   function foo() {
     try {
       f();
-    } catch (Exception $this) {
+    }
+ catch (Exception $this) {
       return $this;
     }
   }
diff --git a/hphp/test/slow/exceptions/63.php b/hphp/test/slow/exceptions/63.php
index a5197532d..5452d3c9c 100644
--- a/hphp/test/slow/exceptions/63.php
+++ b/hphp/test/slow/exceptions/63.php
@@ -1,3 +1,19 @@
 <?php
 
-ini_set('memory_limit','4M');function test() {  for ($i = 0; $i < 4000; $i++) {    try {      call_user_func('bar');    } catch (Exception $e) {    }  }  var_dump('ok');}function bar() {  throw new Exception;}test();
\ No newline at end of file
+ini_set('memory_limit','4M');
+function test() {
+  for ($i = 0;
+ $i < 4000;
+ $i++) {
+    try {
+      call_user_func('bar');
+    }
+ catch (Exception $e) {
+    }
+  }
+  var_dump('ok');
+}
+function bar() {
+  throw new Exception;
+}
+test();
diff --git a/hphp/test/slow/exceptions/64.php b/hphp/test/slow/exceptions/64.php
index 1230f3f42..d90ea05e3 100644
--- a/hphp/test/slow/exceptions/64.php
+++ b/hphp/test/slow/exceptions/64.php
@@ -1,3 +1,16 @@
 <?php
 
- function foo($a) {  $flag = true;  try {    f($a);    $flag = false;  } catch (Exception $e) {  }  var_dump($flag);}function f($a) { if ($a) throw new Exception('What?'); }foo(1);
\ No newline at end of file
+function foo($a) {
+  $flag = true;
+  try {
+    f($a);
+    $flag = false;
+  }
+ catch (Exception $e) {
+  }
+  var_dump($flag);
+}
+function f($a) {
+ if ($a) throw new Exception('What?');
+ }
+foo(1);
diff --git a/hphp/test/slow/exceptions/65.php b/hphp/test/slow/exceptions/65.php
index 8a06d539a..a4e79f8bc 100644
--- a/hphp/test/slow/exceptions/65.php
+++ b/hphp/test/slow/exceptions/65.php
@@ -1,3 +1,36 @@
 <?php
 
- error_reporting(-1);set_error_handler('handle');function handle() { throw new exception; }function foo($a,$b=null) { return $a; }function test1() {  if (foo(0)) $a=1;  $x = new StdClass;  return $a;}function test2() {  if (foo(0)) $a=1;  return $a | new StdClass;}function test3() {  if (foo(0)) $a=1;  $x = new StdClass;  return $a::foo;}function test($f) {  try {    $f();  } catch (Exception $e) {    var_dump($f.':Caught');  }}test('test1');test('test2');test('test3');var_dump('not reached');
\ No newline at end of file
+error_reporting(-1);
+set_error_handler('handle');
+function handle() {
+ throw new exception;
+ }
+function foo($a,$b=null) {
+ return $a;
+ }
+function test1() {
+  if (foo(0)) $a=1;
+  $x = new StdClass;
+  return $a;
+}
+function test2() {
+  if (foo(0)) $a=1;
+  return $a | new StdClass;
+}
+function test3() {
+  if (foo(0)) $a=1;
+  $x = new StdClass;
+  return $a::foo;
+}
+function test($f) {
+  try {
+    $f();
+  }
+ catch (Exception $e) {
+    var_dump($f.':Caught');
+  }
+}
+test('test1');
+test('test2');
+test('test3');
+var_dump('not reached');
diff --git a/hphp/test/slow/exceptions/65.php.expectf b/hphp/test/slow/exceptions/65.php.expectf
index 32a6ff1d2..1f8fb0e5a 100644
--- a/hphp/test/slow/exceptions/65.php.expectf
+++ b/hphp/test/slow/exceptions/65.php.expectf
@@ -1,3 +1,3 @@
 string(12) "test1:Caught"
 string(12) "test2:Caught"
-HipHop Fatal error: Cls: Expected string or object in %s/hphp/test/slow/exceptions/65.php on line 3
+HipHop Fatal error: Cls: Expected string or object in %s/hphp/test/slow/exceptions/65.php on line 23
diff --git a/hphp/test/slow/exceptions/66.php b/hphp/test/slow/exceptions/66.php
index 0a211cdcb..01efd0a77 100644
--- a/hphp/test/slow/exceptions/66.php
+++ b/hphp/test/slow/exceptions/66.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class C {
   function g() {
     $ex = new Exception();
diff --git a/hphp/test/slow/exceptions/67.php b/hphp/test/slow/exceptions/67.php
index d1ae63519..d6f3f0253 100644
--- a/hphp/test/slow/exceptions/67.php
+++ b/hphp/test/slow/exceptions/67.php
@@ -1,3 +1,17 @@
 <?php
 
- function runstuff() {  throw new Exception;}function main() {    try {      $start_time = 1;      runstuff();      return;    } catch (Exception $se) {      $elapsed = 2 - $start_time;      var_dump($elapsed);    }}main();
\ No newline at end of file
+function runstuff() {
+  throw new Exception;
+}
+function main() {
+    try {
+      $start_time = 1;
+      runstuff();
+      return;
+    }
+ catch (Exception $se) {
+      $elapsed = 2 - $start_time;
+      var_dump($elapsed);
+    }
+}
+main();
diff --git a/hphp/test/slow/exceptions/retc.php b/hphp/test/slow/exceptions/retc.php
index bd179170d..18d727c00 100644
--- a/hphp/test/slow/exceptions/retc.php
+++ b/hphp/test/slow/exceptions/retc.php
@@ -3,7 +3,8 @@
 class Obj {
   public function __destruct() {
     // Raise a fatal.
-    class Obj {}
+    class Obj {
+}
   }
 }
 
@@ -22,6 +23,10 @@ function foo() {
 
 try {
   foo();
-} catch (Exception $x) { echo "notreached\n"; }
-foo(); // enter hook throws the fatal
+}
+ catch (Exception $x) {
+ echo "notreached\n";
+ }
+foo();
+ // enter hook throws the fatal
 
diff --git a/hphp/test/slow/exit/1560.php b/hphp/test/slow/exit/1560.php
index 18ba89e69..e460d882c 100644
--- a/hphp/test/slow/exit/1560.php
+++ b/hphp/test/slow/exit/1560.php
@@ -1,3 +1,6 @@
 <?php
 
- function foo() { return false; }foo() or die("foobar");
\ No newline at end of file
+function foo() {
+ return false;
+ }
+foo() or die("foobar");
diff --git a/hphp/test/slow/exit/1561.php b/hphp/test/slow/exit/1561.php
index d3bcf481e..ad62a1083 100644
--- a/hphp/test/slow/exit/1561.php
+++ b/hphp/test/slow/exit/1561.php
@@ -1,3 +1,6 @@
 <?php
 
- function foo() { return false; }foo() or exit("foobar");
\ No newline at end of file
+function foo() {
+ return false;
+ }
+foo() or exit("foobar");
diff --git a/hphp/test/slow/exit/1562.php b/hphp/test/slow/exit/1562.php
index 94ad2f124..f6a610c9e 100644
--- a/hphp/test/slow/exit/1562.php
+++ b/hphp/test/slow/exit/1562.php
@@ -1,3 +1,11 @@
 <?php
 
- function callback($data) {  return "callback: $data";}ob_start();echo "from first level\n";ob_start();ob_start("callback");echo "foobar!\n";exit;
\ No newline at end of file
+function callback($data) {
+  return "callback: $data";
+}
+ob_start();
+echo "from first level\n";
+ob_start();
+ob_start("callback");
+echo "foobar!\n";
+exit;
diff --git a/hphp/test/slow/exit/1563.php b/hphp/test/slow/exit/1563.php
index ba8025c72..ccd2bb031 100644
--- a/hphp/test/slow/exit/1563.php
+++ b/hphp/test/slow/exit/1563.php
@@ -1,3 +1,18 @@
 <?php
 
- declare(ticks=1);function foo() {  echo 'a';  exit(1);}function bar() {} pcntl_signal(SIGUSR1,  'foo');$pid = posix_getpid();posix_kill($pid, SIGUSR1);bar(); /* check for received signal upon function entry/exit */ for ($i = 0; $i < 2; $i++) {  echo 'a';}
\ No newline at end of file
+declare(ticks=1);
+function foo() {
+  echo 'a';
+  exit(1);
+}
+function bar() {
+}
+ pcntl_signal(SIGUSR1,  'foo');
+$pid = posix_getpid();
+posix_kill($pid, SIGUSR1);
+bar();
+ /* check for received signal upon function entry/exit */ for ($i = 0;
+ $i < 2;
+ $i++) {
+  echo 'a';
+}
diff --git a/hphp/test/slow/exit/1564.php b/hphp/test/slow/exit/1564.php
index 841be0fdf..ea0e382c8 100644
--- a/hphp/test/slow/exit/1564.php
+++ b/hphp/test/slow/exit/1564.php
@@ -1,3 +1,5 @@
 <?php
 
- $command = "exit 2";system($command, $return);print "$return\n";
\ No newline at end of file
+$command = "exit 2";
+system($command, $return);
+print "$return\n";
diff --git a/hphp/test/slow/exit/1565.php b/hphp/test/slow/exit/1565.php
index 98f836114..0145045ba 100644
--- a/hphp/test/slow/exit/1565.php
+++ b/hphp/test/slow/exit/1565.php
@@ -1,3 +1,5 @@
 <?php
 
- $command = "exit 2";passthru($command, $return);print "$return\n";
\ No newline at end of file
+$command = "exit 2";
+passthru($command, $return);
+print "$return\n";
diff --git a/hphp/test/slow/ext_array/1766.php b/hphp/test/slow/ext_array/1766.php
index 465fcb40e..4c44ea11d 100644
--- a/hphp/test/slow/ext_array/1766.php
+++ b/hphp/test/slow/ext_array/1766.php
@@ -1,3 +1,26 @@
 <?php
 
- error_reporting(0);var_dump(range('', '', 1));var_dump(range('', '', -1));var_dump(range('9', '10', -1));var_dump(range(9, 10, -1));var_dump(range(9, 10, -1.5));var_dump(range(9, 10, 33333333.33));var_dump(range(9, 10, -33333333.33));var_dump(range(9223372036854775807, 9223372036854775805, -1));var_dump(range(9223372036854775807, 9223372036854775805,               9223372036854775807));var_dump(range(9223372036854775807, 9223372036854775805,               -9223372036854775807));var_dump(range(9223372036854775807, 9223372036854775805,               2147483648));var_dump(range(9223372036854775807, 9223372036854775805,               -2147483648));var_dump(range('9', '10', '-1'));var_dump(range('9', '10', '-1.5'));var_dump(range('9', '10', '33333333.33'));var_dump(range('9', '10', '-33333333.33'));var_dump(range('9223372036854775807', '9223372036854775805', '-1'));var_dump(range('9223372036854775807', '9223372036854775805',               '9223372036854775807'));var_dump(range('9223372036854775807', '9223372036854775805',               '-9223372036854775807'));var_dump(range(null, null, -2.5));var_dump(range(null, null, 3.5));var_dump(range(null, null, null));var_dump(range(3.5, -4.5, null));
\ No newline at end of file
+error_reporting(0);
+var_dump(range('', '', 1));
+var_dump(range('', '', -1));
+var_dump(range('9', '10', -1));
+var_dump(range(9, 10, -1));
+var_dump(range(9, 10, -1.5));
+var_dump(range(9, 10, 33333333.33));
+var_dump(range(9, 10, -33333333.33));
+var_dump(range(9223372036854775807, 9223372036854775805, -1));
+var_dump(range(9223372036854775807, 9223372036854775805,               9223372036854775807));
+var_dump(range(9223372036854775807, 9223372036854775805,               -9223372036854775807));
+var_dump(range(9223372036854775807, 9223372036854775805,               2147483648));
+var_dump(range(9223372036854775807, 9223372036854775805,               -2147483648));
+var_dump(range('9', '10', '-1'));
+var_dump(range('9', '10', '-1.5'));
+var_dump(range('9', '10', '33333333.33'));
+var_dump(range('9', '10', '-33333333.33'));
+var_dump(range('9223372036854775807', '9223372036854775805', '-1'));
+var_dump(range('9223372036854775807', '9223372036854775805',               '9223372036854775807'));
+var_dump(range('9223372036854775807', '9223372036854775805',               '-9223372036854775807'));
+var_dump(range(null, null, -2.5));
+var_dump(range(null, null, 3.5));
+var_dump(range(null, null, null));
+var_dump(range(3.5, -4.5, null));
diff --git a/hphp/test/slow/ext_array/1767.php b/hphp/test/slow/ext_array/1767.php
index 51e5ddf06..a1b324f94 100644
--- a/hphp/test/slow/ext_array/1767.php
+++ b/hphp/test/slow/ext_array/1767.php
@@ -1,3 +1,9 @@
 <?php
 
- var_dump(array_fill(-2, -2, 'pear'));var_dump(array_combine(array(1, 2), array(3)));var_dump(array_combine(array(), array()));var_dump(array_chunk(1));var_dump(array_chunk(array()));$a = array(1, 2);var_dump(asort($a, 100000));
\ No newline at end of file
+var_dump(array_fill(-2, -2, 'pear'));
+var_dump(array_combine(array(1, 2), array(3)));
+var_dump(array_combine(array(), array()));
+var_dump(array_chunk(1));
+var_dump(array_chunk(array()));
+$a = array(1, 2);
+var_dump(asort($a, 100000));
diff --git a/hphp/test/slow/ext_array/1768.php b/hphp/test/slow/ext_array/1768.php
index a0a40a28c..6f93364cf 100644
--- a/hphp/test/slow/ext_array/1768.php
+++ b/hphp/test/slow/ext_array/1768.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f(&$val,$key) {
   echo "k=$key v=$val\n";
   $val = $val + 1;
diff --git a/hphp/test/slow/ext_array/1769.php b/hphp/test/slow/ext_array/1769.php
index b6ca8de7a..7ec4dfc5a 100644
--- a/hphp/test/slow/ext_array/1769.php
+++ b/hphp/test/slow/ext_array/1769.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($val,$key) {
   echo "k=$key v=$val\n";
 }
diff --git a/hphp/test/slow/ext_array/1770.php b/hphp/test/slow/ext_array/1770.php
index 93b45cee3..bd84b566e 100644
--- a/hphp/test/slow/ext_array/1770.php
+++ b/hphp/test/slow/ext_array/1770.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $arr = array(0,1,2);
 function f($val,$key) {
   global $arr;
diff --git a/hphp/test/slow/ext_array/1771.php b/hphp/test/slow/ext_array/1771.php
index c840c11f9..c84de9807 100644
--- a/hphp/test/slow/ext_array/1771.php
+++ b/hphp/test/slow/ext_array/1771.php
@@ -1,7 +1,8 @@
 <?php
 
-
 $a = array('foo'=>array('bar'=>1));
-function fix(&$v, $k) { $v *= 2; }
+function fix(&$v, $k) {
+ $v *= 2;
+ }
 array_walk_recursive($a, 'fix');
 var_dump($a['foo']);
diff --git a/hphp/test/slow/ext_array/1772.php b/hphp/test/slow/ext_array/1772.php
index ed8976fd6..b1d977bee 100644
--- a/hphp/test/slow/ext_array/1772.php
+++ b/hphp/test/slow/ext_array/1772.php
@@ -1,7 +1,9 @@
 <?php
 
-
 $a = array(array('one'),array('one'));
-function test($v, $k) { }
+function test($v, $k) {
+ }
 array_walk_recursive($a, 'foo');
-function foo($a) { var_dump($a); }
+function foo($a) {
+ var_dump($a);
+ }
diff --git a/hphp/test/slow/ext_array/1773.php b/hphp/test/slow/ext_array/1773.php
index 2953f2241..90aa4acc4 100644
--- a/hphp/test/slow/ext_array/1773.php
+++ b/hphp/test/slow/ext_array/1773.php
@@ -1,3 +1,20 @@
 <?php
 
- function xsort(&$a) {  $b = null;  $b->foo =& $a;  var_dump(is_object($b));  $b = false;  $b[0] =& $a;  uksort($a, function ($i, $j) use(&$b) {      if ($b[0][$i] == $b[0][$j]) return 0;      return $b[0][$i] < $b[0][$j] ? -1 : 1;    });}function test($x) {  $a = array(220,250,240,$x);  xsort($a);  var_dump($a);}test(230);
\ No newline at end of file
+function xsort(&$a) {
+  $b = null;
+  $b->foo =& $a;
+  var_dump(is_object($b));
+  $b = false;
+  $b[0] =& $a;
+  uksort($a, function ($i, $j) use(&$b) {
+      if ($b[0][$i] == $b[0][$j]) return 0;
+      return $b[0][$i] < $b[0][$j] ? -1 : 1;
+    }
+);
+}
+function test($x) {
+  $a = array(220,250,240,$x);
+  xsort($a);
+  var_dump($a);
+}
+test(230);
diff --git a/hphp/test/slow/ext_array/1774.php b/hphp/test/slow/ext_array/1774.php
index 5661d8658..1d0b5863f 100644
--- a/hphp/test/slow/ext_array/1774.php
+++ b/hphp/test/slow/ext_array/1774.php
@@ -1,3 +1,16 @@
 <?php
 
- function cmp($a, $b) {  throw new Exception('Surprise!');}function test() {  $a = array(1,2,3);  try {    usort($a, 'cmp');    var_dump('unreached');  } catch (Exception $e) {    var_dump($e->getMessage());  }}test();
\ No newline at end of file
+function cmp($a, $b) {
+  throw new Exception('Surprise!');
+}
+function test() {
+  $a = array(1,2,3);
+  try {
+    usort($a, 'cmp');
+    var_dump('unreached');
+  }
+ catch (Exception $e) {
+    var_dump($e->getMessage());
+  }
+}
+test();
diff --git a/hphp/test/slow/ext_collator/1810.php b/hphp/test/slow/ext_collator/1810.php
index 6411f285e..dff574597 100644
--- a/hphp/test/slow/ext_collator/1810.php
+++ b/hphp/test/slow/ext_collator/1810.php
@@ -1,6 +1,6 @@
 <?php
 
- function ut_run($mainFunc) {
+function ut_run($mainFunc) {
     $GLOBALS['oo-mode'] = true;
     $oo_result = $mainFunc();
     $GLOBALS['oo-mode'] = false;
@@ -28,37 +28,37 @@ function ut_coll_create( $locale )
 }
 function ut_coll_compare( $coll, $str1, $str2 )
 {
-    return $GLOBALS['oo-mode'] ? 
+    return $GLOBALS['oo-mode'] ?
       $coll->compare( $str1, $str2 ) : collator_compare( $coll, $str1, $str2 );
 }
 function ut_coll_sort_with_sort_keys( $coll, &$arr )
 {
-    return $GLOBALS['oo-mode'] ? 
+    return $GLOBALS['oo-mode'] ?
       $coll->sortWithSortKeys( $arr ) : collator_sort_with_sort_keys( $coll, $arr );
 }
 function ut_coll_sort( $coll, &$arr, $sort_flag = Collator::SORT_REGULAR )
 {
-    return $GLOBALS['oo-mode'] ? 
+    return $GLOBALS['oo-mode'] ?
       $coll->sort( $arr, $sort_flag ) : collator_sort( $coll, $arr, $sort_flag );
 }
 function ut_coll_asort( $coll, &$arr, $sort_flag = Collator::SORT_REGULAR )
 {
-    return $GLOBALS['oo-mode'] ? 
+    return $GLOBALS['oo-mode'] ?
       $coll->asort( $arr, $sort_flag ) : collator_asort( $coll, $arr, $sort_flag );
 }
 function ut_coll_get_locale( $coll, $type )
 {
-    return $GLOBALS['oo-mode'] ? 
+    return $GLOBALS['oo-mode'] ?
       $coll->getLocale( $type ) : collator_get_locale( $coll, $type );
 }
 function ut_coll_set_strength( $coll, $strength )
 {
-    return $GLOBALS['oo-mode'] ? 
+    return $GLOBALS['oo-mode'] ?
       $coll->setStrength( $strength ) : collator_set_strength( $coll, $strength );
 }
 function ut_coll_set_attribute( $coll, $attr, $val )
 {
-    return $GLOBALS['oo-mode'] ? 
+    return $GLOBALS['oo-mode'] ?
       $coll->setAttribute( $attr, $val ) : collator_set_attribute( $coll, $attr, $val );
 }
 function ut_coll_set_default( $coll )
@@ -81,7 +81,7 @@ function sort_arrays( $locale, $arrays, $sort_flag = Collator::SORT_REGULAR )
         // Preppend test signature to output string
         $md5 = md5( $res_dump );
         global $test_num;
-        
+
         $res_str .= "\n\n".
                     "Test $test_num.$md5:" .
                     $res_dump;
@@ -133,8 +133,10 @@ function ut_main1()
 ut_run('ut_main1');
 function ut_main2() {
   $obj = ut_coll_create('en_US');
-  $arr0 = array( 100, 25, 36, '30.2', '30.12' ); // test 6
-  $arr1 = array( '100', '25', '36'  ); // test 6
+  $arr0 = array( 100, 25, 36, '30.2', '30.12' );
+ // test 6
+  $arr1 = array( '100', '25', '36'  );
+ // test 6
   $arr2 = array( 11, 5, '2', 64, 17, '30', 10, 2, '54' );
   // strcmp 17 and 30, ret = 1
   // Comparing values 17 and 30, ret = 1
@@ -277,8 +279,8 @@ function sort_arrays_with_sort_keys( $locale, $arrays )
         // with output string.
         $res_dump = "\n" . dump( $array ) .
                     "\n Result: " . dump( $res_val );
-        
-        
+
+
         // Preppend test signature to output string
         $md5 = md5( $res_dump );
         global $test_num;
diff --git a/hphp/test/slow/ext_file/1775.php b/hphp/test/slow/ext_file/1775.php
index 77007b053..52f36fdf0 100644
--- a/hphp/test/slow/ext_file/1775.php
+++ b/hphp/test/slow/ext_file/1775.php
@@ -1,3 +1,8 @@
 <?php
 
- error_reporting(0);$fp = fopen('/tmp/lock.txt', 'w');fclose($fp);$fp = fopen('/tmp/lock.txt', 'r+');var_dump(flock($fp, 0xf0));fclose($fp);
\ No newline at end of file
+error_reporting(0);
+$fp = fopen('/tmp/lock.txt', 'w');
+fclose($fp);
+$fp = fopen('/tmp/lock.txt', 'r+');
+var_dump(flock($fp, 0xf0));
+fclose($fp);
diff --git a/hphp/test/slow/ext_image/1777.php b/hphp/test/slow/ext_image/1777.php
index e778f204a..693772a6f 100644
--- a/hphp/test/slow/ext_image/1777.php
+++ b/hphp/test/slow/ext_image/1777.php
@@ -1,3 +1,13 @@
 <?php
 
- $data = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABl'       . 'BMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDr'       . 'EX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r'       . '8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg==';$data = base64_decode($data);$im = imagecreatefromstring($data);if ($im !== false) {    header('Content-Type: image/png');    imagepng($im);    imagedestroy($im);}else {    echo 'An error occurred.';}
\ No newline at end of file
+$data = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABl'       . 'BMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDr'       . 'EX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r'       . '8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg==';
+$data = base64_decode($data);
+$im = imagecreatefromstring($data);
+if ($im !== false) {
+    header('Content-Type: image/png');
+    imagepng($im);
+    imagedestroy($im);
+}
+else {
+    echo 'An error occurred.';
+}
diff --git a/hphp/test/slow/ext_image/1778.php b/hphp/test/slow/ext_image/1778.php
index 2b68b20e8..3b7ce6897 100644
--- a/hphp/test/slow/ext_image/1778.php
+++ b/hphp/test/slow/ext_image/1778.php
@@ -1,3 +1,8 @@
 <?php
 
- header ('Content-type: image/png');$im = imagecreatetruecolor(120, 20);$text_color = imagecolorallocate($im, 233, 14, 91);imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);imagepng($im);imagedestroy($im);
\ No newline at end of file
+header ('Content-type: image/png');
+$im = imagecreatetruecolor(120, 20);
+$text_color = imagecolorallocate($im, 233, 14, 91);
+imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);
+imagepng($im);
+imagedestroy($im);
diff --git a/hphp/test/slow/ext_image/1779.php b/hphp/test/slow/ext_image/1779.php
index 3f231ca0e..7bb43f6fd 100644
--- a/hphp/test/slow/ext_image/1779.php
+++ b/hphp/test/slow/ext_image/1779.php
@@ -1,3 +1,13 @@
 <?php
 
- // Create a 55x30 image$im = imagecreatetruecolor(55, 30);$red = imagecolorallocate($im, 255, 0, 0);$black = imagecolorallocate($im, 0, 0, 0);// Make the background transparentimagecolortransparent($im, $black);// Draw a red rectangleimagefilledrectangle($im, 4, 4, 50, 25, $red);// Save the imageimagepng($im, './imagecolortransparent.png');imagedestroy($im);
\ No newline at end of file
+// Create a 55x30 image
+$im = imagecreatetruecolor(55, 30);
+$red = imagecolorallocate($im, 255, 0, 0);
+$black = imagecolorallocate($im, 0, 0, 0);
+// Make the background transparent
+imagecolortransparent($im, $black);
+// Draw a red rectangle
+imagefilledrectangle($im, 4, 4, 50, 25, $red);
+// Save the image
+imagepng($im);
+imagedestroy($im);
diff --git a/hphp/test/slow/ext_image/1779.php.expect b/hphp/test/slow/ext_image/1779.php.expect
index e69de29bb..186f6de8e 100644
Binary files a/hphp/test/slow/ext_image/1779.php.expect and b/hphp/test/slow/ext_image/1779.php.expect differ
diff --git a/hphp/test/slow/ext_image/1781.php b/hphp/test/slow/ext_image/1781.php
index a228f65b1..b6c2dfef9 100644
--- a/hphp/test/slow/ext_image/1781.php
+++ b/hphp/test/slow/ext_image/1781.php
@@ -1,3 +1,15 @@
 <?php
 
- $image = imagecreatetruecolor(180,40);// Writes the text and apply a gaussian blur on the imageimagestring($image, 5, 10, 8, 'Gaussian Blur Text', 0x00ff00);$gaussian = array(array(1.0, 2.0, 1.0),                  array(2.0, 4.0, 2.0),                  array(1.0, 2.0, 1.0));imageconvolution($image, $gaussian, 16, 0);// Rewrites the text for comparisonimagestring($image, 5, 10, 18, 'Gaussian Blur Text', 0x00ff00);header('Content-Type: image/png');imagepng($image, null, 9);
\ No newline at end of file
+$image = imagecreatetruecolor(180,40);
+// Writes the text and apply a gaussian blur on the image
+imagestring($image, 5, 10, 8, 'Gaussian Blur Text', 0x00ff00);
+$gaussian = array(
+  array(1.0, 2.0, 1.0),
+  array(2.0, 4.0, 2.0),
+  array(1.0, 2.0, 1.0)
+);
+imageconvolution($image, $gaussian, 16, 0);
+// Rewrites the text for comparison
+imagestring($image, 5, 10, 18, 'Gaussian Blur Text', 0x00ff00);
+header('Content-Type: image/png');
+imagepng($image, null, 9);
diff --git a/hphp/test/slow/ext_image/1781.php.expect b/hphp/test/slow/ext_image/1781.php.expect
index e69de29bb..2a8ca2741 100644
Binary files a/hphp/test/slow/ext_image/1781.php.expect and b/hphp/test/slow/ext_image/1781.php.expect differ
diff --git a/hphp/test/slow/ext_image/1782.php b/hphp/test/slow/ext_image/1782.php
index 0dbc6ee06..8229bde46 100644
--- a/hphp/test/slow/ext_image/1782.php
+++ b/hphp/test/slow/ext_image/1782.php
@@ -1,3 +1,19 @@
 <?php
 
- // File and new size$filename = 'test/images/simpletext.jpg';$percent = 0.5;// Content typeheader('Content-type: image/jpeg');// Get new sizeslist($width, $height) = getimagesize($filename, $nfo);var_dump($nfo);$newwidth = $width * $percent;$newheight = $height * $percent;// Load$thumb = imagecreatetruecolor($newwidth, $newheight);$source = imagecreatefromjpeg($filename);// Resizeimagecopyresized($thumb, $source, 0, 0, 0, 0,                 $newwidth, $newheight, $width, $height);// Outputimagejpeg($thumb);
\ No newline at end of file
+// File and new size
+$filename = __DIR__.'/../../images/simpletext.jpg';
+$percent = 0.5;
+// Content type
+header('Content-type: image/jpeg');
+// Get new sizes
+list($width, $height) = getimagesize($filename, $nfo);
+var_dump($nfo);
+$newwidth = $width * $percent;
+$newheight = $height * $percent;
+// Load
+$thumb = imagecreatetruecolor($newwidth, $newheight);
+$source = imagecreatefromjpeg($filename);
+// Resize
+imagecopyresized($thumb, $source, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
+// Output
+imagejpeg($thumb);
diff --git a/hphp/test/slow/ext_image/1782.php.expect b/hphp/test/slow/ext_image/1782.php.expect
index e69de29bb..8cdd453f7 100644
Binary files a/hphp/test/slow/ext_image/1782.php.expect and b/hphp/test/slow/ext_image/1782.php.expect differ
diff --git a/hphp/test/slow/ext_image/1783.php b/hphp/test/slow/ext_image/1783.php
index 5415bc5a9..9ae2c1d33 100644
--- a/hphp/test/slow/ext_image/1783.php
+++ b/hphp/test/slow/ext_image/1783.php
@@ -1,3 +1,25 @@
 <?php
 
- // create image$image = imagecreatetruecolor(100, 100);// allocate some solors$white    = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);$gray     = imagecolorallocate($image, 0xC0, 0xC0, 0xC0);$darkgray = imagecolorallocate($image, 0x90, 0x90, 0x90);$navy     = imagecolorallocate($image, 0x00, 0x00, 0x80);$darknavy = imagecolorallocate($image, 0x00, 0x00, 0x50);$red      = imagecolorallocate($image, 0xFF, 0x00, 0x00);$darkred  = imagecolorallocate($image, 0x90, 0x00, 0x00);// make the 3D effectfor ($i = 60; $i > 50; $i--) {   imagefilledarc($image, 50, $i, 100, 50, 0, 45,                  $darknavy, IMG_ARC_PIE);   imagefilledarc($image, 50, $i, 100, 50, 45, 75,                  $darkgray, IMG_ARC_PIE);   imagefilledarc($image, 50, $i, 100, 50, 75, 360,                  $darkred, IMG_ARC_PIE);}imagefilledarc($image, 50, 50, 100, 50, 0, 45, $navy, IMG_ARC_PIE);imagefilledarc($image, 50, 50, 100, 50, 45, 75 , $gray, IMG_ARC_PIE);imagefilledarc($image, 50, 50, 100, 50, 75, 360 , $red, IMG_ARC_PIE);// flush imageheader('Content-type: image/png');imagepng($image);imagedestroy($image);
\ No newline at end of file
+// create image
+$image = imagecreatetruecolor(100, 100);
+// allocate some solors
+$white    = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+$gray     = imagecolorallocate($image, 0xC0, 0xC0, 0xC0);
+$darkgray = imagecolorallocate($image, 0x90, 0x90, 0x90);
+$navy     = imagecolorallocate($image, 0x00, 0x00, 0x80);
+$darknavy = imagecolorallocate($image, 0x00, 0x00, 0x50);
+$red      = imagecolorallocate($image, 0xFF, 0x00, 0x00);
+$darkred  = imagecolorallocate($image, 0x90, 0x00, 0x00);
+// make the 3D effect
+for ($i = 60; $i > 50; $i--) {
+   imagefilledarc($image, 50, $i, 100, 50, 0, 45,                  $darknavy, IMG_ARC_PIE);
+   imagefilledarc($image, 50, $i, 100, 50, 45, 75,                  $darkgray, IMG_ARC_PIE);
+   imagefilledarc($image, 50, $i, 100, 50, 75, 360,                  $darkred, IMG_ARC_PIE);
+}
+imagefilledarc($image, 50, 50, 100, 50, 0, 45, $navy, IMG_ARC_PIE);
+imagefilledarc($image, 50, 50, 100, 50, 45, 75 , $gray, IMG_ARC_PIE);
+imagefilledarc($image, 50, 50, 100, 50, 75, 360 , $red, IMG_ARC_PIE);
+// flush image
+header('Content-type: image/png');
+imagepng($image);
+imagedestroy($image);
diff --git a/hphp/test/slow/ext_image/1783.php.expect b/hphp/test/slow/ext_image/1783.php.expect
index e69de29bb..61210fa5b 100644
Binary files a/hphp/test/slow/ext_image/1783.php.expect and b/hphp/test/slow/ext_image/1783.php.expect differ
diff --git a/hphp/test/slow/ext_image/1784.php b/hphp/test/slow/ext_image/1784.php
index 5af34dc5d..05d568e37 100644
--- a/hphp/test/slow/ext_image/1784.php
+++ b/hphp/test/slow/ext_image/1784.php
@@ -1,3 +1,12 @@
 <?php
 
- // Create a new image instance$im = imagecreatetruecolor(100, 100);// Make the background whiteimagefilledrectangle($im, 0, 0, 99, 99, 0xFFFFFF);// Draw a text string on the imageimagestring($im, 3, 40, 20, 'GD Library', 0xFFBA00);// Output the image to browserheader('Content-type: image/gif');imagegif($im);imagedestroy($im);
\ No newline at end of file
+// Create a new image instance
+$im = imagecreatetruecolor(100, 100);
+// Make the background white
+imagefilledrectangle($im, 0, 0, 99, 99, 0xFFFFFF);
+// Draw a text string on the image
+imagestring($im, 3, 40, 20, 'GD Library', 0xFFBA00);
+// Output the image to browser
+header('Content-type: image/gif');
+imagegif($im);
+imagedestroy($im);
diff --git a/hphp/test/slow/ext_image/1784.php.expect b/hphp/test/slow/ext_image/1784.php.expect
index e69de29bb..f48921237 100644
Binary files a/hphp/test/slow/ext_image/1784.php.expect and b/hphp/test/slow/ext_image/1784.php.expect differ
diff --git a/hphp/test/slow/ext_image/1785.php b/hphp/test/slow/ext_image/1785.php
index 2272357a0..0f69f359f 100644
--- a/hphp/test/slow/ext_image/1785.php
+++ b/hphp/test/slow/ext_image/1785.php
@@ -1,3 +1,5 @@
 <?php
 
- $png = imagecreatefrompng('test/images/smile.happy.png');// Save the image as a GIFimagegif($png, '/tmp/php.gif');// Free from memoryimagedestroy($png);
\ No newline at end of file
+$png = imagecreatefrompng('test/images/smile.happy.png');
+// Save the image as a GIFimagegif($png, '/tmp/php.gif');
+// Free from memoryimagedestroy($png);
diff --git a/hphp/test/slow/ext_image/1786.php b/hphp/test/slow/ext_image/1786.php
index 561dd8103..ec97dc1b1 100644
--- a/hphp/test/slow/ext_image/1786.php
+++ b/hphp/test/slow/ext_image/1786.php
@@ -1,3 +1,9 @@
 <?php
 
- // Create an image instance$im = imagecreatefromgif('test/images/php.gif');// Enable interlancingimageinterlace($im, true);// Save the interfaced imageimagegif($im, './php_interlaced.gif');imagedestroy($im);
\ No newline at end of file
+// Create an image instance
+$im = imagecreatefromgif(__DIR__.'/../../images/php.gif');
+// Enable interlancing
+imageinterlace($im, true);
+// Save the interfaced image
+imagegif($im);
+imagedestroy($im);
diff --git a/hphp/test/slow/ext_image/1786.php.expect b/hphp/test/slow/ext_image/1786.php.expect
index e69de29bb..0b3746218 100644
Binary files a/hphp/test/slow/ext_image/1786.php.expect and b/hphp/test/slow/ext_image/1786.php.expect differ
diff --git a/hphp/test/slow/ext_image/1787.php b/hphp/test/slow/ext_image/1787.php
index afe6cb17f..73ae20e74 100644
--- a/hphp/test/slow/ext_image/1787.php
+++ b/hphp/test/slow/ext_image/1787.php
@@ -1,3 +1,10 @@
 <?php
 
- // Create a blank image and add some text$im = imagecreatetruecolor(120, 20);$text_color = imagecolorallocate($im, 233, 14, 91);imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);// Save the image as 'simpletext.jpg'imagejpeg($im, 'simpletext.jpg');// Free up memoryimagedestroy($im);
\ No newline at end of file
+// Create a blank image and add some text
+$im = imagecreatetruecolor(120, 20);
+$text_color = imagecolorallocate($im, 233, 14, 91);
+imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);
+// Save the image as 'simpletext.jpg'
+imagejpeg($im);
+// Free up memory
+imagedestroy($im);
diff --git a/hphp/test/slow/ext_image/1787.php.expect b/hphp/test/slow/ext_image/1787.php.expect
index e69de29bb..c75c247d4 100644
Binary files a/hphp/test/slow/ext_image/1787.php.expect and b/hphp/test/slow/ext_image/1787.php.expect differ
diff --git a/hphp/test/slow/ext_image/1788.php b/hphp/test/slow/ext_image/1788.php
index db5fbcb7a..e1d446aee 100644
--- a/hphp/test/slow/ext_image/1788.php
+++ b/hphp/test/slow/ext_image/1788.php
@@ -1,3 +1,12 @@
 <?php
 
- // Create a blank image and add some text$im = imagecreatetruecolor(120, 20);$text_color = imagecolorallocate($im, 233, 14, 91);imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);// Set the content type header - in this case image/jpegheader('Content-type: image/jpeg');// Skip the filename parameter using NULL, then set the quality to 75%imagejpeg($im, NULL, 75);// Free up memoryimagedestroy($im);
\ No newline at end of file
+// Create a blank image and add some text
+$im = imagecreatetruecolor(120, 20);
+$text_color = imagecolorallocate($im, 233, 14, 91);
+imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);
+// Set the content type header - in this case image/jpeg
+header('Content-type: image/jpeg');
+// Skip the filename parameter using NULL, then set the quality to 75%
+imagejpeg($im, NULL, 75);
+// Free up memory
+imagedestroy($im);
diff --git a/hphp/test/slow/ext_image/1788.php.expect b/hphp/test/slow/ext_image/1788.php.expect
index e69de29bb..bee04fcc5 100644
Binary files a/hphp/test/slow/ext_image/1788.php.expect and b/hphp/test/slow/ext_image/1788.php.expect differ
diff --git a/hphp/test/slow/ext_image/1789.php b/hphp/test/slow/ext_image/1789.php
index fe99c5011..5e6652e00 100644
--- a/hphp/test/slow/ext_image/1789.php
+++ b/hphp/test/slow/ext_image/1789.php
@@ -1,3 +1,12 @@
 <?php
 
- // Create a blank image and add some text$im = imagecreatetruecolor(120, 20);$text_color = imagecolorallocate($im, 233, 14, 91);imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);// Set the content type header - in this case image/jpegheader('Content-type: image/jpeg');// Output the imageimagejpeg($im);// Free up memoryimagedestroy($im);
\ No newline at end of file
+// Create a blank image and add some text
+$im = imagecreatetruecolor(120, 20);
+$text_color = imagecolorallocate($im, 233, 14, 91);
+imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);
+// Set the content type header - in this case image/jpeg
+header('Content-type: image/jpeg');
+// Output the image
+imagejpeg($im);
+// Free up memory
+imagedestroy($im);
diff --git a/hphp/test/slow/ext_image/1789.php.expect b/hphp/test/slow/ext_image/1789.php.expect
index e69de29bb..c75c247d4 100644
Binary files a/hphp/test/slow/ext_image/1789.php.expect and b/hphp/test/slow/ext_image/1789.php.expect differ
diff --git a/hphp/test/slow/ext_image/1790.php b/hphp/test/slow/ext_image/1790.php
index 98bab2848..30ed9848b 100644
--- a/hphp/test/slow/ext_image/1790.php
+++ b/hphp/test/slow/ext_image/1790.php
@@ -1,3 +1,13 @@
 <?php
 
- // Create a 100*30 image$im = imagecreate(100, 30);// White background and blue text$bg = imagecolorallocate($im, 255, 255, 255);$textcolor = imagecolorallocate($im, 0, 0, 255);// Write the string at the top leftimagestring($im, 5, 0, 0, 'Hello world!', $textcolor);// Output the imageheader('Content-type: image/png');imagepng($im);imagedestroy($im);
\ No newline at end of file
+// Create a 100*30 image
+$im = imagecreate(100, 30);
+// White background and blue text
+$bg = imagecolorallocate($im, 255, 255, 255);
+$textcolor = imagecolorallocate($im, 0, 0, 255);
+// Write the string at the top left
+imagestring($im, 5, 0, 0, 'Hello world!', $textcolor);
+// Output the image
+header('Content-type: image/png');
+imagepng($im);
+imagedestroy($im);
diff --git a/hphp/test/slow/ext_image/1790.php.expect b/hphp/test/slow/ext_image/1790.php.expect
index e69de29bb..e5488e2f7 100644
Binary files a/hphp/test/slow/ext_image/1790.php.expect and b/hphp/test/slow/ext_image/1790.php.expect differ
diff --git a/hphp/test/slow/ext_image/1791.php b/hphp/test/slow/ext_image/1791.php
index e15f2ad12..db9fa9ec9 100644
--- a/hphp/test/slow/ext_image/1791.php
+++ b/hphp/test/slow/ext_image/1791.php
@@ -1,3 +1,19 @@
 <?php
 
- var_dump(image_type_to_mime_type(IMAGETYPE_GIF));var_dump(image_type_to_mime_type(IMAGETYPE_JPEG));var_dump(image_type_to_mime_type(IMAGETYPE_PNG));var_dump(image_type_to_mime_type(IMAGETYPE_SWF));var_dump(image_type_to_mime_type(IMAGETYPE_PSD));var_dump(image_type_to_mime_type(IMAGETYPE_BMP));var_dump(image_type_to_mime_type(IMAGETYPE_TIFF_II));var_dump(image_type_to_mime_type(IMAGETYPE_TIFF_MM));var_dump(image_type_to_mime_type(IMAGETYPE_JPC));var_dump(image_type_to_mime_type(IMAGETYPE_JP2));var_dump(image_type_to_mime_type(IMAGETYPE_JPX));var_dump(image_type_to_mime_type(IMAGETYPE_JB2));var_dump(image_type_to_mime_type(IMAGETYPE_SWC));var_dump(image_type_to_mime_type(IMAGETYPE_IFF));var_dump(image_type_to_mime_type(IMAGETYPE_WBMP));var_dump(image_type_to_mime_type(IMAGETYPE_XBM));var_dump(image_type_to_mime_type(IMAGETYPE_ICO));
\ No newline at end of file
+var_dump(image_type_to_mime_type(IMAGETYPE_GIF));
+var_dump(image_type_to_mime_type(IMAGETYPE_JPEG));
+var_dump(image_type_to_mime_type(IMAGETYPE_PNG));
+var_dump(image_type_to_mime_type(IMAGETYPE_SWF));
+var_dump(image_type_to_mime_type(IMAGETYPE_PSD));
+var_dump(image_type_to_mime_type(IMAGETYPE_BMP));
+var_dump(image_type_to_mime_type(IMAGETYPE_TIFF_II));
+var_dump(image_type_to_mime_type(IMAGETYPE_TIFF_MM));
+var_dump(image_type_to_mime_type(IMAGETYPE_JPC));
+var_dump(image_type_to_mime_type(IMAGETYPE_JP2));
+var_dump(image_type_to_mime_type(IMAGETYPE_JPX));
+var_dump(image_type_to_mime_type(IMAGETYPE_JB2));
+var_dump(image_type_to_mime_type(IMAGETYPE_SWC));
+var_dump(image_type_to_mime_type(IMAGETYPE_IFF));
+var_dump(image_type_to_mime_type(IMAGETYPE_WBMP));
+var_dump(image_type_to_mime_type(IMAGETYPE_XBM));
+var_dump(image_type_to_mime_type(IMAGETYPE_ICO));
diff --git a/hphp/test/slow/ext_image/1792.php b/hphp/test/slow/ext_image/1792.php
index 92c6afe05..b4e40fc66 100644
--- a/hphp/test/slow/ext_image/1792.php
+++ b/hphp/test/slow/ext_image/1792.php
@@ -1,3 +1,10 @@
 <?php
 
- for ($i = 0; $i < 100000; $i++) {  $str =  exif_tagname($i);  if ($str) {    echo "$i: $str\n";  }}
\ No newline at end of file
+for ($i = 0;
+ $i < 100000;
+ $i++) {
+  $str =  exif_tagname($i);
+  if ($str) {
+    echo "$i: $str\n";
+  }
+}
diff --git a/hphp/test/slow/ext_image/1793.php b/hphp/test/slow/ext_image/1793.php
index 31d9c1c30..68590e2b9 100644
--- a/hphp/test/slow/ext_image/1793.php
+++ b/hphp/test/slow/ext_image/1793.php
@@ -1,3 +1,11 @@
 <?php
 
- $filename = 'test/images/test1pix.jpg';$image = exif_thumbnail($filename, $width, $height, $type);if ($image!==false) {  header('Content-type: ' .image_type_to_mime_type($type));  var_dump($width, $height, $type);} else {  echo 'No thumbnail available';}
\ No newline at end of file
+$filename = 'test/images/test1pix.jpg';
+$image = exif_thumbnail($filename, $width, $height, $type);
+if ($image!==false) {
+  header('Content-type: ' .image_type_to_mime_type($type));
+  var_dump($width, $height, $type);
+}
+ else {
+  echo 'No thumbnail available';
+}
diff --git a/hphp/test/slow/ext_iterator/1798.php b/hphp/test/slow/ext_iterator/1798.php
index c224a8533..3fd5e71e8 100644
--- a/hphp/test/slow/ext_iterator/1798.php
+++ b/hphp/test/slow/ext_iterator/1798.php
@@ -9,7 +9,8 @@ foreach (new DirectoryIterator($sample_dir.'/') as $file) {
 var_dump(count($files));
 
 $dir = new DirectoryIterator($sample_dir.'/');
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach ($dir as $fileinfo) {
   if (!$fileinfo->isDot()) {
     $files[] = $fileinfo->getFilename();
@@ -19,7 +20,8 @@ asort($files);
 var_dump(array_values($files));
 
 $iterator = new DirectoryIterator($sample_dir);
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach ($iterator as $fileinfo) {
   if ($fileinfo->isFile()) {
     $files[$fileinfo->getFilename()] = $fileinfo;
@@ -49,7 +51,8 @@ foreach ($files as $name => $fileinfo) {
 }
 
 $iterator = new RecursiveDirectoryIterator($sample_dir);
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach ($iterator as $fileinfo) {
   if ($fileinfo->isFile()) {
     $files[$fileinfo->getFilename()] = $fileinfo;
diff --git a/hphp/test/slow/ext_iterator/1799.php b/hphp/test/slow/ext_iterator/1799.php
index ba0985e47..7ddfb3a90 100644
--- a/hphp/test/slow/ext_iterator/1799.php
+++ b/hphp/test/slow/ext_iterator/1799.php
@@ -1,7 +1,8 @@
 <?php
 
 $dir = new DirectoryIterator(__DIR__.'/../../sample_dir');
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 while($dir->valid()) {
   if(!$dir->isDot()) {
     $files[] = $dir->current()."\n";
diff --git a/hphp/test/slow/ext_iterator/1800.php b/hphp/test/slow/ext_iterator/1800.php
index 431eaba63..6d19c53c3 100644
--- a/hphp/test/slow/ext_iterator/1800.php
+++ b/hphp/test/slow/ext_iterator/1800.php
@@ -3,7 +3,8 @@
 $ite=new RecursiveDirectoryIterator(__DIR__.'/../../sample_dir/');
 $bytestotal=0;
 $nbfiles=0;
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach ($ite as $filename=>$cur) {
   if (substr($filename,-1)=='.') continue;
   $filesize=$cur->getSize();
diff --git a/hphp/test/slow/ext_iterator/1801.php b/hphp/test/slow/ext_iterator/1801.php
index 45f99c55e..05d7ce9fb 100644
--- a/hphp/test/slow/ext_iterator/1801.php
+++ b/hphp/test/slow/ext_iterator/1801.php
@@ -3,7 +3,8 @@
 $ite=new RecursiveDirectoryIterator(__DIR__.'/../../sample_dir/');
 $bytestotal=0;
 $nbfiles=0;
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach (new RecursiveIteratorIterator($ite) as $filename=>$cur) {
   if (substr($filename,-1)=='.') continue;
   $filesize=$cur->getSize();
diff --git a/hphp/test/slow/ext_iterator/1802.php b/hphp/test/slow/ext_iterator/1802.php
index f5c812961..df4368c98 100644
--- a/hphp/test/slow/ext_iterator/1802.php
+++ b/hphp/test/slow/ext_iterator/1802.php
@@ -1,7 +1,8 @@
 <?php
 
 $path = __DIR__."/../../sample_dir/";
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach (new RecursiveIteratorIterator(
     new RecursiveDirectoryIterator($path,
       RecursiveDirectoryIterator::KEY_AS_PATHNAME),
diff --git a/hphp/test/slow/ext_iterator/1803.php b/hphp/test/slow/ext_iterator/1803.php
index 7a8937549..863a6e287 100644
--- a/hphp/test/slow/ext_iterator/1803.php
+++ b/hphp/test/slow/ext_iterator/1803.php
@@ -4,7 +4,8 @@ $directory = __DIR__."/../../sample_dir";
 $fileSPLObjects = new RecursiveIteratorIterator(
   new RecursiveDirectoryIterator($directory),
   RecursiveIteratorIterator::SELF_FIRST);
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach( $fileSPLObjects as $fullFileName => $fileSPLObject ) {
   if (substr($fullFileName,-1)=='.') continue;
   $files[] = $fullFileName . " " .$fileSPLObject->getFilename(). "\n";
@@ -15,7 +16,8 @@ var_dump(array_values($files));
 $fileSPLObjects = new RecursiveIteratorIterator(
   new RecursiveDirectoryIterator($directory),
   RecursiveIteratorIterator::CHILD_FIRST);
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach( $fileSPLObjects as $fullFileName => $fileSPLObject ) {
   if (substr($fullFileName,-1)=='.') continue;
   $files[] = $fullFileName . " " .$fileSPLObject->getFilename(). "\n";
@@ -26,7 +28,8 @@ var_dump(array_values($files));
 $fileSPLObjects = new RecursiveIteratorIterator(
   new RecursiveDirectoryIterator($directory),
   RecursiveIteratorIterator::LEAVES_ONLY);
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach( $fileSPLObjects as $fullFileName => $fileSPLObject ) {
   if (substr($fullFileName,-1)=='.') continue;
   $files[] = $fullFileName . " " .$fileSPLObject->getFilename(). "\n";
@@ -36,7 +39,8 @@ var_dump(array_values($files));
 
 // invalid mode -100$fileSPLObjects = new RecursiveIteratorIterator(
 //   new RecursiveDirectoryIterator($directory), -100);
-$files = array(); // order changes per machine
+$files = array();
+ // order changes per machine
 foreach( $fileSPLObjects as $fullFileName => $fileSPLObject ) {
   if (substr($fullFileName,-1)=='.') continue;
   $files[] = $fullFileName . " " .$fileSPLObject->getFilename(). "\n";
diff --git a/hphp/test/slow/ext_iterator/1804.php b/hphp/test/slow/ext_iterator/1804.php
index 4492aa67c..655d928ad 100644
--- a/hphp/test/slow/ext_iterator/1804.php
+++ b/hphp/test/slow/ext_iterator/1804.php
@@ -2,12 +2,17 @@
 
 function getFiles(&$rdi,$depth=0) {
   if (!is_object($rdi)) return;
-  $files = array(); // order changes per machine
-  for ($rdi->rewind(); $rdi->valid(); $rdi->next()) {
+  $files = array();
+ // order changes per machine
+  for ($rdi->rewind();
+ $rdi->valid();
+ $rdi->next()) {
     if ($rdi->isDot()) continue;
     if ($rdi->isDir() || $rdi->isFile()) {
       $indent = '';
-      for ($i = 0; $i<=$depth; ++$i) $indent .= " ";
+      for ($i = 0;
+ $i<=$depth;
+ ++$i) $indent .= " ";
       $files[] = $indent.$rdi->current()."\n";
       if ($rdi->hasChildren()) getFiles($rdi->getChildren(),1+$depth);
     }
diff --git a/hphp/test/slow/ext_iterator/1805.php b/hphp/test/slow/ext_iterator/1805.php
index 21eae67cf..e2e55514e 100644
--- a/hphp/test/slow/ext_iterator/1805.php
+++ b/hphp/test/slow/ext_iterator/1805.php
@@ -1,3 +1,10 @@
 <?php
 
- try {  $y = new RecursiveDirectoryIterator('/fake_path');  $z = new RecursiveIteratorIterator($y);  $z->next();} catch (UnexpectedValueException $e) {}var_dump('ok');
\ No newline at end of file
+try {
+  $y = new RecursiveDirectoryIterator('/fake_path');
+  $z = new RecursiveIteratorIterator($y);
+  $z->next();
+}
+ catch (UnexpectedValueException $e) {
+}
+var_dump('ok');
diff --git a/hphp/test/slow/ext_iterator/1806.php b/hphp/test/slow/ext_iterator/1806.php
index 974424b2e..3443570b5 100644
--- a/hphp/test/slow/ext_iterator/1806.php
+++ b/hphp/test/slow/ext_iterator/1806.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class EvensOnly extends FilterIterator {
   function __construct($it) {
     parent::__construct($it);
diff --git a/hphp/test/slow/ext_iterator/1807.php b/hphp/test/slow/ext_iterator/1807.php
index 11d2014ad..a2e61cdaa 100644
--- a/hphp/test/slow/ext_iterator/1807.php
+++ b/hphp/test/slow/ext_iterator/1807.php
@@ -1,10 +1,11 @@
 <?php
 
-
 class Proxy extends IteratorIterator {
   function __construct($i) {
     parent::__construct($i);
   }
 }
 $i = new Proxy(new ArrayIterator(range(0, 5)));
-foreach ($i as $v) { var_dump($v); }
+foreach ($i as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/ext_misc/1373.php b/hphp/test/slow/ext_misc/1373.php
index b87ade608..cc98534d4 100644
--- a/hphp/test/slow/ext_misc/1373.php
+++ b/hphp/test/slow/ext_misc/1373.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(pack('nvc*', 0x1234, 0x5678, 65, 66));
\ No newline at end of file
+var_dump(pack('nvc*', 0x1234, 0x5678, 65, 66));
diff --git a/hphp/test/slow/ext_misc/1374.php b/hphp/test/slow/ext_misc/1374.php
index 50bc05891..dd824338a 100644
--- a/hphp/test/slow/ext_misc/1374.php
+++ b/hphp/test/slow/ext_misc/1374.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(unpack('nfrist/vsecond/c2chars', pack('nvc*', 0x1234, 0x5678, 65, 66)));
\ No newline at end of file
+var_dump(unpack('nfrist/vsecond/c2chars', pack('nvc*', 0x1234, 0x5678, 65, 66)));
diff --git a/hphp/test/slow/ext_misc/1375.php b/hphp/test/slow/ext_misc/1375.php
index b0485bf5c..f2f42f963 100644
--- a/hphp/test/slow/ext_misc/1375.php
+++ b/hphp/test/slow/ext_misc/1375.php
@@ -1,6 +1,6 @@
 <?php
 
- $d=fopen(__DIR__.'/../../sample_dir/file', 'r');
+$d=fopen(__DIR__.'/../../sample_dir/file', 'r');
 var_dump(is_object($d));
 var_dump(is_resource($d));
 var_dump(gettype((string)$d));
diff --git a/hphp/test/slow/ext_misc/1376.php b/hphp/test/slow/ext_misc/1376.php
index 607ad896b..ee5bc6c95 100644
--- a/hphp/test/slow/ext_misc/1376.php
+++ b/hphp/test/slow/ext_misc/1376.php
@@ -1,3 +1,10 @@
 <?php
 
- class X {};$x = new X;$x->a = 1;$x->b = 'hello';$x->c = $x;var_dump(http_build_query($x));
\ No newline at end of file
+class X {
+}
+;
+$x = new X;
+$x->a = 1;
+$x->b = 'hello';
+$x->c = $x;
+var_dump(http_build_query($x));
diff --git a/hphp/test/slow/ext_misc/1377.php b/hphp/test/slow/ext_misc/1377.php
index f696631b8..07ce51408 100644
--- a/hphp/test/slow/ext_misc/1377.php
+++ b/hphp/test/slow/ext_misc/1377.php
@@ -1,3 +1,16 @@
 <?php
 
- function __autoload($c) {  var_dump($c);}function test() {  var_dump(is_subclass_of('C', 'D'));  var_dump(get_class_methods('C'));  var_dump(method_exists('C', 'foo'));  class C {}  var_dump(is_subclass_of('C', 'D'));  var_dump(is_subclass_of('C', 'C'));}test();var_dump(class_exists('C'));
\ No newline at end of file
+function __autoload($c) {
+  var_dump($c);
+}
+function test() {
+  var_dump(is_subclass_of('C', 'D'));
+  var_dump(get_class_methods('C'));
+  var_dump(method_exists('C', 'foo'));
+  class C {
+}
+  var_dump(is_subclass_of('C', 'D'));
+  var_dump(is_subclass_of('C', 'C'));
+}
+test();
+var_dump(class_exists('C'));
diff --git a/hphp/test/slow/ext_misc/1378.php b/hphp/test/slow/ext_misc/1378.php
index 8623a8f8f..226ba9d3f 100644
--- a/hphp/test/slow/ext_misc/1378.php
+++ b/hphp/test/slow/ext_misc/1378.php
@@ -1,3 +1,6 @@
 <?php
 
- var_dump(hex2bin(";lwekn"));var_dump(hex2bin("68656c6c6f"));var_dump(hex2bin("68656c6c6f6"));
\ No newline at end of file
+var_dump(hex2bin(";
+lwekn"));
+var_dump(hex2bin("68656c6c6f"));
+var_dump(hex2bin("68656c6c6f6"));
diff --git a/hphp/test/slow/ext_misc/1379.php b/hphp/test/slow/ext_misc/1379.php
index 7e00ab6f2..b6ff6b073 100644
--- a/hphp/test/slow/ext_misc/1379.php
+++ b/hphp/test/slow/ext_misc/1379.php
@@ -1,8 +1,11 @@
 <?php
 
-
 var_dump(token_name(396));
-$str = "<?php \$x=<foo:bar/>;\$y=<foo:bar>woo!</foo:bar>;\n";
+$str = "<?php
+
+\$x=<foo:bar/>;
+\$y=<foo:bar>woo!</foo:bar>;
+\n";
 $arr = token_get_all($str);
 foreach ($arr as $t) {
   if ($t[0] == 396) {
diff --git a/hphp/test/slow/ext_soap/1808.php b/hphp/test/slow/ext_soap/1808.php
index 106adf685..35e70042b 100644
--- a/hphp/test/slow/ext_soap/1808.php
+++ b/hphp/test/slow/ext_soap/1808.php
@@ -1,3 +1,9 @@
 <?php
 
- function add($a, $b) { return $a + $b; }$server = new SoapServer(NULL, array('uri' => 'http://test-uri'));$str = '<?xml version="1.0" '.       'encoding="ISO-8859-1"?>'.       '<SOAP-ENV:Envelope SOAP-ENV:encodingStyle='.       '"http://schemas.xmlsoap.org/soap/encoding/"'.       ' xmlns:SOAP-ENV='.       '"http://schemas.xmlsoap.org/soap/envelope/"'.       ' xmlns:xsd="http://www.w3.org/2001/XMLSchema"'.       ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.       ' xmlns:si="http://soapinterop.org/xsd"><SOAP-ENV:Body>'.       '<ns1:Add xmlns:ns1="http://testuri.org">'.       '<x xsi:type="xsd:hexBinary">16</x>'.       '<y xsi:type="xsd:hexBinary">21</y>'.       '</ns1:Add>  </SOAP-ENV:Body></SOAP-ENV:Envelope>';$server->addFunction('Add');$server->handle($str);
\ No newline at end of file
+function add($a, $b) {
+ return $a + $b;
+ }
+$server = new SoapServer(NULL, array('uri' => 'http://test-uri'));
+$str = '<?xml version="1.0" '.       'encoding="ISO-8859-1"?>'.       '<SOAP-ENV:Envelope SOAP-ENV:encodingStyle='.       '"http://schemas.xmlsoap.org/soap/encoding/"'.       ' xmlns:SOAP-ENV='.       '"http://schemas.xmlsoap.org/soap/envelope/"'.       ' xmlns:xsd="http://www.w3.org/2001/XMLSchema"'.       ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.       ' xmlns:si="http://soapinterop.org/xsd"><SOAP-ENV:Body>'.       '<ns1:Add xmlns:ns1="http://testuri.org">'.       '<x xsi:type="xsd:hexBinary">16</x>'.       '<y xsi:type="xsd:hexBinary">21</y>'.       '</ns1:Add>  </SOAP-ENV:Body></SOAP-ENV:Envelope>';
+$server->addFunction('Add');
+$server->handle($str);
diff --git a/hphp/test/slow/ext_soap/1809.php b/hphp/test/slow/ext_soap/1809.php
index 4e61f44bb..2250365d2 100644
--- a/hphp/test/slow/ext_soap/1809.php
+++ b/hphp/test/slow/ext_soap/1809.php
@@ -1,6 +1,6 @@
 <?php
 
- class MySoap extends SoapClient {
+class MySoap extends SoapClient {
    public $pub = 1;
    public function __doRequest($request, $location, $action, $version, $one_way=0) {
      $rp = parent::__doRequest($request, $location, $action, $version, $one_way);
diff --git a/hphp/test/slow/ext_socket/1811.php b/hphp/test/slow/ext_socket/1811.php
index c504097c3..309ef1c05 100644
--- a/hphp/test/slow/ext_socket/1811.php
+++ b/hphp/test/slow/ext_socket/1811.php
@@ -1,3 +1,4 @@
 <?php
 
- $r = socket_create(AF_INET, SOCK_RAW, 0);var_dump(socket_last_error());
\ No newline at end of file
+$r = socket_create(AF_INET, SOCK_RAW, 0);
+var_dump(socket_last_error());
diff --git a/hphp/test/slow/ext_spl_file/1797.php b/hphp/test/slow/ext_spl_file/1797.php
index 7d658315b..f2b485a40 100644
--- a/hphp/test/slow/ext_spl_file/1797.php
+++ b/hphp/test/slow/ext_spl_file/1797.php
@@ -1,3 +1,12 @@
 <?php
 
- $info = new SplFileInfo('does-not-exist-will-fail-on-getLinkTarget');//readlink('does-not-throw-but-warns');try{  $info->getLinkTarget();}catch (Exception $e) {  echo 'Caught exception: ',  $e->getMessage(), "\n";  return;}echo "failed to throw\n";  return true;}
\ No newline at end of file
+$info = new SplFileInfo('does-not-exist-will-fail-on-getLinkTarget');
+//readlink('does-not-throw-but-warns');
+try{
+  $info->getLinkTarget();
+}
+catch (Exception $e) {
+  echo 'Caught exception: ',  $e->getMessage(), "\n";
+  return;
+}
+echo "failed to throw\n";
diff --git a/hphp/test/slow/ext_spl_file/1797.php.expect b/hphp/test/slow/ext_spl_file/1797.php.expect
index e69de29bb..8047b4254 100644
--- a/hphp/test/slow/ext_spl_file/1797.php.expect
+++ b/hphp/test/slow/ext_spl_file/1797.php.expect
@@ -0,0 +1 @@
+Caught exception: Unable to read link does-not-exist-will-fail-on-getLinkTarget, error: no such file or directory
diff --git a/hphp/test/slow/ext_string/1761.php b/hphp/test/slow/ext_string/1761.php
index cbb8eebc2..c9d4d04fd 100644
--- a/hphp/test/slow/ext_string/1761.php
+++ b/hphp/test/slow/ext_string/1761.php
@@ -1,3 +1,7 @@
 <?php
 
- var_dump(strtr("", "ll", "a"));var_dump(strtr("hello", "", "a"));var_dump(strtr("hello", "ll", "a"));var_dump(strtr("hello", array("" => "a")));var_dump(strtr("hello", array("ll" => "a")));
\ No newline at end of file
+var_dump(strtr("", "ll", "a"));
+var_dump(strtr("hello", "", "a"));
+var_dump(strtr("hello", "ll", "a"));
+var_dump(strtr("hello", array("" => "a")));
+var_dump(strtr("hello", array("ll" => "a")));
diff --git a/hphp/test/slow/ext_string/1762.php b/hphp/test/slow/ext_string/1762.php
index b9ec55171..8496776cd 100644
--- a/hphp/test/slow/ext_string/1762.php
+++ b/hphp/test/slow/ext_string/1762.php
@@ -1,3 +1,15 @@
 <?php
 
- var_dump(explode('', ''));$str = 'Hello Friend';var_dump(str_split($str, -3));var_dump(chunk_split('-=blender=-', -3, '-=blender=-')); var_dump(strpbrk('hello', ''));var_dump(substr_count('hello', ''));var_dump(substr_count('hello', 'o', -1));var_dump(substr_count('hello', 'o', 2, -1));var_dump(substr_count('hello', 'o', 2, 100));var_dump(count_chars('hello', 100));var_dump(str_word_count('hello', 100));var_dump(strtr('hello', 100));var_dump(implode('abcd', 'abcd'));
\ No newline at end of file
+var_dump(explode('', ''));
+$str = 'Hello Friend';
+var_dump(str_split($str, -3));
+var_dump(chunk_split('-=blender=-', -3, '-=blender=-'));
+ var_dump(strpbrk('hello', ''));
+var_dump(substr_count('hello', ''));
+var_dump(substr_count('hello', 'o', -1));
+var_dump(substr_count('hello', 'o', 2, -1));
+var_dump(substr_count('hello', 'o', 2, 100));
+var_dump(count_chars('hello', 100));
+var_dump(str_word_count('hello', 100));
+var_dump(strtr('hello', 100));
+var_dump(implode('abcd', 'abcd'));
diff --git a/hphp/test/slow/ext_string/1763.php b/hphp/test/slow/ext_string/1763.php
index e588152b9..9d0334c6b 100644
--- a/hphp/test/slow/ext_string/1763.php
+++ b/hphp/test/slow/ext_string/1763.php
@@ -1,3 +1,30 @@
 <?php
 
- error_reporting(0);var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', array(0)));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', array(0), 3));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', array(0), 1.0));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', array(0), null));$obj = new stdClass();var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', 0, $obj));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', '0', '1.0'));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', '0.0', 1.0));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', '0.0', 1));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', 0.0, '1'));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob',                        array(0), array(1)));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', array('bob'),                        array(0), array(3,4)));var_dump(substr_replace('ABCDEFGH:/MNRPQR/', array('bob'),                        array(0), array(3)));var_dump(substr_replace(array('ABCDEFGH:/MNRPQR/'), array(),                        array(0,1), array(3, 4)));var_dump(substr_replace(array('ABCDEFGH:/MNRPQR/'), array('bob'),                        array(0,1), array(3)));var_dump(substr_replace(array('ABCDEFGH:/MNRPQR/'),                        array('bob', 'cat'), 0));var_dump(substr_replace(array('ABCDEFGH:/MNRPQR/'),                        array('bob'), array(0,1)));var_dump(substr_replace('abc', 'xyz', 3, 0));var_dump(sscanf("SN/2350001", "SN/%d"));var_dump(sscanf("SN/2350001", "SN/%d", $out));var_dump($out);var_dump(sscanf("SN/abc", "SN/%d", $out));var_dump($out);var_dump(sscanf("30", "%da", $out));var_dump($out);var_dump(sscanf("-", "%da", $out));var_dump($out);
\ No newline at end of file
+error_reporting(0);
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', array(0)));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', array(0), 3));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', array(0), 1.0));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', array(0), null));
+$obj = new stdClass();
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', 0, $obj));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', '0', '1.0'));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', '0.0', 1.0));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', '0.0', 1));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob', 0.0, '1'));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', 'bob',                        array(0), array(1)));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', array('bob'),                        array(0), array(3,4)));
+var_dump(substr_replace('ABCDEFGH:/MNRPQR/', array('bob'),                        array(0), array(3)));
+var_dump(substr_replace(array('ABCDEFGH:/MNRPQR/'), array(),                        array(0,1), array(3, 4)));
+var_dump(substr_replace(array('ABCDEFGH:/MNRPQR/'), array('bob'),                        array(0,1), array(3)));
+var_dump(substr_replace(array('ABCDEFGH:/MNRPQR/'),                        array('bob', 'cat'), 0));
+var_dump(substr_replace(array('ABCDEFGH:/MNRPQR/'),                        array('bob'), array(0,1)));
+var_dump(substr_replace('abc', 'xyz', 3, 0));
+var_dump(sscanf("SN/2350001", "SN/%d"));
+var_dump(sscanf("SN/2350001", "SN/%d", $out));
+var_dump($out);
+var_dump(sscanf("SN/abc", "SN/%d", $out));
+var_dump($out);
+var_dump(sscanf("30", "%da", $out));
+var_dump($out);
+var_dump(sscanf("-", "%da", $out));
+var_dump($out);
diff --git a/hphp/test/slow/ext_string/1764.php b/hphp/test/slow/ext_string/1764.php
index 134c9e2b1..8d9be4acd 100644
--- a/hphp/test/slow/ext_string/1764.php
+++ b/hphp/test/slow/ext_string/1764.php
@@ -1,4 +1,3 @@
 <?php
 
-
 preg_replace("/(..)/e", 'var_dump("$1")', '""');
diff --git a/hphp/test/slow/ext_string/1765.php b/hphp/test/slow/ext_string/1765.php
index 098a3bfdb..02111b53c 100644
--- a/hphp/test/slow/ext_string/1765.php
+++ b/hphp/test/slow/ext_string/1765.php
@@ -1,6 +1,5 @@
 <?php
 
-
 var_dump(str_replace(array(65), array('a'), 'axAX'));
 var_dump(str_ireplace(array(65), array('a'), 'axAX'));
 echo "**************************\n";
diff --git a/hphp/test/slow/file/1682.php b/hphp/test/slow/file/1682.php
index 1180b00b8..b4734ac5b 100644
--- a/hphp/test/slow/file/1682.php
+++ b/hphp/test/slow/file/1682.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function main() {
   file_put_contents("/tmp/temp.txt",
                     "put this in the txt file\n");
diff --git a/hphp/test/slow/file/1683.php b/hphp/test/slow/file/1683.php
index b41b16413..493487565 100644
--- a/hphp/test/slow/file/1683.php
+++ b/hphp/test/slow/file/1683.php
@@ -1,3 +1,23 @@
 <?php
 
- $fh = fopen('php://output', 'w');if (!$fh) {  throw new Exception('foo');}fprintf($fh, "hello\n");var_dump(fflush($fh));var_dump(fclose($fh));$fh = fopen('php://output', 'a');if (!$fh) {  throw new Exception('foo');}fprintf($fh, "hello\n");var_dump(fflush($fh));var_dump(fclose($fh));$fh = fopen('php://output', 'r');if (!$fh) {  throw new Exception('foo');}fprintf($fh, "hello\n");var_dump(fflush($fh));var_dump(fclose($fh));
\ No newline at end of file
+$fh = fopen('php://output', 'w');
+if (!$fh) {
+  throw new Exception('foo');
+}
+fprintf($fh, "hello\n");
+var_dump(fflush($fh));
+var_dump(fclose($fh));
+$fh = fopen('php://output', 'a');
+if (!$fh) {
+  throw new Exception('foo');
+}
+fprintf($fh, "hello\n");
+var_dump(fflush($fh));
+var_dump(fclose($fh));
+$fh = fopen('php://output', 'r');
+if (!$fh) {
+  throw new Exception('foo');
+}
+fprintf($fh, "hello\n");
+var_dump(fflush($fh));
+var_dump(fclose($fh));
diff --git a/hphp/test/slow/file/1685.php b/hphp/test/slow/file/1685.php
index 48eb8d22a..d826ed6e3 100644
--- a/hphp/test/slow/file/1685.php
+++ b/hphp/test/slow/file/1685.php
@@ -1,3 +1,4 @@
 <?php
 
- $f = fopen('php://stdout', 'w');fprintf($f, 'stdout');
\ No newline at end of file
+$f = fopen('php://stdout', 'w');
+fprintf($f, 'stdout');
diff --git a/hphp/test/slow/file/1686.php b/hphp/test/slow/file/1686.php
index e49f4ab39..7023d94ae 100644
--- a/hphp/test/slow/file/1686.php
+++ b/hphp/test/slow/file/1686.php
@@ -1,3 +1,22 @@
 <?php
 
- $input = fopen('/tmp/junk.txt', 'w+');fwrite($input, 'hello world');fseek($input, 0);$output = fopen('php://memory', 'w+');stream_copy_to_stream($input, $output);fseek($output, 0);$bytes = fread($output, 1024);print "From file, without Maxlen: <".serialize($bytes).">.\n";fseek($input, 0);$output = fopen('php://memory', 'w+');stream_copy_to_stream($input, $output, null);fseek($output, 0);$bytes = fread($output, 1024);print "From file, using Maxlen null: <".serialize($bytes).">.\n";fseek($input, 0);$output = fopen('php://memory', 'w+');stream_copy_to_stream($input, $output, -1);fseek($output, 0);$bytes = fread($output, 1024);print "From file, using Maxlen -1: <".serialize($bytes).">.\n";
\ No newline at end of file
+$input = fopen('/tmp/junk.txt', 'w+');
+fwrite($input, 'hello world');
+fseek($input, 0);
+$output = fopen('php://memory', 'w+');
+stream_copy_to_stream($input, $output);
+fseek($output, 0);
+$bytes = fread($output, 1024);
+print "From file, without Maxlen: <".serialize($bytes).">.\n";
+fseek($input, 0);
+$output = fopen('php://memory', 'w+');
+stream_copy_to_stream($input, $output, null);
+fseek($output, 0);
+$bytes = fread($output, 1024);
+print "From file, using Maxlen null: <".serialize($bytes).">.\n";
+fseek($input, 0);
+$output = fopen('php://memory', 'w+');
+stream_copy_to_stream($input, $output, -1);
+fseek($output, 0);
+$bytes = fread($output, 1024);
+print "From file, using Maxlen -1: <".serialize($bytes).">.\n";
diff --git a/hphp/test/slow/file/1687.php b/hphp/test/slow/file/1687.php
index 225018f7e..a54ffe659 100644
--- a/hphp/test/slow/file/1687.php
+++ b/hphp/test/slow/file/1687.php
@@ -1,3 +1,6 @@
 <?php
 
- $tmp_dir='/tmp/tcr_tmp_dir'.getmypid();mkdir($tmp_dir);print_r(glob($tmp_dir.'/*'));rmdir($tmp_dir);
\ No newline at end of file
+$tmp_dir='/tmp/tcr_tmp_dir'.getmypid();
+mkdir($tmp_dir);
+print_r(glob($tmp_dir.'/*'));
+rmdir($tmp_dir);
diff --git a/hphp/test/slow/file/1688.php b/hphp/test/slow/file/1688.php
index 6752a7e2a..a3b8d3dbc 100644
--- a/hphp/test/slow/file/1688.php
+++ b/hphp/test/slow/file/1688.php
@@ -1,3 +1,14 @@
 <?php
 
- $src = tmpfile();$dst = tmpfile();fwrite($src, 'a');fseek($src, 0);stream_copy_to_stream($src, $dst);fseek($dst, 0);$str = stream_get_contents($dst);fseek($src, 0);stream_copy_to_stream($src, $dst);fseek($dst, 0);$str = stream_get_contents($dst);echo $str;
\ No newline at end of file
+$src = tmpfile();
+$dst = tmpfile();
+fwrite($src, 'a');
+fseek($src, 0);
+stream_copy_to_stream($src, $dst);
+fseek($dst, 0);
+$str = stream_get_contents($dst);
+fseek($src, 0);
+stream_copy_to_stream($src, $dst);
+fseek($dst, 0);
+$str = stream_get_contents($dst);
+echo $str;
diff --git a/hphp/test/slow/file/1689.php b/hphp/test/slow/file/1689.php
index 5765f6ac9..07fe0b16a 100644
--- a/hphp/test/slow/file/1689.php
+++ b/hphp/test/slow/file/1689.php
@@ -1,3 +1,11 @@
 <?php
 
- define('FILENAME', '/tmp/flock_file.dat');function flock_or_die($filename, $resource, $flock_op) {  $r = flock($resource, $flock_op);  var_dump($r); }$resource = fopen(FILENAME, 'w');flock_or_die(FILENAME, $resource, LOCK_EX);flock_or_die(FILENAME, $resource, LOCK_UN);unlink(FILENAME);
\ No newline at end of file
+define('FILENAME', '/tmp/flock_file.dat');
+function flock_or_die($filename, $resource, $flock_op) {
+  $r = flock($resource, $flock_op);
+  var_dump($r);
+ }
+$resource = fopen(FILENAME, 'w');
+flock_or_die(FILENAME, $resource, LOCK_EX);
+flock_or_die(FILENAME, $resource, LOCK_UN);
+unlink(FILENAME);
diff --git a/hphp/test/slow/file/1690.php b/hphp/test/slow/file/1690.php
index dc6900d4b..2e2f34a3e 100644
--- a/hphp/test/slow/file/1690.php
+++ b/hphp/test/slow/file/1690.php
@@ -1,3 +1,7 @@
 <?php
 
- $h = popen("echo foo; exit 2", 'r');$content = stream_get_contents($h);$result = pclose($h);echo trim($content)."/".$result."/".gettype($result)."\n";
\ No newline at end of file
+$h = popen("echo foo;
+ exit 2", 'r');
+$content = stream_get_contents($h);
+$result = pclose($h);
+echo trim($content)."/".$result."/".gettype($result)."\n";
diff --git a/hphp/test/slow/file/1692.php b/hphp/test/slow/file/1692.php
index 90a3fa2c1..bd41d4c51 100644
--- a/hphp/test/slow/file/1692.php
+++ b/hphp/test/slow/file/1692.php
@@ -1,3 +1,4 @@
 <?php
 
- $fp = fopen('test/nonexist.txt', 'r');var_dump(pclose($fp));
\ No newline at end of file
+$fp = fopen('test/nonexist.txt', 'r');
+var_dump(pclose($fp));
diff --git a/hphp/test/slow/file/1693.php b/hphp/test/slow/file/1693.php
index 048d35a18..b3b733b1a 100644
--- a/hphp/test/slow/file/1693.php
+++ b/hphp/test/slow/file/1693.php
@@ -1,3 +1,5 @@
 <?php
 
- fclose(STDOUT);echo 'test';ob_start();
\ No newline at end of file
+fclose(STDOUT);
+echo 'test';
+ob_start();
diff --git a/hphp/test/slow/file/1694.php b/hphp/test/slow/file/1694.php
index 161c8af2d..25aa5388a 100644
--- a/hphp/test/slow/file/1694.php
+++ b/hphp/test/slow/file/1694.php
@@ -1,3 +1,4 @@
 <?php
 
- define('BAR','Some Value');var_dump(parse_ini_string('foo=BAR'));
\ No newline at end of file
+define('BAR','Some Value');
+var_dump(parse_ini_string('foo=BAR'));
diff --git a/hphp/test/slow/get_class/1455.php b/hphp/test/slow/get_class/1455.php
index 3a6d09492..0a0c60b05 100644
--- a/hphp/test/slow/get_class/1455.php
+++ b/hphp/test/slow/get_class/1455.php
@@ -1,3 +1,18 @@
 <?php
 
- class foo {  function bar () {    var_dump(get_class());    var_dump(get_class(null));  }}class foo2 extends foo {}$f1 = new foo;$f2 = new foo2;var_dump(get_class($f1));$f1->bar();$f2->bar();var_dump(get_class("qwerty"));var_dump(get_class($f1));var_dump(get_class($f2));
\ No newline at end of file
+class foo {
+  function bar () {
+    var_dump(get_class());
+    var_dump(get_class(null));
+  }
+}
+class foo2 extends foo {
+}
+$f1 = new foo;
+$f2 = new foo2;
+var_dump(get_class($f1));
+$f1->bar();
+$f2->bar();
+var_dump(get_class("qwerty"));
+var_dump(get_class($f1));
+var_dump(get_class($f2));
diff --git a/hphp/test/slow/get_class/1456.php b/hphp/test/slow/get_class/1456.php
index 9ed150cad..741d20591 100644
--- a/hphp/test/slow/get_class/1456.php
+++ b/hphp/test/slow/get_class/1456.php
@@ -1,3 +1,11 @@
 <?php
 
- abstract class bar {  public function __construct()  {    var_dump(get_class($this));    var_dump(get_class());  }}class foo extends bar {}new foo;
\ No newline at end of file
+abstract class bar {
+  public function __construct()  {
+    var_dump(get_class($this));
+    var_dump(get_class());
+  }
+}
+class foo extends bar {
+}
+new foo;
diff --git a/hphp/test/slow/get_object_vars/1533.php b/hphp/test/slow/get_object_vars/1533.php
index 91470c3b8..63ab116e1 100644
--- a/hphp/test/slow/get_object_vars/1533.php
+++ b/hphp/test/slow/get_object_vars/1533.php
@@ -1,3 +1,12 @@
 <?php
 
- class Base{  public    $aaa = 1;  protected $bbb = 2;  private   $ccc = 3;}class Child extends Base{  private   $ddd = 4;}var_dump(get_object_vars(new Base()));var_dump(get_object_vars(new Child()));
\ No newline at end of file
+class Base{
+  public    $aaa = 1;
+  protected $bbb = 2;
+  private   $ccc = 3;
+}
+class Child extends Base{
+  private   $ddd = 4;
+}
+var_dump(get_object_vars(new Base()));
+var_dump(get_object_vars(new Child()));
diff --git a/hphp/test/slow/get_object_vars/1534.php b/hphp/test/slow/get_object_vars/1534.php
index e61189e96..b51178af8 100644
--- a/hphp/test/slow/get_object_vars/1534.php
+++ b/hphp/test/slow/get_object_vars/1534.php
@@ -1,3 +1,20 @@
 <?php
 
- class Base{  public    $aaa = 1;  protected $bbb = 2;  private   $ccc = 3;}class Child extends Base{  public    $ddd = 4;}class Unrelated{  function foo($obj) {    var_dump(get_object_vars($obj));  }}$base_obj = new Base();$child_obj = new Child();$unrelated_obj = new Unrelated();$unrelated_obj->foo($child_obj);$unrelated_obj->foo($base_obj);
\ No newline at end of file
+class Base{
+  public    $aaa = 1;
+  protected $bbb = 2;
+  private   $ccc = 3;
+}
+class Child extends Base{
+  public    $ddd = 4;
+}
+class Unrelated{
+  function foo($obj) {
+    var_dump(get_object_vars($obj));
+  }
+}
+$base_obj = new Base();
+$child_obj = new Child();
+$unrelated_obj = new Unrelated();
+$unrelated_obj->foo($child_obj);
+$unrelated_obj->foo($base_obj);
diff --git a/hphp/test/slow/get_object_vars/1535.php b/hphp/test/slow/get_object_vars/1535.php
index 99793a543..f8ce5c49e 100644
--- a/hphp/test/slow/get_object_vars/1535.php
+++ b/hphp/test/slow/get_object_vars/1535.php
@@ -1,3 +1,19 @@
 <?php
 
- class Base{  public    $aaa = 1;  protected $bbb = 2;  private   $ccc = 3;  function foo($obj) {    var_dump(get_class($obj));    var_dump(get_object_vars($obj));  }}class Child extends Base{  public    $ddd = 4;  protected $eee = 5;  private   $fff = 6;}$base_obj = new Base();$child_obj = new Child();$base_obj->foo($child_obj);
\ No newline at end of file
+class Base{
+  public    $aaa = 1;
+  protected $bbb = 2;
+  private   $ccc = 3;
+  function foo($obj) {
+    var_dump(get_class($obj));
+    var_dump(get_object_vars($obj));
+  }
+}
+class Child extends Base{
+  public    $ddd = 4;
+  protected $eee = 5;
+  private   $fff = 6;
+}
+$base_obj = new Base();
+$child_obj = new Child();
+$base_obj->foo($child_obj);
diff --git a/hphp/test/slow/get_object_vars/1536.php b/hphp/test/slow/get_object_vars/1536.php
index bafbb8903..5a9794288 100644
--- a/hphp/test/slow/get_object_vars/1536.php
+++ b/hphp/test/slow/get_object_vars/1536.php
@@ -1,3 +1,18 @@
 <?php
 
- class Base{  public    $aaa = 1;  protected $bbb = 2;  private   $ccc = 3;  function foo($obj) {    var_dump(get_class($obj));    var_dump(get_object_vars($obj));  }}class Child extends Base{  public    $ddd = 5;  protected $eee = 6;  private   $fff = 4;}$base_obj = new Base();$base_obj->foo($base_obj);
\ No newline at end of file
+class Base{
+  public    $aaa = 1;
+  protected $bbb = 2;
+  private   $ccc = 3;
+  function foo($obj) {
+    var_dump(get_class($obj));
+    var_dump(get_object_vars($obj));
+  }
+}
+class Child extends Base{
+  public    $ddd = 5;
+  protected $eee = 6;
+  private   $fff = 4;
+}
+$base_obj = new Base();
+$base_obj->foo($base_obj);
diff --git a/hphp/test/slow/get_object_vars/1537.php b/hphp/test/slow/get_object_vars/1537.php
index 621c66e8b..42e66fdba 100644
--- a/hphp/test/slow/get_object_vars/1537.php
+++ b/hphp/test/slow/get_object_vars/1537.php
@@ -1,3 +1,19 @@
 <?php
 
- class Base{  public    $aaa = 1;  protected $bbb = 2;  private   $ccc = 3;}class Child extends Base{  public    $ddd = 4;  protected $eee = 5;  private   $fff = 6;  function foo($obj) {    var_dump(get_class($obj));    var_dump(get_object_vars($obj));  }}$child_obj = new Child();$base_obj = new Base();$child_obj->foo($base_obj);
\ No newline at end of file
+class Base{
+  public    $aaa = 1;
+  protected $bbb = 2;
+  private   $ccc = 3;
+}
+class Child extends Base{
+  public    $ddd = 4;
+  protected $eee = 5;
+  private   $fff = 6;
+  function foo($obj) {
+    var_dump(get_class($obj));
+    var_dump(get_object_vars($obj));
+  }
+}
+$child_obj = new Child();
+$base_obj = new Base();
+$child_obj->foo($base_obj);
diff --git a/hphp/test/slow/get_object_vars/1538.php b/hphp/test/slow/get_object_vars/1538.php
index 7e28f9fd1..f0a46d32b 100644
--- a/hphp/test/slow/get_object_vars/1538.php
+++ b/hphp/test/slow/get_object_vars/1538.php
@@ -1,3 +1,6 @@
 <?php
 
- var_dump(get_object_vars(false));var_dump(get_object_vars(true));var_dump(get_object_vars('hello'));var_dump(get_object_vars(5));
\ No newline at end of file
+var_dump(get_object_vars(false));
+var_dump(get_object_vars(true));
+var_dump(get_object_vars('hello'));
+var_dump(get_object_vars(5));
diff --git a/hphp/test/slow/get_parent_class/1457.php b/hphp/test/slow/get_parent_class/1457.php
index 06678377e..1fd15e073 100644
--- a/hphp/test/slow/get_parent_class/1457.php
+++ b/hphp/test/slow/get_parent_class/1457.php
@@ -1,4 +1,19 @@
 <?php
 
- class dad {  function dad()  {}}class child extends dad {  function child()  {    echo "I'm " , get_parent_class($this) , "'s son\n";  }}class child2 extends dad {  function child2()  {    echo "I'm " , get_parent_class('child2') , "'s son too
-";  }}$foo = new child();$bar = new child2();
\ No newline at end of file
+class dad {
+  function dad()  {
+}
+}
+class child extends dad {
+  function child()  {
+    echo "I'm " , get_parent_class($this) , "'s son\n";
+  }
+}
+class child2 extends dad {
+  function child2()  {
+    echo "I'm " , get_parent_class('child2') , "'s son too
+";
+  }
+}
+$foo = new child();
+$bar = new child2();
diff --git a/hphp/test/slow/get_parent_class/1458.php b/hphp/test/slow/get_parent_class/1458.php
index 473c0cd02..4ca489bdf 100644
--- a/hphp/test/slow/get_parent_class/1458.php
+++ b/hphp/test/slow/get_parent_class/1458.php
@@ -1,3 +1,42 @@
 <?php
 
- interface i {  function test();}class foo implements i {  function test() {    var_dump(get_parent_class());  }}class bar extends foo {  function test_bar() {    var_dump(get_parent_class());  }}class goo extends bar {  function test_goo() {    var_dump(get_parent_class());  }}$bar = new bar;$foo = new foo;$goo = new goo;$foo->test();$bar->test();$bar->test_bar();$goo->test();$goo->test_bar();$goo->test_goo();var_dump(get_parent_class($bar));var_dump(get_parent_class($foo));var_dump(get_parent_class($goo));var_dump(get_parent_class("bar"));var_dump(get_parent_class("foo"));var_dump(get_parent_class("goo"));var_dump(get_parent_class("i"));var_dump(get_parent_class(""));var_dump(get_parent_class("[[[["));var_dump(get_parent_class(" "));var_dump(get_parent_class(new stdclass));var_dump(get_parent_class(array()));var_dump(get_parent_class(1));
\ No newline at end of file
+interface i {
+  function test();
+}
+class foo implements i {
+  function test() {
+    var_dump(get_parent_class());
+  }
+}
+class bar extends foo {
+  function test_bar() {
+    var_dump(get_parent_class());
+  }
+}
+class goo extends bar {
+  function test_goo() {
+    var_dump(get_parent_class());
+  }
+}
+$bar = new bar;
+$foo = new foo;
+$goo = new goo;
+$foo->test();
+$bar->test();
+$bar->test_bar();
+$goo->test();
+$goo->test_bar();
+$goo->test_goo();
+var_dump(get_parent_class($bar));
+var_dump(get_parent_class($foo));
+var_dump(get_parent_class($goo));
+var_dump(get_parent_class("bar"));
+var_dump(get_parent_class("foo"));
+var_dump(get_parent_class("goo"));
+var_dump(get_parent_class("i"));
+var_dump(get_parent_class(""));
+var_dump(get_parent_class("[[[["));
+var_dump(get_parent_class(" "));
+var_dump(get_parent_class(new stdclass));
+var_dump(get_parent_class(array()));
+var_dump(get_parent_class(1));
diff --git a/hphp/test/slow/global_statement/1388.php b/hphp/test/slow/global_statement/1388.php
index 25d933546..e0d90bdd6 100644
--- a/hphp/test/slow/global_statement/1388.php
+++ b/hphp/test/slow/global_statement/1388.php
@@ -1,6 +1,5 @@
 <?php
 
-
 global $c;
 function &foo() {
   $a = 5;
diff --git a/hphp/test/slow/global_statement/1389.php b/hphp/test/slow/global_statement/1389.php
index d78c1d523..0c2848dc3 100644
--- a/hphp/test/slow/global_statement/1389.php
+++ b/hphp/test/slow/global_statement/1389.php
@@ -1,3 +1,14 @@
 <?php
 
- $global_var = 10;function test_unset() {  global $global_var;  var_dump( isset($global_var) );  var_dump( empty($global_var) );  unset($global_var);  var_dump( isset($global_var) );  var_dump( empty($global_var) ); }var_dump($global_var);test_unset();var_dump($global_var);
\ No newline at end of file
+$global_var = 10;
+function test_unset() {
+  global $global_var;
+  var_dump( isset($global_var) );
+  var_dump( empty($global_var) );
+  unset($global_var);
+  var_dump( isset($global_var) );
+  var_dump( empty($global_var) );
+ }
+var_dump($global_var);
+test_unset();
+var_dump($global_var);
diff --git a/hphp/test/slow/global_statement/1390.php b/hphp/test/slow/global_statement/1390.php
index e76e2d0a2..e70b43fe9 100644
--- a/hphp/test/slow/global_statement/1390.php
+++ b/hphp/test/slow/global_statement/1390.php
@@ -1,3 +1,10 @@
 <?php
 
- $a = 0;function test() {  $a = 1;  if (true) global $a;  $a = 2;}test();print "$a\n";
\ No newline at end of file
+$a = 0;
+function test() {
+  $a = 1;
+  if (true) global $a;
+  $a = 2;
+}
+test();
+print "$a\n";
diff --git a/hphp/test/slow/global_statement/1391.php b/hphp/test/slow/global_statement/1391.php
index 944b1fcb1..b5142f9e8 100644
--- a/hphp/test/slow/global_statement/1391.php
+++ b/hphp/test/slow/global_statement/1391.php
@@ -1,3 +1,12 @@
 <?php
 
- $a = 1;function test() {  $b = 1;  global $a;  $a = 10;}var_dump($a);test();var_dump($a);  return true;
\ No newline at end of file
+$a = 1;
+function test() {
+  $b = 1;
+  global $a;
+  $a = 10;
+}
+var_dump($a);
+test();
+var_dump($a);
+  return true;
diff --git a/hphp/test/slow/global_statement/1392.php b/hphp/test/slow/global_statement/1392.php
index 6108722cd..de844a94f 100644
--- a/hphp/test/slow/global_statement/1392.php
+++ b/hphp/test/slow/global_statement/1392.php
@@ -1,3 +1,10 @@
 <?php
 
- function test() {  if (true) {    global $a;    $a = 10;  }}test();var_dump($a);
\ No newline at end of file
+function test() {
+  if (true) {
+    global $a;
+    $a = 10;
+  }
+}
+test();
+var_dump($a);
diff --git a/hphp/test/slow/global_statement/1393.php b/hphp/test/slow/global_statement/1393.php
index 5e58b6735..5fbd79fe5 100644
--- a/hphp/test/slow/global_statement/1393.php
+++ b/hphp/test/slow/global_statement/1393.php
@@ -1,3 +1,12 @@
 <?php
 
- $x = 1;$GLOBALS['x'] = 2;var_dump($x);function test() {  global $x;  $x = 3;  $GLOBALS['x'] = 4;  var_dump($x);}test();
\ No newline at end of file
+$x = 1;
+$GLOBALS['x'] = 2;
+var_dump($x);
+function test() {
+  global $x;
+  $x = 3;
+  $GLOBALS['x'] = 4;
+  var_dump($x);
+}
+test();
diff --git a/hphp/test/slow/goto/1909.php b/hphp/test/slow/goto/1909.php
index ddc069c0c..7ce24748e 100644
--- a/hphp/test/slow/goto/1909.php
+++ b/hphp/test/slow/goto/1909.php
@@ -1,3 +1,5 @@
 <?php
 
- goto a; echo 'Foo'; a: echo 'Bar';
\ No newline at end of file
+goto a;
+ echo 'Foo';
+ a: echo 'Bar';
diff --git a/hphp/test/slow/goto/1910.php b/hphp/test/slow/goto/1910.php
index f9d882d61..46513fe44 100644
--- a/hphp/test/slow/goto/1910.php
+++ b/hphp/test/slow/goto/1910.php
@@ -1,3 +1,8 @@
 <?php
 
- function foo() { goto a; echo 'Foo'; a: echo 'Bar';} foo();
\ No newline at end of file
+function foo() {
+ goto a;
+ echo 'Foo';
+ a: echo 'Bar';
+}
+ foo();
diff --git a/hphp/test/slow/goto/1911.php b/hphp/test/slow/goto/1911.php
index dc1f273f9..5ecb17f76 100644
--- a/hphp/test/slow/goto/1911.php
+++ b/hphp/test/slow/goto/1911.php
@@ -1,3 +1,10 @@
 <?php
 
- function foo() { goto a; b: echo 'Foo'; return;a: echo 'Bar'; goto b;} foo();
\ No newline at end of file
+function foo() {
+ goto a;
+ b: echo 'Foo';
+ return;
+a: echo 'Bar';
+ goto b;
+}
+ foo();
diff --git a/hphp/test/slow/goto/1912.php b/hphp/test/slow/goto/1912.php
index d1a395f52..0cbd3f853 100644
--- a/hphp/test/slow/goto/1912.php
+++ b/hphp/test/slow/goto/1912.php
@@ -1,3 +1,11 @@
 <?php
 
- for($i=0,$j=50; $i<100; $i++) {  while($j--) { if($j==17) goto end; }} echo 'no'; end: echo 'yes';
\ No newline at end of file
+for($i=0,$j=50;
+ $i<100;
+ $i++) {
+  while($j--) {
+ if($j==17) goto end;
+ }
+}
+ echo 'no';
+ end: echo 'yes';
diff --git a/hphp/test/slow/goto/1913.php b/hphp/test/slow/goto/1913.php
index 144aa2903..fa28f225c 100644
--- a/hphp/test/slow/goto/1913.php
+++ b/hphp/test/slow/goto/1913.php
@@ -1,3 +1,7 @@
 <?php
 
- goto a; if (false) { a: print 'here';} 
\ No newline at end of file
+goto a;
+ if (false) {
+ a: print 'here';
+}
+
diff --git a/hphp/test/slow/goto/1914.php b/hphp/test/slow/goto/1914.php
index dedb69b6e..d883bd9e6 100644
--- a/hphp/test/slow/goto/1914.php
+++ b/hphp/test/slow/goto/1914.php
@@ -1,3 +1,3 @@
 <?php
 
- my_lbl: print 'here';
\ No newline at end of file
+my_lbl: print 'here';
diff --git a/hphp/test/slow/goto/1915.php b/hphp/test/slow/goto/1915.php
index 5b60d09c4..81ae854a8 100644
--- a/hphp/test/slow/goto/1915.php
+++ b/hphp/test/slow/goto/1915.php
@@ -1,7 +1,8 @@
 <?php
 
-
-function fcn() { return true; }
+function fcn() {
+ return true;
+ }
 class X {
   function f($x) {
     goto over_switch;
diff --git a/hphp/test/slow/goto/1916.php b/hphp/test/slow/goto/1916.php
index 330e3f586..a39f8358d 100644
--- a/hphp/test/slow/goto/1916.php
+++ b/hphp/test/slow/goto/1916.php
@@ -1,3 +1,47 @@
 <?php
 
- class MyException extends Exception {}class MyOtherException extends Exception {}function baz($x) {  var_dump('baz: ' . $x);  if (($x & 7) == 5) throw new Exception('regular');  if (($x & 7) == 6) throw new MyException('mine');  if (($x & 7) == 7) throw new MyOtherException('other');}function foo($t) {  $e = $m = $q = new Exception('none');  if ($t & 8) {    switch ($t & 3) {      case 0: goto l0;      case 1: goto l1;      case 2: goto l2;      case 3: goto l3;    }  }  try {    var_dump('begin try1');    l0: var_dump('l0');    try {      var_dump('begin try2');      l1: var_dump('l1');      baz($t);      var_dump('after baz');    } catch (MyOtherException $q) {      var_dump($q->getMessage());    }    var_dump('after try2');  } catch (Exception $e) {    l2: var_dump($e->getMessage());  } catch (MyException $m) {    l3: var_dump($m->getMessage());  }  var_dump('after try1');}for ($i = 0; $i < 16; $i++) foo($i);
\ No newline at end of file
+class MyException extends Exception {
+}
+class MyOtherException extends Exception {
+}
+function baz($x) {
+  var_dump('baz: ' . $x);
+  if (($x & 7) == 5) throw new Exception('regular');
+  if (($x & 7) == 6) throw new MyException('mine');
+  if (($x & 7) == 7) throw new MyOtherException('other');
+}
+function foo($t) {
+  $e = $m = $q = new Exception('none');
+  if ($t & 8) {
+    switch ($t & 3) {
+      case 0: goto l0;
+      case 1: goto l1;
+      case 2: goto l2;
+      case 3: goto l3;
+    }
+  }
+  try {
+    var_dump('begin try1');
+    l0: var_dump('l0');
+    try {
+      var_dump('begin try2');
+      l1: var_dump('l1');
+      baz($t);
+      var_dump('after baz');
+    }
+ catch (MyOtherException $q) {
+      var_dump($q->getMessage());
+    }
+    var_dump('after try2');
+  }
+ catch (Exception $e) {
+    l2: var_dump($e->getMessage());
+  }
+ catch (MyException $m) {
+    l3: var_dump($m->getMessage());
+  }
+  var_dump('after try1');
+}
+for ($i = 0;
+ $i < 16;
+ $i++) foo($i);
diff --git a/hphp/test/slow/goto/1917.php b/hphp/test/slow/goto/1917.php
index c4a17a408..7e7e09801 100644
--- a/hphp/test/slow/goto/1917.php
+++ b/hphp/test/slow/goto/1917.php
@@ -1,3 +1,68 @@
 <?php
 
- function g($x) {  var_dump($x);  if ($x == 123) {    throw new Exception();  }}function f($x) {  if ($x == 1) {    goto mylabel1;  } else if ($x == 2) {    goto mylabel2;  } else if ($x == 3) {    goto mylabel3;  } else if ($x == 4) {    goto mylabel4;  }  try {    g($x);    echo "Should not get here\n";    try {      try {        mylabel1:        g($x);      } catch (exception $e) {        echo "1a\n";      }      try {        mylabel2:        g($x);      } catch (exception $e) {        echo "1b\n";      }    } catch (exception $e) {      echo "1\n";    }    try {      try {        mylabel3:        g($x);      } catch (exception $e) {        echo "2a\n";      }      try {        mylabel4:        g($x);      } catch (exception $e) {        echo "2b\n";      }    } catch (exception $e) {      echo "2\n";    }  } catch (Exception $e) {    echo "0\n";  }}f(1);f(2);f(3);f(4);f(123);
\ No newline at end of file
+function g($x) {
+  var_dump($x);
+  if ($x == 123) {
+    throw new Exception();
+  }
+}
+function f($x) {
+  if ($x == 1) {
+    goto mylabel1;
+  }
+ else if ($x == 2) {
+    goto mylabel2;
+  }
+ else if ($x == 3) {
+    goto mylabel3;
+  }
+ else if ($x == 4) {
+    goto mylabel4;
+  }
+  try {
+    g($x);
+    echo "Should not get here\n";
+    try {
+      try {
+        mylabel1:        g($x);
+      }
+ catch (exception $e) {
+        echo "1a\n";
+      }
+      try {
+        mylabel2:        g($x);
+      }
+ catch (exception $e) {
+        echo "1b\n";
+      }
+    }
+ catch (exception $e) {
+      echo "1\n";
+    }
+    try {
+      try {
+        mylabel3:        g($x);
+      }
+ catch (exception $e) {
+        echo "2a\n";
+      }
+      try {
+        mylabel4:        g($x);
+      }
+ catch (exception $e) {
+        echo "2b\n";
+      }
+    }
+ catch (exception $e) {
+      echo "2\n";
+    }
+  }
+ catch (Exception $e) {
+    echo "0\n";
+  }
+}
+f(1);
+f(2);
+f(3);
+f(4);
+f(123);
diff --git a/hphp/test/slow/hack_mode/2205.php b/hphp/test/slow/hack_mode/2205.php
index efc9e87cb..f18fa5587 100644
--- a/hphp/test/slow/hack_mode/2205.php
+++ b/hphp/test/slow/hack_mode/2205.php
@@ -1,2 +1,5 @@
 <?hh
-function t(X $a) { echo 1; } t(42);
+function t(X $a) {
+ echo 1;
+ }
+ t(42);
diff --git a/hphp/test/slow/hack_mode/2205.php.expectf b/hphp/test/slow/hack_mode/2205.php.expectf
index e49ff03b8..56e3e8b13 100644
--- a/hphp/test/slow/hack_mode/2205.php.expectf
+++ b/hphp/test/slow/hack_mode/2205.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Argument 1 passed to t() must be an instance of X, int given in %s/hphp/test/slow/hack_mode/2205.php on line 2
+HipHop Fatal error: Argument 1 passed to t() must be an instance of X, int given in %s/hphp/test/slow/hack_mode/2205.php on line 4
diff --git a/hphp/test/slow/hack_mode/2206.php b/hphp/test/slow/hack_mode/2206.php
index 38062be8f..060b53cb7 100644
--- a/hphp/test/slow/hack_mode/2206.php
+++ b/hphp/test/slow/hack_mode/2206.php
@@ -1,2 +1,5 @@
 <?hh
-function t(?X $a) { echo 1; } t(42);
+function t(?X $a) {
+ echo 1;
+ }
+ t(42);
diff --git a/hphp/test/slow/hack_mode/2207.php b/hphp/test/slow/hack_mode/2207.php
index e10800845..055dbc977 100644
--- a/hphp/test/slow/hack_mode/2207.php
+++ b/hphp/test/slow/hack_mode/2207.php
@@ -1,2 +1,5 @@
 <?hh
-function t<X>(X $a) { echo 1; } t(42);
+function t<X>(X $a) {
+ echo 1;
+ }
+ t(42);
diff --git a/hphp/test/slow/hack_mode/2208.php b/hphp/test/slow/hack_mode/2208.php
index ebb7306b0..2936219cd 100644
--- a/hphp/test/slow/hack_mode/2208.php
+++ b/hphp/test/slow/hack_mode/2208.php
@@ -1,2 +1,3 @@
 <?hh
-class C<T as I>{}
+class C<T as I>{
+}
diff --git a/hphp/test/slow/hack_mode/2209.php b/hphp/test/slow/hack_mode/2209.php
index 4ca3a02d2..593c81ca4 100644
--- a/hphp/test/slow/hack_mode/2209.php
+++ b/hphp/test/slow/hack_mode/2209.php
@@ -1,2 +1,5 @@
 <?hh
-function foo(@int $x){ echo 1; } foo('hi');
+function foo(@int $x){
+ echo 1;
+ }
+ foo('hi');
diff --git a/hphp/test/slow/hack_mode/2210.php b/hphp/test/slow/hack_mode/2210.php
index 26ed58bbc..015c9acd7 100644
--- a/hphp/test/slow/hack_mode/2210.php
+++ b/hphp/test/slow/hack_mode/2210.php
@@ -1,2 +1,3 @@
 <?hh
-function foo(): Map<int, ?Vector<int>> {}
+function foo(): Map<int, ?Vector<int>> {
+}
diff --git a/hphp/test/slow/hack_mode/2211.php b/hphp/test/slow/hack_mode/2211.php
index b0ae2edc3..b93dad204 100644
--- a/hphp/test/slow/hack_mode/2211.php
+++ b/hphp/test/slow/hack_mode/2211.php
@@ -1,2 +1,3 @@
 <?hh
-function foo(array<int> $x) {}
+function foo(array<int> $x) {
+}
diff --git a/hphp/test/slow/hack_mode/2212.php b/hphp/test/slow/hack_mode/2212.php
index d5cd2c306..4582bf7b0 100644
--- a/hphp/test/slow/hack_mode/2212.php
+++ b/hphp/test/slow/hack_mode/2212.php
@@ -1,2 +1,3 @@
 <?hh
-function foo(array<string, int> $x) {}
+function foo(array<string, int> $x) {
+}
diff --git a/hphp/test/slow/hack_mode/2213.php b/hphp/test/slow/hack_mode/2213.php
index 1c7c5b05c..ce4f7501e 100644
--- a/hphp/test/slow/hack_mode/2213.php
+++ b/hphp/test/slow/hack_mode/2213.php
@@ -2,14 +2,22 @@
 function vidx<X>(blarg<X> $list, int $idx):X {
   return $list->d[$idx];
 }
-function pair<X,Y>(X $x, Y $y):(X,Y) { return array($x, $y); }
+function pair<X,Y>(X $x, Y $y):(X,Y) {
+ return array($x, $y);
+ }
 function car<X,Y>((X,?Y) $pair):X {
   return $pair[0];
 }
 interface Face<A> {
 }
-class blarg<X> { function __construct($x) { $this->d = $x; } }
-function blarg<X>(/*...*/):blarg<X> { return new blarg(func_get_args()); }
+class blarg<X> {
+ function __construct($x) {
+ $this->d = $x;
+ }
+ }
+function blarg<X>(/*...*/):blarg<X> {
+ return new blarg(func_get_args());
+ }
 
 class Foo<X> implements Face<X> {
   const string BLEH = "b";
@@ -22,5 +30,8 @@ function right_shift_hack(Foo<Foo<Foo<Foo<Foo<Foo<Foo<Foo<Foo<Foo<Foo>,Foo>>,Foo
 }
 
 $a = blarg('a','aa','aaa');
-$d = (function():UNICORNS{return 'd';});
+$d = (function():UNICORNS{
+return 'd';
+}
+);
 echo vidx($a, 0), Foo::BLEH, car($blork), $d();
diff --git a/hphp/test/slow/hack_mode/hh-1.php b/hphp/test/slow/hack_mode/hh-1.php
index 00a2c97e0..a3e6b3e8f 100644
--- a/hphp/test/slow/hack_mode/hh-1.php
+++ b/hphp/test/slow/hack_mode/hh-1.php
@@ -1,4 +1,8 @@
 <?php
-function foo(Vector<int> $a) {}
-function bar(string $x) { echo $x . "\n"; }
+
+function foo(Vector<int> $a) {
+}
+function bar(string $x) {
+ echo $x . "\n";
+ }
 bar("Done");
diff --git a/hphp/test/slow/hack_mode/hh-2.php b/hphp/test/slow/hack_mode/hh-2.php
index 301225c29..94a60c333 100644
--- a/hphp/test/slow/hack_mode/hh-2.php
+++ b/hphp/test/slow/hack_mode/hh-2.php
@@ -1,4 +1,7 @@
 <?hh
-function foo(Vector<int> $a) {}
-function bar(string $x) { echo $x . "\n"; }
+function foo(Vector<int> $a) {
+}
+function bar(string $x) {
+ echo $x . "\n";
+ }
 bar("Done");
diff --git a/hphp/test/slow/hack_mode/hh-3.php b/hphp/test/slow/hack_mode/hh-3.php
index 6d32e3f4f..b215ff05d 100644
--- a/hphp/test/slow/hack_mode/hh-3.php
+++ b/hphp/test/slow/hack_mode/hh-3.php
@@ -1,7 +1,11 @@
 <?php
+
 eval(<<<'EOD'
-function foo(Vector<int> $a) {}
-function bar(string $x) { echo $x . "\n"; }
+function foo(Vector<int> $a) {
+}
+function bar(string $x) {
+ echo $x . "\n";
+ }
 bar("Done");
 EOD
 );
diff --git a/hphp/test/slow/here_doc/1234.php b/hphp/test/slow/here_doc/1234.php
index 59b0e0f25..5294e76fd 100644
--- a/hphp/test/slow/here_doc/1234.php
+++ b/hphp/test/slow/here_doc/1234.php
@@ -1,11 +1,12 @@
 <?php
 
-
 $nullherequote= <<<fail
 fail;
-echo "--$nullherequote--\n";$x="foo";$threestops= <<<pass
+echo "--$nullherequote--\n";
+$x="foo";
+$threestops= <<<pass
 passable $x
 pass;x
 ss;
 pass;
-echo "$threestops\n";
\ No newline at end of file
+echo "$threestops\n";
diff --git a/hphp/test/slow/hint/2187.php b/hphp/test/slow/hint/2187.php
index 4ddbc5438..e880be47a 100644
--- a/hphp/test/slow/hint/2187.php
+++ b/hphp/test/slow/hint/2187.php
@@ -1,3 +1,22 @@
 <?php
 
- class bool{}class boolean{}class int{}class integer{}class double{}class float{}class real{}class string {}function foo(bool $b1, boolean $b2,             int $i1, integer $i2,             double $d1, float $d2, real $d3,             string $s) {  var_dump(func_get_args());}foo(new bool, new boolean,    new int, new integer,    new double, new float, new real,    new string);
\ No newline at end of file
+class bool{
+}
+class boolean{
+}
+class int{
+}
+class integer{
+}
+class double{
+}
+class float{
+}
+class real{
+}
+class string {
+}
+function foo(bool $b1, boolean $b2,             int $i1, integer $i2,             double $d1, float $d2, real $d3,             string $s) {
+  var_dump(func_get_args());
+}
+foo(new bool, new boolean,    new int, new integer,    new double, new float, new real,    new string);
diff --git a/hphp/test/slow/hint/2188.php b/hphp/test/slow/hint/2188.php
index c66104b23..958ed64e7 100644
--- a/hphp/test/slow/hint/2188.php
+++ b/hphp/test/slow/hint/2188.php
@@ -1,8 +1,18 @@
 <?php
 
-
-function f1(int $i = 1) { var_dump($i); }
-function f2(double $d = 5.5) { var_dump($d); }
-function f3(bool $b = true) { var_dump($b); }
-function f4(string $s = 'hello') { var_dump($s); }
-f1(); f2(); f3(); f4();
+function f1(int $i = 1) {
+ var_dump($i);
+ }
+function f2(double $d = 5.5) {
+ var_dump($d);
+ }
+function f3(bool $b = true) {
+ var_dump($b);
+ }
+function f4(string $s = 'hello') {
+ var_dump($s);
+ }
+f1();
+ f2();
+ f3();
+ f4();
diff --git a/hphp/test/slow/hint/2189.php b/hphp/test/slow/hint/2189.php
index d028354d0..dc358af0d 100644
--- a/hphp/test/slow/hint/2189.php
+++ b/hphp/test/slow/hint/2189.php
@@ -1,3 +1,10 @@
 <?php
 
- g(DATE_COOKIE);f(count(array()));function f(int $i) {  var_dump($i);}function g(string $s) {  var_dump($s);}
\ No newline at end of file
+g(DATE_COOKIE);
+f(count(array()));
+function f(int $i) {
+  var_dump($i);
+}
+function g(string $s) {
+  var_dump($s);
+}
diff --git a/hphp/test/slow/hint/2190.php b/hphp/test/slow/hint/2190.php
index 542e5356f..7152efc9c 100644
--- a/hphp/test/slow/hint/2190.php
+++ b/hphp/test/slow/hint/2190.php
@@ -1,4 +1,10 @@
 <?php
 
-
-class Foo {  const BAR = 1;}function test(int $a = -Foo::BAR) {return $a;}var_dump(test());var_dump(test(2));
\ No newline at end of file
+class Foo {
+  const BAR = 1;
+}
+function test(int $a = -Foo::BAR) {
+return $a;
+}
+var_dump(test());
+var_dump(test(2));
diff --git a/hphp/test/slow/hint/2191.php b/hphp/test/slow/hint/2191.php
index 50fed3fed..1b0b28410 100644
--- a/hphp/test/slow/hint/2191.php
+++ b/hphp/test/slow/hint/2191.php
@@ -1,23 +1,74 @@
 <?php
 
+class C{
+}
+function f1(string $x = null) {
+$y = (string) $x;
+ var_dump($y);
+ return $y;
+ }
+function f2(array $x = null) {
+$y = (array) $x;
+ var_dump($y);
+ return $y;
+ }
+function f3(C $x = null) {
+$y = (object) $x;
+ var_dump($y);
+ return $y;
+ }
+function f4(int $x = null) {
+$y = (int) $x;
+ var_dump($y);
+ return $y;
+ }
+function f5(bool $x = null) {
+$y = (bool) $x;
+ var_dump($y);
+ return $y;
+ }
+function f6(double $x = null) {
+$y = (double) $x;
+ var_dump($y);
+ return $y;
+ }
+var_dump(f1());
+ var_dump(f2());
+ var_dump(f3());
 
-class C{}
-function f1(string $x = null) {$y = (string) $x; var_dump($y); return $y; }
-function f2(array $x = null) {$y = (array) $x; var_dump($y); return $y; }
-function f3(C $x = null) {$y = (object) $x; var_dump($y); return $y; }
-function f4(int $x = null) {$y = (int) $x; var_dump($y); return $y; }
-function f5(bool $x = null) {$y = (bool) $x; var_dump($y); return $y; }
-function f6(double $x = null) {$y = (double) $x; var_dump($y); return $y; }
-var_dump(f1()); var_dump(f2()); var_dump(f3()); 
-var_dump(f4()); var_dump(f5()); var_dump(f6());
-var_dump(f1(null)); var_dump(f2(null)); var_dump(f3(null));
-var_dump(f4(null)); var_dump(f5(null)); var_dump(f6(null));
-function rf1($x) { if ($x) return 'f1'; return 0; }
-function rf2($x) { if ($x) return 'f2'; return 0; }
-function rf3($x) { if ($x) return 'f3'; return 0; }
-function rf4($x) { if ($x) return 'f4'; return 0; }
-function rf5($x) { if ($x) return 'f5'; return 0; }
-function rf6($x) { if ($x) return 'f6'; return 0; }
+var_dump(f4());
+ var_dump(f5());
+ var_dump(f6());
+var_dump(f1(null));
+ var_dump(f2(null));
+ var_dump(f3(null));
+var_dump(f4(null));
+ var_dump(f5(null));
+ var_dump(f6(null));
+function rf1($x) {
+ if ($x) return 'f1';
+ return 0;
+ }
+function rf2($x) {
+ if ($x) return 'f2';
+ return 0;
+ }
+function rf3($x) {
+ if ($x) return 'f3';
+ return 0;
+ }
+function rf4($x) {
+ if ($x) return 'f4';
+ return 0;
+ }
+function rf5($x) {
+ if ($x) return 'f5';
+ return 0;
+ }
+function rf6($x) {
+ if ($x) return 'f6';
+ return 0;
+ }
 var_dump(call_user_func(rf1(true)));
 var_dump(call_user_func(rf2(true)));
 var_dump(call_user_func(rf3(true)));
diff --git a/hphp/test/slow/hint/2192.php b/hphp/test/slow/hint/2192.php
index 08f2a6d17..3b64aecdb 100644
--- a/hphp/test/slow/hint/2192.php
+++ b/hphp/test/slow/hint/2192.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $WHICH = 0;
 function decide() {
   global $WHICH;
@@ -13,7 +12,8 @@ if (decide()) {
       yield 1;
     }
   }
-} else {
+}
+ else {
   class X {
     public function generator() {
       yield 1;
diff --git a/hphp/test/slow/hint/2193.php b/hphp/test/slow/hint/2193.php
index 34e564c91..a358b9343 100644
--- a/hphp/test/slow/hint/2193.php
+++ b/hphp/test/slow/hint/2193.php
@@ -1,15 +1,17 @@
 <?php
 
-
-class C {}
-class D {}
+class C {
+}
+class D {
+}
 class X {
   public function f($x1, $x2 = null, $x3 = 123, string $x4,
                     string $x5 = null, string $x6 = "abc",
-                    array $x7, array $x8 = null, C $x9, 
-                    D $x10 = null, bool $x11, boolean $x12 = true, 
-                    int $x13, integer $x14 = 73, real $x15, 
-                    double $x16 = 1.5, float $x17) {}
+                    array $x7, array $x8 = null, C $x9,
+                    D $x10 = null, bool $x11, boolean $x12 = true,
+                    int $x13, integer $x14 = 73, real $x15,
+                    double $x16 = 1.5, float $x17) {
+}
 }
 function main() {
   $rc = new ReflectionClass('X');
diff --git a/hphp/test/slow/hint/2194.php b/hphp/test/slow/hint/2194.php
index a7bd4c23a..2454eeef7 100644
--- a/hphp/test/slow/hint/2194.php
+++ b/hphp/test/slow/hint/2194.php
@@ -1,27 +1,50 @@
 <?php
 
-
 function f1() {
-  $a = Vector {11, 22};
-  $b = Vector {33, 44};
+  $a = Vector {
+11, 22}
+;
+  $b = Vector {
+33, 44}
+;
   $a->addAll($b);
   var_dump($a);
 }
 function f2() {
-  $a = Vector {11, 22};
-  $b = StableMap {'a' => 33, 'b' => 44};
+  $a = Vector {
+11, 22}
+;
+  $b = StableMap {
+'a' => 33, 'b' => 44}
+;
   $a->addAll($b);
   var_dump($a);
 }
 function f3() {
-  $a = StableMap {'a' => 11, 'b' => 22};
-  $b = Vector {Pair {'e', 33}, Pair {'f', 44}};
+  $a = StableMap {
+'a' => 11, 'b' => 22}
+;
+  $b = Vector {
+Pair {
+'e', 33}
+, Pair {
+'f', 44}
+}
+;
   $a->addAll($b);
   var_dump($a);
 }
 function f4() {
-  $a = StableMap {'a' => 11, 'b' => 22};
-  $b = StableMap {'c' => Pair {'e', 33}, 'd' => Pair {'f', 44}};
+  $a = StableMap {
+'a' => 11, 'b' => 22}
+;
+  $b = StableMap {
+'c' => Pair {
+'e', 33}
+, 'd' => Pair {
+'f', 44}
+}
+;
   $a->addAll($b);
   var_dump($a);
 }
diff --git a/hphp/test/slow/hint/2195.php b/hphp/test/slow/hint/2195.php
index 6ea04c466..5338d6f4b 100644
--- a/hphp/test/slow/hint/2195.php
+++ b/hphp/test/slow/hint/2195.php
@@ -1,29 +1,44 @@
 <?php
 
-
 function f1() {
-  $a = Vector {};
+  $a = Vector {
+}
+;
   $a->resize(4, null);
-  $b = Vector {42, 73};
+  $b = Vector {
+42, 73}
+;
   $a->setAll($b);
   var_dump($a);
 }
 function f2() {
-  $a = Vector {};
+  $a = Vector {
+}
+;
   $a->resize(4, null);
-  $b = Map {3 => 42, 2 => 73};
+  $b = Map {
+3 => 42, 2 => 73}
+;
   $a->setAll($b);
   var_dump($a);
 }
 function f3() {
-  $a = StableMap {};
-  $b = Vector {42, 73};
+  $a = StableMap {
+}
+;
+  $b = Vector {
+42, 73}
+;
   $a->setAll($b);
   var_dump($a);
 }
 function f4() {
-  $a = StableMap {};
-  $b = StableMap {3 => 42, 2 => 73};
+  $a = StableMap {
+}
+;
+  $b = StableMap {
+3 => 42, 2 => 73}
+;
   $a->setAll($b);
   var_dump($a);
 }
diff --git a/hphp/test/slow/hoisting/1866.php b/hphp/test/slow/hoisting/1866.php
index 74b688d69..ddbde770c 100644
--- a/hphp/test/slow/hoisting/1866.php
+++ b/hphp/test/slow/hoisting/1866.php
@@ -1,5 +1,8 @@
 <?php
 
-
 var_dump(class_exists('C'));
-class C implements Countable { function count() { return 0; } }
+class C implements Countable {
+ function count() {
+ return 0;
+ }
+ }
diff --git a/hphp/test/slow/hoisting/1867.php b/hphp/test/slow/hoisting/1867.php
index becd45fc1..99f2971a6 100644
--- a/hphp/test/slow/hoisting/1867.php
+++ b/hphp/test/slow/hoisting/1867.php
@@ -1,5 +1,8 @@
 <?php
 
-
-class C implements Countable { function count() { return 0; } }
+class C implements Countable {
+ function count() {
+ return 0;
+ }
+ }
 var_dump(class_exists('C'));
diff --git a/hphp/test/slow/hoisting/1868.php b/hphp/test/slow/hoisting/1868.php
index 0f4508fe1..174554d26 100644
--- a/hphp/test/slow/hoisting/1868.php
+++ b/hphp/test/slow/hoisting/1868.php
@@ -1,6 +1,8 @@
 <?php
 
-
 var_dump(class_exists('C'));
-trait t { }
-class C { use t; }
+trait t {
+ }
+class C {
+ use t;
+ }
diff --git a/hphp/test/slow/hoisting/1869.php b/hphp/test/slow/hoisting/1869.php
index e5e16119a..89fdc30fa 100644
--- a/hphp/test/slow/hoisting/1869.php
+++ b/hphp/test/slow/hoisting/1869.php
@@ -1,6 +1,8 @@
 <?php
 
-
-trait t { }
-class C { use t; }
+trait t {
+ }
+class C {
+ use t;
+ }
 var_dump(class_exists('C'));
diff --git a/hphp/test/slow/if_statement/1411.php b/hphp/test/slow/if_statement/1411.php
index b41b5002c..9f1487db0 100644
--- a/hphp/test/slow/if_statement/1411.php
+++ b/hphp/test/slow/if_statement/1411.php
@@ -1,3 +1,113 @@
 <?php
 
- if (false) {  echo "case 1\n";}if (false) {  echo "case 2\n";  function f1() {    $v = 1;  }}if (true) {  echo "case 3\n";}if (true) {  echo "case 4\n";  function f2() {    $v = 1;  }}if (true) {  echo "case 5\n";} else {  echo "case 6\n";}if (true) {  echo "case 7\n";} else {  echo "case 8\n";  function f3() {    $v = 1;  }}if ($a) {  echo "case 9\n";} elseif (true) {  echo "case 10\n";  function f4() {    $v = 1;  }} else {  echo "case 11\n";}if ($a) {  echo "case 12\n";} elseif (true) {  echo "case 13\n";} else {  echo "case 14\n";  function f5() {    $v = 1;  }}if ($a) {  echo "case 15\n";} elseif (true) {  echo "case 16\n";} elseif (true) {  echo "case 17\n";  function f6() {    $v = 1;  }} else {  echo "case 18\n";}if ($a) {  echo "case 19\n";} elseif (true) {  echo "case 20\n";} elseif (true) {  echo "case 21\n";  function f7() {    $v = 1;  }}if ($a) {  echo "case 22\n";} elseif (true) {  echo "case 23\n";} elseif (false) {  echo "case 24\n";  function f8() {    $v = 1;  }} else {  echo "case 25\n";}if ($a) {  echo "case 26\n";} elseif (true) {  echo "case 27\n";} elseif (false) {  echo "case 28\n";  function f9() {    $v = 1;  }}
\ No newline at end of file
+if (false) {
+  echo "case 1\n";
+}
+if (false) {
+  echo "case 2\n";
+  function f1() {
+    $v = 1;
+  }
+}
+if (true) {
+  echo "case 3\n";
+}
+if (true) {
+  echo "case 4\n";
+  function f2() {
+    $v = 1;
+  }
+}
+if (true) {
+  echo "case 5\n";
+}
+ else {
+  echo "case 6\n";
+}
+if (true) {
+  echo "case 7\n";
+}
+ else {
+  echo "case 8\n";
+  function f3() {
+    $v = 1;
+  }
+}
+if ($a) {
+  echo "case 9\n";
+}
+ elseif (true) {
+  echo "case 10\n";
+  function f4() {
+    $v = 1;
+  }
+}
+ else {
+  echo "case 11\n";
+}
+if ($a) {
+  echo "case 12\n";
+}
+ elseif (true) {
+  echo "case 13\n";
+}
+ else {
+  echo "case 14\n";
+  function f5() {
+    $v = 1;
+  }
+}
+if ($a) {
+  echo "case 15\n";
+}
+ elseif (true) {
+  echo "case 16\n";
+}
+ elseif (true) {
+  echo "case 17\n";
+  function f6() {
+    $v = 1;
+  }
+}
+ else {
+  echo "case 18\n";
+}
+if ($a) {
+  echo "case 19\n";
+}
+ elseif (true) {
+  echo "case 20\n";
+}
+ elseif (true) {
+  echo "case 21\n";
+  function f7() {
+    $v = 1;
+  }
+}
+if ($a) {
+  echo "case 22\n";
+}
+ elseif (true) {
+  echo "case 23\n";
+}
+ elseif (false) {
+  echo "case 24\n";
+  function f8() {
+    $v = 1;
+  }
+}
+ else {
+  echo "case 25\n";
+}
+if ($a) {
+  echo "case 26\n";
+}
+ elseif (true) {
+  echo "case 27\n";
+}
+ elseif (false) {
+  echo "case 28\n";
+  function f9() {
+    $v = 1;
+  }
+}
diff --git a/hphp/test/slow/if_statement/1412.php b/hphp/test/slow/if_statement/1412.php
index 66770f3a0..35c055f63 100644
--- a/hphp/test/slow/if_statement/1412.php
+++ b/hphp/test/slow/if_statement/1412.php
@@ -1,3 +1,12 @@
 <?php
 
- if (true) {  function foo() { echo "foo\n"; }} else if (false) {  function bar() { echo "bar\n"; }}
\ No newline at end of file
+if (true) {
+  function foo() {
+ echo "foo\n";
+ }
+}
+ else if (false) {
+  function bar() {
+ echo "bar\n";
+ }
+}
diff --git a/hphp/test/slow/if_statement/1413.php b/hphp/test/slow/if_statement/1413.php
index 54ab47862..8c21f6709 100644
--- a/hphp/test/slow/if_statement/1413.php
+++ b/hphp/test/slow/if_statement/1413.php
@@ -1,3 +1,12 @@
 <?php
 
- if (true) {  function foo() { echo "foo\n"; }} elseif (false) {  function bar() { echo "bar\n"; }}
\ No newline at end of file
+if (true) {
+  function foo() {
+ echo "foo\n";
+ }
+}
+ elseif (false) {
+  function bar() {
+ echo "bar\n";
+ }
+}
diff --git a/hphp/test/slow/if_statement/1414.php b/hphp/test/slow/if_statement/1414.php
index 5c6beeff7..195ba3507 100644
--- a/hphp/test/slow/if_statement/1414.php
+++ b/hphp/test/slow/if_statement/1414.php
@@ -1,3 +1,14 @@
 <?php
 
- function test($a,$b = 0) {  if ($a == 2) {    if ($b == 1) {      return;    }    $a = 5;  }  if ($a == 3) {    var_dump($a);  }}test(3);
\ No newline at end of file
+function test($a,$b = 0) {
+  if ($a == 2) {
+    if ($b == 1) {
+      return;
+    }
+    $a = 5;
+  }
+  if ($a == 3) {
+    var_dump($a);
+  }
+}
+test(3);
diff --git a/hphp/test/slow/inlining/1828.php b/hphp/test/slow/inlining/1828.php
index b2be16d74..12b50bb0c 100644
--- a/hphp/test/slow/inlining/1828.php
+++ b/hphp/test/slow/inlining/1828.php
@@ -1,3 +1,14 @@
 <?php
 
- function id($x) { return $x; }class X {  public function f() { return 'hello'; }}function test($a, $b) {  return $a ? $b : id(new X)->f();}var_dump(test());
\ No newline at end of file
+function id($x) {
+ return $x;
+ }
+class X {
+  public function f() {
+ return 'hello';
+ }
+}
+function test($a, $b) {
+  return $a ? $b : id(new X)->f();
+}
+var_dump(test());
diff --git a/hphp/test/slow/inlining/1829.php b/hphp/test/slow/inlining/1829.php
index e50fc8623..19efae2a2 100644
--- a/hphp/test/slow/inlining/1829.php
+++ b/hphp/test/slow/inlining/1829.php
@@ -1,3 +1,9 @@
 <?php
 
- function foo($e='e') {  return '<a name="'.$e.'" id="'.$e.'"></a>';}function test() {  echo foo();}test();
\ No newline at end of file
+function foo($e='e') {
+  return '<a name="'.$e.'" id="'.$e.'"></a>';
+}
+function test() {
+  echo foo();
+}
+test();
diff --git a/hphp/test/slow/inlining/1830.php b/hphp/test/slow/inlining/1830.php
index 76dc17dc1..963ec534d 100644
--- a/hphp/test/slow/inlining/1830.php
+++ b/hphp/test/slow/inlining/1830.php
@@ -1,3 +1,11 @@
 <?php
 
- function foo($e, $m) {  $_REQUEST['_foo'] = $e;  $_REQUEST['_bar'] = $m;  return $e;}function test($x) {  return foo('a', $x);}var_dump(test('b'));
\ No newline at end of file
+function foo($e, $m) {
+  $_REQUEST['_foo'] = $e;
+  $_REQUEST['_bar'] = $m;
+  return $e;
+}
+function test($x) {
+  return foo('a', $x);
+}
+var_dump(test('b'));
diff --git a/hphp/test/slow/inlining/1831.php b/hphp/test/slow/inlining/1831.php
index 1449ea1cb..f7ead0f06 100644
--- a/hphp/test/slow/inlining/1831.php
+++ b/hphp/test/slow/inlining/1831.php
@@ -1,3 +1,13 @@
 <?php
 
- function h() { class X{}; }function f($a, $b, $c) { return h(); }function g($a, $b, $c) {  return f($a++, $b++ + $a++, $c);}
\ No newline at end of file
+function h() {
+ class X{
+}
+;
+ }
+function f($a, $b, $c) {
+ return h();
+ }
+function g($a, $b, $c) {
+  return f($a++, $b++ + $a++, $c);
+}
diff --git a/hphp/test/slow/inlining/1832.php b/hphp/test/slow/inlining/1832.php
index 9e5df616e..9ae42f4af 100644
--- a/hphp/test/slow/inlining/1832.php
+++ b/hphp/test/slow/inlining/1832.php
@@ -1,3 +1,10 @@
 <?php
 
- function f($name, $unique_id=false, $id=null) {  $id = $id ? $id : ($unique_id ? uniqid($name) : $name);  return $id;  }function test($a, $b, $c) {  return f($name = 'status', $unique_id = true, $id = 'status_active');  }var_dump(test(1,2,3));
\ No newline at end of file
+function f($name, $unique_id=false, $id=null) {
+  $id = $id ? $id : ($unique_id ? uniqid($name) : $name);
+  return $id;
+  }
+function test($a, $b, $c) {
+  return f($name = 'status', $unique_id = true, $id = 'status_active');
+  }
+var_dump(test(1,2,3));
diff --git a/hphp/test/slow/inlining/1833.php b/hphp/test/slow/inlining/1833.php
index 9295039cd..d2a1746aa 100644
--- a/hphp/test/slow/inlining/1833.php
+++ b/hphp/test/slow/inlining/1833.php
@@ -1,3 +1,24 @@
 <?php
 
- function g($a) { function t(){}; return $a ? array(1,2,3) : 'foo'; }function f($a) { return g($a); }function test($a) {  return reset((f($a)));  }var_dump(test(1));function &h(&$a) { return $a['foo']; }function i($a) { $x = &h($a); $x = 'hello'; return $a; }var_dump(i(false));
\ No newline at end of file
+function g($a) {
+ function t(){
+}
+;
+ return $a ? array(1,2,3) : 'foo';
+ }
+function f($a) {
+ return g($a);
+ }
+function test($a) {
+  return reset((f($a)));
+  }
+var_dump(test(1));
+function &h(&$a) {
+ return $a['foo'];
+ }
+function i($a) {
+ $x = &h($a);
+ $x = 'hello';
+ return $a;
+ }
+var_dump(i(false));
diff --git a/hphp/test/slow/inlining/1834.php b/hphp/test/slow/inlining/1834.php
index f744d0b88..0b7d8caf9 100644
--- a/hphp/test/slow/inlining/1834.php
+++ b/hphp/test/slow/inlining/1834.php
@@ -1,3 +1,16 @@
 <?php
 
- function bar($name) {  $name = trim($name);  var_dump($name);}function f($x, $y) { if ($x) return $x; return $y; }function foo() {  $name = 'ab.' . f('x', 'y');  bar($name);  bar($name);}foo();
\ No newline at end of file
+function bar($name) {
+  $name = trim($name);
+  var_dump($name);
+}
+function f($x, $y) {
+ if ($x) return $x;
+ return $y;
+ }
+function foo() {
+  $name = 'ab.' . f('x', 'y');
+  bar($name);
+  bar($name);
+}
+foo();
diff --git a/hphp/test/slow/inlining/1835.php b/hphp/test/slow/inlining/1835.php
index 369f98e11..dca67975c 100644
--- a/hphp/test/slow/inlining/1835.php
+++ b/hphp/test/slow/inlining/1835.php
@@ -1,4 +1,28 @@
 <?php
 
- function id($x) { return $x; }class B { function __construct($x) { $this->x = $x; } }class X extends B {  function __construct() { parent::__construct(array()); }  function foo() { echo "foo
-"; }}function bar($x=0) { if ($x) return 1; return ''; }function test($foo) {  id(new X(bar()))->foo();  id(new $foo(bar()))->foo();}test('X');
\ No newline at end of file
+function id($x) {
+ return $x;
+ }
+class B {
+ function __construct($x) {
+ $this->x = $x;
+ }
+ }
+class X extends B {
+  function __construct() {
+ parent::__construct(array());
+ }
+  function foo() {
+ echo "foo
+";
+ }
+}
+function bar($x=0) {
+ if ($x) return 1;
+ return '';
+ }
+function test($foo) {
+  id(new X(bar()))->foo();
+  id(new $foo(bar()))->foo();
+}
+test('X');
diff --git a/hphp/test/slow/inlining/1836.php b/hphp/test/slow/inlining/1836.php
index c261c3fd4..7d96080d7 100644
--- a/hphp/test/slow/inlining/1836.php
+++ b/hphp/test/slow/inlining/1836.php
@@ -1,3 +1,18 @@
 <?php
 
- function id($a) { return $a; }class X {}if (0) {  class X {}}class Y extends X { function t() {} }function test() {  id(new Y)->t();}
\ No newline at end of file
+function id($a) {
+ return $a;
+ }
+class X {
+}
+if (0) {
+  class X {
+}
+}
+class Y extends X {
+ function t() {
+}
+ }
+function test() {
+  id(new Y)->t();
+}
diff --git a/hphp/test/slow/inlining/1837.php b/hphp/test/slow/inlining/1837.php
index 9f0d45fa8..1dbe79435 100644
--- a/hphp/test/slow/inlining/1837.php
+++ b/hphp/test/slow/inlining/1837.php
@@ -1,3 +1,12 @@
 <?php
 
- /* Compile only: verify no c++ compilation errors */function foo($a) {  return $a[1];}function baz(&$x) { if ($x) $x++; }function bar($a) {  baz(foo($a)[1]);  foo($a)->bar = 1;}
\ No newline at end of file
+/* Compile only: verify no c++ compilation errors */function foo($a) {
+  return $a[1];
+}
+function baz(&$x) {
+ if ($x) $x++;
+ }
+function bar($a) {
+  baz(foo($a)[1]);
+  foo($a)->bar = 1;
+}
diff --git a/hphp/test/slow/inlining/1838.php b/hphp/test/slow/inlining/1838.php
index 129d77832..a676f5790 100644
--- a/hphp/test/slow/inlining/1838.php
+++ b/hphp/test/slow/inlining/1838.php
@@ -1,10 +1,10 @@
 <?php
 
-
 /* Compile only: verify no c++ compilation errors */function f($x) {
   return function () use ($x) {
     return $x;
-  };
+  }
+;
 }
 function g($x) {
   $c = f($x);
diff --git a/hphp/test/slow/inlining/1839.php b/hphp/test/slow/inlining/1839.php
index 54a857f90..9aa7681f8 100644
--- a/hphp/test/slow/inlining/1839.php
+++ b/hphp/test/slow/inlining/1839.php
@@ -1,9 +1,12 @@
 <?php
 
-
-function inline_me($x, $y, &$z) { return ($z = ($x + $y)); }
+function inline_me($x, $y, &$z) {
+ return ($z = ($x + $y));
+ }
 function gen($x, $y) {
   yield inline_me($x, $y, $arg);
   yield $arg;
 }
-foreach (gen(10, 20) as $x) { var_dump($x); }
+foreach (gen(10, 20) as $x) {
+ var_dump($x);
+ }
diff --git a/hphp/test/slow/inlining/1840.php b/hphp/test/slow/inlining/1840.php
index 0e2667d80..de0d394a5 100644
--- a/hphp/test/slow/inlining/1840.php
+++ b/hphp/test/slow/inlining/1840.php
@@ -1,3 +1,10 @@
 <?php
 
- function &test(&$x,$y) {  $GLOBALS['x'] = &$y;  return $x[0];}$x = array((object)1);$y = &test($x,0);$y++;var_dump($x, $y);
\ No newline at end of file
+function &test(&$x,$y) {
+  $GLOBALS['x'] = &$y;
+  return $x[0];
+}
+$x = array((object)1);
+$y = &test($x,0);
+$y++;
+var_dump($x, $y);
diff --git a/hphp/test/slow/inlining/1841.php b/hphp/test/slow/inlining/1841.php
index 47fa78083..ed11d3324 100644
--- a/hphp/test/slow/inlining/1841.php
+++ b/hphp/test/slow/inlining/1841.php
@@ -1,3 +1,10 @@
 <?php
 
- function &test(&$x) {  $x = 1;  return $x;}$x = 0;$y = &test($x);$y++;var_dump($x, $y);
\ No newline at end of file
+function &test(&$x) {
+  $x = 1;
+  return $x;
+}
+$x = 0;
+$y = &test($x);
+$y++;
+var_dump($x, $y);
diff --git a/hphp/test/slow/inlining/1842.php b/hphp/test/slow/inlining/1842.php
index f9459685a..b9f9c744e 100644
--- a/hphp/test/slow/inlining/1842.php
+++ b/hphp/test/slow/inlining/1842.php
@@ -1,3 +1,9 @@
 <?php
 
- function foo() { return $GLOBALS['g']; }$g = 0;$a =& foo();$a++;var_dump($a, $g);
\ No newline at end of file
+function foo() {
+ return $GLOBALS['g'];
+ }
+$g = 0;
+$a =& foo();
+$a++;
+var_dump($a, $g);
diff --git a/hphp/test/slow/inlining/1843.php b/hphp/test/slow/inlining/1843.php
index a96abeb40..7e2fbb171 100644
--- a/hphp/test/slow/inlining/1843.php
+++ b/hphp/test/slow/inlining/1843.php
@@ -1,3 +1,13 @@
 <?php
 
- function pid($x) {  var_dump($x);  return $x;}function f($x) {  return $x;}function ttest() {  return f(pid('arg1'),pid('arg2'));}ttest();
\ No newline at end of file
+function pid($x) {
+  var_dump($x);
+  return $x;
+}
+function f($x) {
+  return $x;
+}
+function ttest() {
+  return f(pid('arg1'),pid('arg2'));
+}
+ttest();
diff --git a/hphp/test/slow/inlining/1844.php b/hphp/test/slow/inlining/1844.php
index f6158469d..677832278 100644
--- a/hphp/test/slow/inlining/1844.php
+++ b/hphp/test/slow/inlining/1844.php
@@ -1,3 +1,16 @@
 <?php
 
- class X {  function __destruct() { var_dump('done'); }}function f() { $x = new X; }function g() {  var_dump('start');  f();  var_dump('end');}g();
\ No newline at end of file
+class X {
+  function __destruct() {
+ var_dump('done');
+ }
+}
+function f() {
+ $x = new X;
+ }
+function g() {
+  var_dump('start');
+  f();
+  var_dump('end');
+}
+g();
diff --git a/hphp/test/slow/inner_class/10.php b/hphp/test/slow/inner_class/10.php
index abf9ced98..f31d98fa9 100644
--- a/hphp/test/slow/inner_class/10.php
+++ b/hphp/test/slow/inner_class/10.php
@@ -1,3 +1,12 @@
 <?php
 
- function test() { class test { function p() { print 'test';} }} test(); $obj = new Test(); $obj->p();
\ No newline at end of file
+function test() {
+ class test {
+ function p() {
+ print 'test';
+}
+ }
+}
+ test();
+ $obj = new Test();
+ $obj->p();
diff --git a/hphp/test/slow/inner_class/8.php b/hphp/test/slow/inner_class/8.php
index 74455b1ec..c4b4e6ad1 100644
--- a/hphp/test/slow/inner_class/8.php
+++ b/hphp/test/slow/inner_class/8.php
@@ -1,3 +1,9 @@
 <?php
 
- class test { function p() { print 'test';} } $obj = new Test(); $obj->p();
\ No newline at end of file
+class test {
+ function p() {
+ print 'test';
+}
+ }
+ $obj = new Test();
+ $obj->p();
diff --git a/hphp/test/slow/inner_class/9.php b/hphp/test/slow/inner_class/9.php
index 4cc607402..e62b79798 100644
--- a/hphp/test/slow/inner_class/9.php
+++ b/hphp/test/slow/inner_class/9.php
@@ -1,3 +1,12 @@
 <?php
 
- class test { function p() { function inner() { print 'test';} inner();} } $obj = new Test(); $obj->p();
\ No newline at end of file
+class test {
+ function p() {
+ function inner() {
+ print 'test';
+}
+ inner();
+}
+ }
+ $obj = new Test();
+ $obj->p();
diff --git a/hphp/test/slow/inner_function/6.php b/hphp/test/slow/inner_function/6.php
index 0173f775a..6dba67a67 100644
--- a/hphp/test/slow/inner_function/6.php
+++ b/hphp/test/slow/inner_function/6.php
@@ -1,3 +1,6 @@
 <?php
 
- function test() { print 'test';} test();
\ No newline at end of file
+function test() {
+ print 'test';
+}
+ test();
diff --git a/hphp/test/slow/inner_function/7.php b/hphp/test/slow/inner_function/7.php
index 1841738aa..8c4575580 100644
--- a/hphp/test/slow/inner_function/7.php
+++ b/hphp/test/slow/inner_function/7.php
@@ -1,3 +1,9 @@
 <?php
 
- function test() { function inner() { print 'test';} inner();} test();
\ No newline at end of file
+function test() {
+ function inner() {
+ print 'test';
+}
+ inner();
+}
+ test();
diff --git a/hphp/test/slow/int_isset/1724.php b/hphp/test/slow/int_isset/1724.php
index 9571c5542..bd776d1f3 100644
--- a/hphp/test/slow/int_isset/1724.php
+++ b/hphp/test/slow/int_isset/1724.php
@@ -1 +1,5 @@
-<? function f($p) { $i = strlen($p); if (isset($i)) {} }
\ No newline at end of file
+<? function f($p) {
+ $i = strlen($p);
+ if (isset($i)) {
+}
+ }
diff --git a/hphp/test/slow/integer/100.php b/hphp/test/slow/integer/100.php
index 6e5549a43..647b0b52e 100644
--- a/hphp/test/slow/integer/100.php
+++ b/hphp/test/slow/integer/100.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 10; $b = 9; $a &= $b; var_dump($a);
\ No newline at end of file
+$a = 10;
+ $b = 9;
+ $a &= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/integer/101.php b/hphp/test/slow/integer/101.php
index 6914cab90..1dc21bfb3 100644
--- a/hphp/test/slow/integer/101.php
+++ b/hphp/test/slow/integer/101.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 10; $b = 9; $a |= $b; var_dump($a);
\ No newline at end of file
+$a = 10;
+ $b = 9;
+ $a |= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/integer/102.php b/hphp/test/slow/integer/102.php
index db928189a..40d15e781 100644
--- a/hphp/test/slow/integer/102.php
+++ b/hphp/test/slow/integer/102.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 10; $b = 9; $a ^= $b; var_dump($a);
\ No newline at end of file
+$a = 10;
+ $b = 9;
+ $a ^= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/integer/103.php b/hphp/test/slow/integer/103.php
index d7da40958..8c95bc321 100644
--- a/hphp/test/slow/integer/103.php
+++ b/hphp/test/slow/integer/103.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 10; $b = 9; $a <<= 2; var_dump($a);
\ No newline at end of file
+$a = 10;
+ $b = 9;
+ $a <<= 2;
+ var_dump($a);
diff --git a/hphp/test/slow/integer/104.php b/hphp/test/slow/integer/104.php
index 1b728f873..2868e9e8b 100644
--- a/hphp/test/slow/integer/104.php
+++ b/hphp/test/slow/integer/104.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 10; $b = 9; $a >>= 2; var_dump($a);
\ No newline at end of file
+$a = 10;
+ $b = 9;
+ $a >>= 2;
+ var_dump($a);
diff --git a/hphp/test/slow/integer/105.php b/hphp/test/slow/integer/105.php
index 60c4ef852..639f786e4 100644
--- a/hphp/test/slow/integer/105.php
+++ b/hphp/test/slow/integer/105.php
@@ -1,3 +1,7 @@
 <?php
 
- var_dump((integer)'10');var_dump((integer)'0x10');var_dump((integer)'010');var_dump(10 + 0x10);var_dump(10 + 010);
\ No newline at end of file
+var_dump((integer)'10');
+var_dump((integer)'0x10');
+var_dump((integer)'010');
+var_dump(10 + 0x10);
+var_dump(10 + 010);
diff --git a/hphp/test/slow/integer/84.php b/hphp/test/slow/integer/84.php
index c48bda2dd..5ab66d7a2 100644
--- a/hphp/test/slow/integer/84.php
+++ b/hphp/test/slow/integer/84.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(1);
\ No newline at end of file
+var_dump(1);
diff --git a/hphp/test/slow/integer/85.php b/hphp/test/slow/integer/85.php
index f3d0e0f69..be26a576c 100644
--- a/hphp/test/slow/integer/85.php
+++ b/hphp/test/slow/integer/85.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(0);
\ No newline at end of file
+var_dump(0);
diff --git a/hphp/test/slow/integer/86.php b/hphp/test/slow/integer/86.php
index c4f8ebe6c..2f409eec8 100644
--- a/hphp/test/slow/integer/86.php
+++ b/hphp/test/slow/integer/86.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(-1);
\ No newline at end of file
+var_dump(-1);
diff --git a/hphp/test/slow/integer/87.php b/hphp/test/slow/integer/87.php
index f34e3f56a..489630659 100644
--- a/hphp/test/slow/integer/87.php
+++ b/hphp/test/slow/integer/87.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(8589934592);
\ No newline at end of file
+var_dump(8589934592);
diff --git a/hphp/test/slow/integer/88.php b/hphp/test/slow/integer/88.php
index 03ba8c341..5cd3c9a01 100644
--- a/hphp/test/slow/integer/88.php
+++ b/hphp/test/slow/integer/88.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(-8589934592);
\ No newline at end of file
+var_dump(-8589934592);
diff --git a/hphp/test/slow/integer/89.php b/hphp/test/slow/integer/89.php
index 35693077d..dfbb9e7c5 100644
--- a/hphp/test/slow/integer/89.php
+++ b/hphp/test/slow/integer/89.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 1;           var_dump($a);
\ No newline at end of file
+$a = 1;
+           var_dump($a);
diff --git a/hphp/test/slow/integer/90.php b/hphp/test/slow/integer/90.php
index 0f6a19883..83cbfe43b 100644
--- a/hphp/test/slow/integer/90.php
+++ b/hphp/test/slow/integer/90.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 0;           var_dump($a);
\ No newline at end of file
+$a = 0;
+           var_dump($a);
diff --git a/hphp/test/slow/integer/91.php b/hphp/test/slow/integer/91.php
index 5bc8f070a..027879002 100644
--- a/hphp/test/slow/integer/91.php
+++ b/hphp/test/slow/integer/91.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = -1;          var_dump($a);
\ No newline at end of file
+$a = -1;
+          var_dump($a);
diff --git a/hphp/test/slow/integer/92.php b/hphp/test/slow/integer/92.php
index 87712101e..f5398b08d 100644
--- a/hphp/test/slow/integer/92.php
+++ b/hphp/test/slow/integer/92.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 8589934592;  var_dump($a);
\ No newline at end of file
+$a = 8589934592;
+  var_dump($a);
diff --git a/hphp/test/slow/integer/93.php b/hphp/test/slow/integer/93.php
index 66c730e50..bcabbdda8 100644
--- a/hphp/test/slow/integer/93.php
+++ b/hphp/test/slow/integer/93.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = -8589934592; var_dump($a);
\ No newline at end of file
+$a = -8589934592;
+ var_dump($a);
diff --git a/hphp/test/slow/integer/94.php b/hphp/test/slow/integer/94.php
index 062ddeb22..59fc79f6e 100644
--- a/hphp/test/slow/integer/94.php
+++ b/hphp/test/slow/integer/94.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 10; var_dump(~$a);
\ No newline at end of file
+$a = 10;
+ var_dump(~$a);
diff --git a/hphp/test/slow/integer/95.php b/hphp/test/slow/integer/95.php
index f02224623..393ea1ade 100644
--- a/hphp/test/slow/integer/95.php
+++ b/hphp/test/slow/integer/95.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; $b = 9; var_dump($a & $b);
\ No newline at end of file
+$a = 10;
+ $b = 9;
+ var_dump($a & $b);
diff --git a/hphp/test/slow/integer/96.php b/hphp/test/slow/integer/96.php
index 576ff0da8..6e76b4f97 100644
--- a/hphp/test/slow/integer/96.php
+++ b/hphp/test/slow/integer/96.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; $b = 9; var_dump($a | $b);
\ No newline at end of file
+$a = 10;
+ $b = 9;
+ var_dump($a | $b);
diff --git a/hphp/test/slow/integer/97.php b/hphp/test/slow/integer/97.php
index 021f40104..e67eba3b7 100644
--- a/hphp/test/slow/integer/97.php
+++ b/hphp/test/slow/integer/97.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; $b = 9; var_dump($a ^ $b);
\ No newline at end of file
+$a = 10;
+ $b = 9;
+ var_dump($a ^ $b);
diff --git a/hphp/test/slow/integer/98.php b/hphp/test/slow/integer/98.php
index 097f02f90..2428562cd 100644
--- a/hphp/test/slow/integer/98.php
+++ b/hphp/test/slow/integer/98.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 10; var_dump($a << 2);
\ No newline at end of file
+$a = 10;
+ var_dump($a << 2);
diff --git a/hphp/test/slow/integer/99.php b/hphp/test/slow/integer/99.php
index a01eed33c..778e9e215 100644
--- a/hphp/test/slow/integer/99.php
+++ b/hphp/test/slow/integer/99.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 10; var_dump($a >> 2);
\ No newline at end of file
+$a = 10;
+ var_dump($a >> 2);
diff --git a/hphp/test/slow/intercept/1196.php b/hphp/test/slow/intercept/1196.php
index 1b4c87f5f..46cf7b8f6 100644
--- a/hphp/test/slow/intercept/1196.php
+++ b/hphp/test/slow/intercept/1196.php
@@ -1,3 +1,24 @@
 <?php
 
- $a = 10; $b = 20;function &foo(&$n, $p) { global $a; $n = 123; $p += 1;   var_dump('foo');return $a;}function &bar(&$n, $p) { global $b; $n = 456; $p += 2;   var_dump('bar');return $b;}fb_intercept('foo', 'fb_stubout_intercept_handler', 'bar');$n = 0; $d = 3; $c = &foo($n, $d); var_dump($c, $d); $c = 30;
\ No newline at end of file
+$a = 10;
+ $b = 20;
+function &foo(&$n, $p) {
+ global $a;
+ $n = 123;
+ $p += 1;
+   var_dump('foo');
+return $a;
+}
+function &bar(&$n, $p) {
+ global $b;
+ $n = 456;
+ $p += 2;
+   var_dump('bar');
+return $b;
+}
+fb_intercept('foo', 'fb_stubout_intercept_handler', 'bar');
+$n = 0;
+ $d = 3;
+ $c = &foo($n, $d);
+ var_dump($c, $d);
+ $c = 30;
diff --git a/hphp/test/slow/intercept/1197.php b/hphp/test/slow/intercept/1197.php
index 40c635b98..0db21b7e1 100644
--- a/hphp/test/slow/intercept/1197.php
+++ b/hphp/test/slow/intercept/1197.php
@@ -1,3 +1,28 @@
 <?php
 
- $a = 10; $b = 20;class A {function &foo(&$n, $p) { global $a; $n = 123; $p += 1;   var_dump('foo');return $a;}}class B {function &bar(&$n, $p) { global $b; $n = 456; $p += 2;   var_dump('bar');return $b;}}fb_intercept('A::foo', 'fb_stubout_intercept_handler', 'B::bar');$n = 0; $d = 3; $c = &A::foo($n, $d); var_dump($c, $d); $c = 30;
\ No newline at end of file
+$a = 10;
+ $b = 20;
+class A {
+function &foo(&$n, $p) {
+ global $a;
+ $n = 123;
+ $p += 1;
+   var_dump('foo');
+return $a;
+}
+}
+class B {
+function &bar(&$n, $p) {
+ global $b;
+ $n = 456;
+ $p += 2;
+   var_dump('bar');
+return $b;
+}
+}
+fb_intercept('A::foo', 'fb_stubout_intercept_handler', 'B::bar');
+$n = 0;
+ $d = 3;
+ $c = &A::foo($n, $d);
+ var_dump($c, $d);
+ $c = 30;
diff --git a/hphp/test/slow/intercept/1198.php b/hphp/test/slow/intercept/1198.php
index e22c0ee63..03110559f 100644
--- a/hphp/test/slow/intercept/1198.php
+++ b/hphp/test/slow/intercept/1198.php
@@ -1,3 +1,17 @@
 <?php
 
- function foo(&$a) {  var_dump('foo');  $a = 1;}function bar(&$a) {  var_dump('bar');  $a = 2;}function goo($name, $obj, $params, $data, &$done) {  return call_user_func_array($data, $params);}fb_intercept('foo', 'goo', 'bar');$a = 0;foo($a);var_dump($a);
\ No newline at end of file
+function foo(&$a) {
+  var_dump('foo');
+  $a = 1;
+}
+function bar(&$a) {
+  var_dump('bar');
+  $a = 2;
+}
+function goo($name, $obj, $params, $data, &$done) {
+  return call_user_func_array($data, $params);
+}
+fb_intercept('foo', 'goo', 'bar');
+$a = 0;
+foo($a);
+var_dump($a);
diff --git a/hphp/test/slow/intercept/1199.php b/hphp/test/slow/intercept/1199.php
index 660a0a041..fd3053523 100644
--- a/hphp/test/slow/intercept/1199.php
+++ b/hphp/test/slow/intercept/1199.php
@@ -1,3 +1,11 @@
 <?php
 
- function test() {  define('X', 2);  define('Y', 3);  fb_intercept('foo', 'bar');  var_dump(X);  define('Y', 4);  var_dump(Y);}test();
\ No newline at end of file
+function test() {
+  define('X', 2);
+  define('Y', 3);
+  fb_intercept('foo', 'bar');
+  var_dump(X);
+  define('Y', 4);
+  var_dump(Y);
+}
+test();
diff --git a/hphp/test/slow/intercept/1200.php b/hphp/test/slow/intercept/1200.php
index e5800373a..f24f6fff7 100644
--- a/hphp/test/slow/intercept/1200.php
+++ b/hphp/test/slow/intercept/1200.php
@@ -1,3 +1,17 @@
 <?php
 
-class X {  static function foo() { global$g; return $g; }}function bar() {  var_dump('Intercepted');}function test() {  X::foo();  fb_intercept('X::foo', 'bar', 'bar');  X::foo();}test();
\ No newline at end of file
+class X {
+  static function foo() {
+ global$g;
+ return $g;
+ }
+}
+function bar() {
+  var_dump('Intercepted');
+}
+function test() {
+  X::foo();
+  fb_intercept('X::foo', 'bar', 'bar');
+  X::foo();
+}
+test();
diff --git a/hphp/test/slow/intercept/1201.php b/hphp/test/slow/intercept/1201.php
index 7f6760010..61b66521e 100644
--- a/hphp/test/slow/intercept/1201.php
+++ b/hphp/test/slow/intercept/1201.php
@@ -1,4 +1,5 @@
 <?php
+
 // Make sure that we can tell which class was called for intercepted static
 // methods
 
@@ -8,11 +9,13 @@ class A {
   }
 }
 
-class B extends A { }
+class B extends A {
+ }
 
 fb_intercept('A::foo', function($_, $called_on) {
   var_dump($called_on);
-});
+}
+);
 
 A::foo();
 B::foo();
diff --git a/hphp/test/slow/intercept/extra_args.php b/hphp/test/slow/intercept/extra_args.php
index ce0118827..b44b7deb3 100644
--- a/hphp/test/slow/intercept/extra_args.php
+++ b/hphp/test/slow/intercept/extra_args.php
@@ -1,6 +1,8 @@
 <?hh
 
-function foo() { var_dump('failed'); }
+function foo() {
+ var_dump('failed');
+ }
 
 fb_intercept('foo', 'bar', "hello");
 
diff --git a/hphp/test/slow/invalid_argument/1382.php b/hphp/test/slow/invalid_argument/1382.php
index cbf6f6fb5..251d7331c 100644
--- a/hphp/test/slow/invalid_argument/1382.php
+++ b/hphp/test/slow/invalid_argument/1382.php
@@ -1,3 +1,11 @@
 <?php
 
- function bar($a) { return $a; }function baz($a) { return $a; }function foo($x) {  return fb_call_user_func_safe_return('baz',         fb_call_user_func_safe_return('bar', $x));}
\ No newline at end of file
+function bar($a) {
+ return $a;
+ }
+function baz($a) {
+ return $a;
+ }
+function foo($x) {
+  return fb_call_user_func_safe_return('baz',         fb_call_user_func_safe_return('bar', $x));
+}
diff --git a/hphp/test/slow/invalid_argument/1383.php b/hphp/test/slow/invalid_argument/1383.php
index eabc9115f..ce6301522 100644
--- a/hphp/test/slow/invalid_argument/1383.php
+++ b/hphp/test/slow/invalid_argument/1383.php
@@ -1,3 +1,14 @@
 <?php
 
- function handler($err, $errstr) {  $errstr = preg_replace('/given,.*$/','given', $errstr);  var_dump($err, $errstr);}set_error_handler('handler');class y {}class x {  function __construct(y $y) {}}var_dump(new X(null));
\ No newline at end of file
+function handler($err, $errstr) {
+  $errstr = preg_replace('/given,.*$/','given', $errstr);
+  var_dump($err, $errstr);
+}
+set_error_handler('handler');
+class y {
+}
+class x {
+  function __construct(y $y) {
+}
+}
+var_dump(new X(null));
diff --git a/hphp/test/slow/ir_inlining/1.php b/hphp/test/slow/ir_inlining/1.php
index 9c40b0e58..f848936fd 100644
--- a/hphp/test/slow/ir_inlining/1.php
+++ b/hphp/test/slow/ir_inlining/1.php
@@ -2,7 +2,11 @@
 
 //////////////////////////////////////////////////////////////////////
 
-class Dtor { public function __destruct() { echo "dtor\n"; } }
+class Dtor {
+ public function __destruct() {
+ echo "dtor\n";
+ }
+ }
 
 function id($x) {
   return $x;
diff --git a/hphp/test/slow/ir_inlining/cgetm_dynamic.php b/hphp/test/slow/ir_inlining/cgetm_dynamic.php
index b81e30779..adf7abc99 100644
--- a/hphp/test/slow/ir_inlining/cgetm_dynamic.php
+++ b/hphp/test/slow/ir_inlining/cgetm_dynamic.php
@@ -4,7 +4,9 @@ class CGetMDynProp {
   public function __construct() {
     $this->str = "yolo";
   }
-  public function getString() { return $this->str; }
+  public function getString() {
+ return $this->str;
+ }
 }
 
 function test6() {
diff --git a/hphp/test/slow/ir_inlining/collection_literal.php b/hphp/test/slow/ir_inlining/collection_literal.php
index aea0546aa..aa5848ee5 100644
--- a/hphp/test/slow/ir_inlining/collection_literal.php
+++ b/hphp/test/slow/ir_inlining/collection_literal.php
@@ -1,7 +1,11 @@
 <?hh
 
 class X {
-  protected function foo(): Map<string,string>{ return Map {}; }
+  protected function foo(): Map<string,string>{
+ return Map {
+}
+;
+ }
   function fiz(): void {
     $this->fuz('save', $this->foo());
   }
diff --git a/hphp/test/slow/ir_inlining/constants.php b/hphp/test/slow/ir_inlining/constants.php
index 27a2523aa..eeb2663c5 100644
--- a/hphp/test/slow/ir_inlining/constants.php
+++ b/hphp/test/slow/ir_inlining/constants.php
@@ -1,14 +1,22 @@
 <?php
 
-function foo() { return "asd"; }
-function bar() { return "bar"; }
+function foo() {
+ return "asd";
+ }
+function bar() {
+ return "bar";
+ }
 
 class Bar {
-  public function asd() { return $this; }
+  public function asd() {
+ return $this;
+ }
 }
 
 class Baz {
-  public function k() { return 12; }
+  public function k() {
+ return 12;
+ }
 }
 
 function main() {
diff --git a/hphp/test/slow/ir_inlining/failing_param.php b/hphp/test/slow/ir_inlining/failing_param.php
index a0b5ed7fd..7bbbc1a5f 100644
--- a/hphp/test/slow/ir_inlining/failing_param.php
+++ b/hphp/test/slow/ir_inlining/failing_param.php
@@ -7,7 +7,10 @@ function wat(string $x) {
 function main() {
   try {
     wat(12);
-  } catch (Exception $x) { echo "ok\n"; }
+  }
+ catch (Exception $x) {
+ echo "ok\n";
+ }
 }
 
 main();
diff --git a/hphp/test/slow/ir_inlining/generator_nested_fcalls.php b/hphp/test/slow/ir_inlining/generator_nested_fcalls.php
index 3f2c2a3c8..d303af5f5 100644
--- a/hphp/test/slow/ir_inlining/generator_nested_fcalls.php
+++ b/hphp/test/slow/ir_inlining/generator_nested_fcalls.php
@@ -39,6 +39,7 @@ function foo() {
 }
 
 function main() {
-  foreach (foo() as $k) {}
+  foreach (foo() as $k) {
+}
 }
 main();
diff --git a/hphp/test/slow/ir_inlining/headers.php b/hphp/test/slow/ir_inlining/headers.php
index 8c9e9d39e..026033f69 100644
--- a/hphp/test/slow/ir_inlining/headers.php
+++ b/hphp/test/slow/ir_inlining/headers.php
@@ -11,7 +11,8 @@ final class HTTPHeaders {
     $this->headers = Map {
       'foo' => 'bar',
       'baz' => 'quux',
-    };
+    }
+;
   }
 
   public function getAllHeaders(): Map<string,string> {
diff --git a/hphp/test/slow/ir_inlining/setter.php b/hphp/test/slow/ir_inlining/setter.php
index 500af1be0..b920c7019 100644
--- a/hphp/test/slow/ir_inlining/setter.php
+++ b/hphp/test/slow/ir_inlining/setter.php
@@ -1,6 +1,7 @@
 <?php
 
-class Bar{}
+class Bar{
+}
 
 class Foo {
   private $x;
diff --git a/hphp/test/slow/ir_inlining/unset.php b/hphp/test/slow/ir_inlining/unset.php
index 513f82184..fbbf0a57f 100644
--- a/hphp/test/slow/ir_inlining/unset.php
+++ b/hphp/test/slow/ir_inlining/unset.php
@@ -2,7 +2,9 @@
 
 class NonExistProp {
   private $x;
-  public function __construct() { $x = "str"; }
+  public function __construct() {
+ $x = "str";
+ }
   public function unsetIt() {
     unset($this->x);
   }
@@ -25,7 +27,9 @@ function test7() {
     $k = new Dtor();
     echo $obj->getX();
     echo "\n";
-  } catch (Exception $x) {}
+  }
+ catch (Exception $x) {
+}
 }
 
 test7();
diff --git a/hphp/test/slow/ir_inlining/unset.php.expectf b/hphp/test/slow/ir_inlining/unset.php.expectf
index b4e7da5f3..a7d4dd00e 100644
--- a/hphp/test/slow/ir_inlining/unset.php.expectf
+++ b/hphp/test/slow/ir_inlining/unset.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Class undefined: Dtor in %s on line 25
+HipHop Fatal error: Class undefined: Dtor in %s on line 27
diff --git a/hphp/test/slow/json/1551.php b/hphp/test/slow/json/1551.php
index bc65cb1ee..e1875765c 100644
--- a/hphp/test/slow/json/1551.php
+++ b/hphp/test/slow/json/1551.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array();$a[] = &$a;var_dump($a);var_dump(json_encode($a));
\ No newline at end of file
+$a = array();
+$a[] = &$a;
+var_dump($a);
+var_dump(json_encode($a));
diff --git a/hphp/test/slow/json/1552.php b/hphp/test/slow/json/1552.php
index f9959a3aa..0df8a0f2d 100644
--- a/hphp/test/slow/json/1552.php
+++ b/hphp/test/slow/json/1552.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(1.23456789e+34, 1E666, 1E666/1E666);$e = json_encode($a);var_dump($a);
\ No newline at end of file
+$a = array(1.23456789e+34, 1E666, 1E666/1E666);
+$e = json_encode($a);
+var_dump($a);
diff --git a/hphp/test/slow/json/1553.php b/hphp/test/slow/json/1553.php
index 6e10f6f38..ad8bae2b2 100644
--- a/hphp/test/slow/json/1553.php
+++ b/hphp/test/slow/json/1553.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(json_decode("[\"a\",1,true,false,null]", true));
\ No newline at end of file
+var_dump(json_decode("[\"a\",1,true,false,null]", true));
diff --git a/hphp/test/slow/json/1554.php b/hphp/test/slow/json/1554.php
index 40a183e6e..158f1ad76 100644
--- a/hphp/test/slow/json/1554.php
+++ b/hphp/test/slow/json/1554.php
@@ -1,3 +1,12 @@
 <?php
 
- class A {  public $a = 'foo';  protected $b = 'bar';  private $c = 'blah';  public function aaaa() {    var_dump(json_encode($this));  }}$obj = new A();$obj->aaaa();
\ No newline at end of file
+class A {
+  public $a = 'foo';
+  protected $b = 'bar';
+  private $c = 'blah';
+  public function aaaa() {
+    var_dump(json_encode($this));
+  }
+}
+$obj = new A();
+$obj->aaaa();
diff --git a/hphp/test/slow/json/1555.php b/hphp/test/slow/json/1555.php
index 350675217..dae18b158 100644
--- a/hphp/test/slow/json/1555.php
+++ b/hphp/test/slow/json/1555.php
@@ -1,6 +1,7 @@
 <?php
 
-
-class Foo { }
-$foo = new Foo(); $foo->foo = $foo;
+class Foo {
+ }
+$foo = new Foo();
+ $foo->foo = $foo;
 var_dump(json_encode($foo));
diff --git a/hphp/test/slow/json/emptydict.php b/hphp/test/slow/json/emptydict.php
index 44282e271..97599b032 100644
--- a/hphp/test/slow/json/emptydict.php
+++ b/hphp/test/slow/json/emptydict.php
@@ -1,10 +1,13 @@
 <?php
+
 // Copyright 2004-present Facebook. All Rights Reserved.
 
 var_dump(json_decode(
            <<<EOT
 {
-   "staticBitmask": {},
+   "staticBitmask": {
+}
+,
    "spaceId": 3
 }
 EOT
diff --git a/hphp/test/slow/labels/72.php b/hphp/test/slow/labels/72.php
index af30ba9ee..9bbb4b6a7 100644
--- a/hphp/test/slow/labels/72.php
+++ b/hphp/test/slow/labels/72.php
@@ -1,7 +1,22 @@
 <?php
 
-
-$modalité = 'extended ASCII'; var_dump($modalité);
-${"a-b"} = 'dash'; var_dump(${"a-b"});
-${'a"b'} = 'quote'; var_dump(${'a"b'});
-${'a$b'} = 'dollar'; var_dump(${'a$b'});
+$modalité = 'extended ASCII';
+ var_dump($modalité);
+${
+"a-b"}
+ = 'dash';
+ var_dump(${
+"a-b"}
+);
+${
+'a"b'}
+ = 'quote';
+ var_dump(${
+'a"b'}
+);
+${
+'a$b'}
+ = 'dollar';
+ var_dump(${
+'a$b'}
+);
diff --git a/hphp/test/slow/labels/73.php b/hphp/test/slow/labels/73.php
index 12b84e752..d561b0b46 100644
--- a/hphp/test/slow/labels/73.php
+++ b/hphp/test/slow/labels/73.php
@@ -1,4 +1,4 @@
 <?php
 
-
-define('modalité', 123); var_dump(modalité);
\ No newline at end of file
+define('modalité', 123);
+ var_dump(modalité);
\ No newline at end of file
diff --git a/hphp/test/slow/labels/74.php b/hphp/test/slow/labels/74.php
index 936a8888f..5e76062bd 100644
--- a/hphp/test/slow/labels/74.php
+++ b/hphp/test/slow/labels/74.php
@@ -1,4 +1,6 @@
 <?php
 
-
-function modalité($a) { var_dump($a);} modalité(123);
\ No newline at end of file
+function modalité($a) {
+ var_dump($a);
+}
+ modalité(123);
\ No newline at end of file
diff --git a/hphp/test/slow/labels/75.php b/hphp/test/slow/labels/75.php
index 66f802279..6f06f0ac4 100644
--- a/hphp/test/slow/labels/75.php
+++ b/hphp/test/slow/labels/75.php
@@ -1,4 +1,8 @@
 <?php
 
-
-class modalité { static function odalité() { var_dump(123);} } modalité::odalité();
\ No newline at end of file
+class modalité {
+ static function odalité() {
+ var_dump(123);
+}
+ }
+ modalité::odalité();
\ No newline at end of file
diff --git a/hphp/test/slow/late_static_binding/1874.php b/hphp/test/slow/late_static_binding/1874.php
index 562630c0e..295252c04 100644
--- a/hphp/test/slow/late_static_binding/1874.php
+++ b/hphp/test/slow/late_static_binding/1874.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class B {
   public static $a = 100;
   static function f() {
diff --git a/hphp/test/slow/late_static_binding/1875.php b/hphp/test/slow/late_static_binding/1875.php
index fe3617784..288c694c8 100644
--- a/hphp/test/slow/late_static_binding/1875.php
+++ b/hphp/test/slow/late_static_binding/1875.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
     const NAME = 'A';
     public static function test() {
diff --git a/hphp/test/slow/late_static_binding/1876.php b/hphp/test/slow/late_static_binding/1876.php
index 38d36e036..47d090add 100644
--- a/hphp/test/slow/late_static_binding/1876.php
+++ b/hphp/test/slow/late_static_binding/1876.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class X {
   function f() {
     $y = new Y;
@@ -10,11 +9,17 @@ class X {
     self::g();
     Y::foo() && static::g();
   }
-  static function g() { var_dump(__CLASS__); }
+  static function g() {
+ var_dump(__CLASS__);
+ }
 }
 class Y extends X {
-  static function g() { var_dump(__CLASS__); }
-  static function foo() { return true; }
+  static function g() {
+ var_dump(__CLASS__);
+ }
+  static function foo() {
+ return true;
+ }
 }
 function test() {
   $x = new X;
diff --git a/hphp/test/slow/late_static_binding/1877.php b/hphp/test/slow/late_static_binding/1877.php
index 917cc68ab..50ed9cae9 100644
--- a/hphp/test/slow/late_static_binding/1877.php
+++ b/hphp/test/slow/late_static_binding/1877.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   static public function foo() {
     static::bar();
@@ -9,8 +8,10 @@ class A {
     var_dump(__CLASS__);
   }
   public function foo2() {
-    B::foo();    // B always changes 'static'
-    self::foo(); // 'self' doesn't change 'static'
+    B::foo();
+    // B always changes 'static'
+    self::foo();
+ // 'self' doesn't change 'static'
   }
 }
 class B extends A {
@@ -18,21 +19,30 @@ class B extends A {
     var_dump(__CLASS__);
   }
   public function foo3() {
-    $this->foo();  // $this changes 'static'
-    parent::foo(); // 'parent' doesn't change 'static'
+    $this->foo();
+  // $this changes 'static'
+    parent::foo();
+ // 'parent' doesn't change 'static'
   }
 }
 
 $a = new A();
 $b = new B();
 
-B::foo();   // B
-$b->foo();  // B
+B::foo();
+   // B
+$b->foo();
+  // B
 
-$b->foo2(); // BB
-$b->foo3(); // BB
+$b->foo2();
+ // BB
+$b->foo3();
+ // BB
 
-A::foo();   // A
-$a->foo();  // A
+A::foo();
+   // A
+$a->foo();
+  // A
 
-$a->foo2(); // BA
+$a->foo2();
+ // BA
diff --git a/hphp/test/slow/late_static_binding/1878.php b/hphp/test/slow/late_static_binding/1878.php
index cb4be303c..2c29848c3 100644
--- a/hphp/test/slow/late_static_binding/1878.php
+++ b/hphp/test/slow/late_static_binding/1878.php
@@ -1,3 +1,16 @@
 <?php
 
- class X {  static function foo() { return false; }  static function bar() { return 5.5; }  static function baz() { return time(); }  }var_dump(X::foo());var_dump(X::bar());var_dump(gettype(X::baz()));
\ No newline at end of file
+class X {
+  static function foo() {
+ return false;
+ }
+  static function bar() {
+ return 5.5;
+ }
+  static function baz() {
+ return time();
+ }
+  }
+var_dump(X::foo());
+var_dump(X::bar());
+var_dump(gettype(X::baz()));
diff --git a/hphp/test/slow/late_static_binding/1879.php b/hphp/test/slow/late_static_binding/1879.php
index d570dffef..a048429f7 100644
--- a/hphp/test/slow/late_static_binding/1879.php
+++ b/hphp/test/slow/late_static_binding/1879.php
@@ -1,13 +1,20 @@
 <?php
 
-
 class X {
-  static function foo() { echo "X::foo\n"; }
-  function bar() { static::foo(); }
+  static function foo() {
+ echo "X::foo\n";
+ }
+  function bar() {
+ static::foo();
+ }
 }
 class Y extends X {
-  static function foo() { echo "Y::foo\n"; }
-  function baz() { X::bar(); }
+  static function foo() {
+ echo "Y::foo\n";
+ }
+  function baz() {
+ X::bar();
+ }
 }
 $y = new Y;
 $y->baz();
diff --git a/hphp/test/slow/late_static_binding/1880.php b/hphp/test/slow/late_static_binding/1880.php
index 2da290a68..2165e37b1 100644
--- a/hphp/test/slow/late_static_binding/1880.php
+++ b/hphp/test/slow/late_static_binding/1880.php
@@ -1,16 +1,25 @@
 <?php
 
-
-function f() { return true; }
+function f() {
+ return true;
+ }
 if (f()) {
   class A {
     static $a = 'A';
-    static function f() { echo static::$a; }
-    function g() { $this->f(); }
+    static function f() {
+ echo static::$a;
+ }
+    function g() {
+ $this->f();
+ }
   }
-} else {
-  class A { }
 }
-class B extends A { static $a = 'B'; }
+ else {
+  class A {
+ }
+}
+class B extends A {
+ static $a = 'B';
+ }
 $b = new B;
 $b->g();
diff --git a/hphp/test/slow/late_static_binding/1881.php b/hphp/test/slow/late_static_binding/1881.php
index 9fa0f4160..b37ea2793 100644
--- a/hphp/test/slow/late_static_binding/1881.php
+++ b/hphp/test/slow/late_static_binding/1881.php
@@ -1,11 +1,15 @@
 <?php
 
-
 class A {
-  static function f() { return new static; }
-  static function g($o) { return $o instanceof static; }
+  static function f() {
+ return new static;
+ }
+  static function g($o) {
+ return $o instanceof static;
+ }
 }
-class B extends A { }
+class B extends A {
+ }
 var_dump(A::g(A::f()));
 var_dump(A::g(B::f()));
 var_dump(B::g(A::f()));
diff --git a/hphp/test/slow/late_static_binding/1882.php b/hphp/test/slow/late_static_binding/1882.php
index 6eb9118b6..599aa0283 100644
--- a/hphp/test/slow/late_static_binding/1882.php
+++ b/hphp/test/slow/late_static_binding/1882.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class TestA {
 protected static function doSomething() {
 echo "TestA::doSomething\n";
@@ -14,7 +13,8 @@ self::test();
 }
 }
 class Foo {
-public function bar() {}
+public function bar() {
+}
 }
 $obj = new Foo();
 TestA::nativeTest($obj);
diff --git a/hphp/test/slow/late_static_binding/1883.php b/hphp/test/slow/late_static_binding/1883.php
index aef872f16..ecbb2c296 100644
--- a/hphp/test/slow/late_static_binding/1883.php
+++ b/hphp/test/slow/late_static_binding/1883.php
@@ -1,3 +1,20 @@
 <?php
 
- class X {  public function foo($y) {    call_user_func(array($y, 'foo'));    $y::foo();  }}class Y {  public static function foo() {    var_dump(__METHOD__);    static::bar();  }  public static function bar() {    var_dump(__METHOD__);  }}$x = new X;$x->foo('y');$x->foo(new Y);
\ No newline at end of file
+class X {
+  public function foo($y) {
+    call_user_func(array($y, 'foo'));
+    $y::foo();
+  }
+}
+class Y {
+  public static function foo() {
+    var_dump(__METHOD__);
+    static::bar();
+  }
+  public static function bar() {
+    var_dump(__METHOD__);
+  }
+}
+$x = new X;
+$x->foo('y');
+$x->foo(new Y);
diff --git a/hphp/test/slow/late_static_binding/1884.php b/hphp/test/slow/late_static_binding/1884.php
index 931c384a8..3f409bcf3 100644
--- a/hphp/test/slow/late_static_binding/1884.php
+++ b/hphp/test/slow/late_static_binding/1884.php
@@ -1,3 +1,15 @@
 <?php
 
- class S {  public static function t() {    echo func_get_arg(0);  }}class C {  public static function d() {    echo get_called_class();    S::t(get_called_class());    echo get_called_class();  }}C::d();
\ No newline at end of file
+class S {
+  public static function t() {
+    echo func_get_arg(0);
+  }
+}
+class C {
+  public static function d() {
+    echo get_called_class();
+    S::t(get_called_class());
+    echo get_called_class();
+  }
+}
+C::d();
diff --git a/hphp/test/slow/late_static_binding/1885.php b/hphp/test/slow/late_static_binding/1885.php
index 3b0678ca8..43e8a2cf6 100644
--- a/hphp/test/slow/late_static_binding/1885.php
+++ b/hphp/test/slow/late_static_binding/1885.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   public static function foo() {
     var_dump(get_called_class());
@@ -9,9 +8,11 @@ class A {
     $x = new B;
     $x->fiz(self::foo());
   }
-  function fiz($x) {}
+  function fiz($x) {
+}
+}
+class B extends A {
 }
-class B extends A {}
 $array = array('foo');
 array_map('B::foo', $array);
 call_user_func('B::foo');
diff --git a/hphp/test/slow/late_static_binding/1886.php b/hphp/test/slow/late_static_binding/1886.php
index e62998e3f..9a8da13e5 100644
--- a/hphp/test/slow/late_static_binding/1886.php
+++ b/hphp/test/slow/late_static_binding/1886.php
@@ -1,11 +1,11 @@
 <?php
 
-
 class X {
   function bar() {
     var_dump(get_called_class());
   }
-};
+}
+;
 class Y extends X {
   function foo() {
     call_user_func(array('SELF', 'bar'));
@@ -16,4 +16,4 @@ class Y extends X {
     call_user_func('STATIC::bar');
   }
 }
-Y::foo();
\ No newline at end of file
+Y::foo();
diff --git a/hphp/test/slow/late_static_binding/1887.php b/hphp/test/slow/late_static_binding/1887.php
index e9451509a..2d3e38dfb 100644
--- a/hphp/test/slow/late_static_binding/1887.php
+++ b/hphp/test/slow/late_static_binding/1887.php
@@ -1,3 +1,28 @@
 <?php
 
- class X {  static function foo() {    var_dump(__METHOD__, get_called_class());  }  function bar() {    var_dump(__METHOD__, get_called_class());  }}class Y extends X {}class Z extends X {  static function foo() {    var_dump(__METHOD__, get_called_class());  }}function test($x, $o) {  $x->getMethod('foo')->invoke($o);  $x->getMethod('foo')->invoke(null);  $x->getMethod('bar')->invoke($o);}test(new ReflectionClass('X'), new X);test(new ReflectionClass('Y'), new X);test(new ReflectionClass('X'), new X);test(new ReflectionClass('Z'), new Z);call_user_func(array(new Y, 'X::foo'));call_user_func(array(new Z, 'X::foo'));
\ No newline at end of file
+class X {
+  static function foo() {
+    var_dump(__METHOD__, get_called_class());
+  }
+  function bar() {
+    var_dump(__METHOD__, get_called_class());
+  }
+}
+class Y extends X {
+}
+class Z extends X {
+  static function foo() {
+    var_dump(__METHOD__, get_called_class());
+  }
+}
+function test($x, $o) {
+  $x->getMethod('foo')->invoke($o);
+  $x->getMethod('foo')->invoke(null);
+  $x->getMethod('bar')->invoke($o);
+}
+test(new ReflectionClass('X'), new X);
+test(new ReflectionClass('Y'), new X);
+test(new ReflectionClass('X'), new X);
+test(new ReflectionClass('Z'), new Z);
+call_user_func(array(new Y, 'X::foo'));
+call_user_func(array(new Z, 'X::foo'));
diff --git a/hphp/test/slow/late_static_binding/1888.php b/hphp/test/slow/late_static_binding/1888.php
index 4195bf2bd..50199f69f 100644
--- a/hphp/test/slow/late_static_binding/1888.php
+++ b/hphp/test/slow/late_static_binding/1888.php
@@ -1,3 +1,17 @@
 <?php
 
- class Y {  static function baz($a) { var_dump(get_called_class()); }}class X {  function foo() {    Y::baz(static::bar());  }  static function bar() {    var_dump(get_called_class());  }}$x = new X;$x->foo();
\ No newline at end of file
+class Y {
+  static function baz($a) {
+ var_dump(get_called_class());
+ }
+}
+class X {
+  function foo() {
+    Y::baz(static::bar());
+  }
+  static function bar() {
+    var_dump(get_called_class());
+  }
+}
+$x = new X;
+$x->foo();
diff --git a/hphp/test/slow/list_assignment/30.php b/hphp/test/slow/list_assignment/30.php
index 9b01d9c14..b14c02063 100644
--- a/hphp/test/slow/list_assignment/30.php
+++ b/hphp/test/slow/list_assignment/30.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'old'; var_dump(list($a) = false); var_dump($a);
\ No newline at end of file
+$a = 'old';
+ var_dump(list($a) = false);
+ var_dump($a);
diff --git a/hphp/test/slow/list_assignment/31.php b/hphp/test/slow/list_assignment/31.php
index 82a5eabfb..f1a19cf99 100644
--- a/hphp/test/slow/list_assignment/31.php
+++ b/hphp/test/slow/list_assignment/31.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'old'; var_dump(list($a) = 'test'); var_dump($a);
\ No newline at end of file
+$a = 'old';
+ var_dump(list($a) = 'test');
+ var_dump($a);
diff --git a/hphp/test/slow/list_assignment/32.php b/hphp/test/slow/list_assignment/32.php
index ad869b6e9..cbbd8d178 100644
--- a/hphp/test/slow/list_assignment/32.php
+++ b/hphp/test/slow/list_assignment/32.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'old'; var_dump(list($a) = 123); var_dump($a);
\ No newline at end of file
+$a = 'old';
+ var_dump(list($a) = 123);
+ var_dump($a);
diff --git a/hphp/test/slow/list_assignment/33.php b/hphp/test/slow/list_assignment/33.php
index f0d7456b9..daef0a5d0 100644
--- a/hphp/test/slow/list_assignment/33.php
+++ b/hphp/test/slow/list_assignment/33.php
@@ -1,3 +1,3 @@
 <?php
 
- list() = array(1,2,3);
\ No newline at end of file
+list() = array(1,2,3);
diff --git a/hphp/test/slow/list_assignment/34.php b/hphp/test/slow/list_assignment/34.php
index 1f35b8531..895eee594 100644
--- a/hphp/test/slow/list_assignment/34.php
+++ b/hphp/test/slow/list_assignment/34.php
@@ -1,3 +1,3 @@
 <?php
 
- list(,) = array(1,2,3);
\ No newline at end of file
+list(,) = array(1,2,3);
diff --git a/hphp/test/slow/list_assignment/35.php b/hphp/test/slow/list_assignment/35.php
index be22b6258..89b348c3c 100644
--- a/hphp/test/slow/list_assignment/35.php
+++ b/hphp/test/slow/list_assignment/35.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(list($a,) = array(1,2,3)); var_dump($a);
\ No newline at end of file
+var_dump(list($a,) = array(1,2,3));
+ var_dump($a);
diff --git a/hphp/test/slow/list_assignment/36.php b/hphp/test/slow/list_assignment/36.php
index aa678e28d..0c323af6d 100644
--- a/hphp/test/slow/list_assignment/36.php
+++ b/hphp/test/slow/list_assignment/36.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(list(,$b) = array(1,2,3)); var_dump($b);
\ No newline at end of file
+var_dump(list(,$b) = array(1,2,3));
+ var_dump($b);
diff --git a/hphp/test/slow/list_assignment/37.php b/hphp/test/slow/list_assignment/37.php
index 0c425c912..e18cf693f 100644
--- a/hphp/test/slow/list_assignment/37.php
+++ b/hphp/test/slow/list_assignment/37.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(list($b) = array(1,2,3)); var_dump($b);
\ No newline at end of file
+var_dump(list($b) = array(1,2,3));
+ var_dump($b);
diff --git a/hphp/test/slow/list_assignment/38.php b/hphp/test/slow/list_assignment/38.php
index 44d91b0a1..10460f9f3 100644
--- a/hphp/test/slow/list_assignment/38.php
+++ b/hphp/test/slow/list_assignment/38.php
@@ -1,3 +1,5 @@
 <?php
 
- var_dump(list($a,$b) = array(1,2,3)); var_dump($a); var_dump($b);
\ No newline at end of file
+var_dump(list($a,$b) = array(1,2,3));
+ var_dump($a);
+ var_dump($b);
diff --git a/hphp/test/slow/list_assignment/39.php b/hphp/test/slow/list_assignment/39.php
index c309594e5..fdacc5cbf 100644
--- a/hphp/test/slow/list_assignment/39.php
+++ b/hphp/test/slow/list_assignment/39.php
@@ -1,3 +1,6 @@
 <?php
 
- var_dump(list($a,list($c),$b) = array(1,array(2),3));var_dump($a); var_dump($b); var_dump($c);
\ No newline at end of file
+var_dump(list($a,list($c),$b) = array(1,array(2),3));
+var_dump($a);
+ var_dump($b);
+ var_dump($c);
diff --git a/hphp/test/slow/list_assignment/40.php b/hphp/test/slow/list_assignment/40.php
index e1db620ec..a20d6b5b1 100644
--- a/hphp/test/slow/list_assignment/40.php
+++ b/hphp/test/slow/list_assignment/40.php
@@ -1,3 +1,7 @@
 <?php
 
- $c = 'old'; var_dump(list($a,list($c),$b) = array(1,'test',3));var_dump($a); var_dump($b); var_dump($c);
\ No newline at end of file
+$c = 'old';
+ var_dump(list($a,list($c),$b) = array(1,'test',3));
+var_dump($a);
+ var_dump($b);
+ var_dump($c);
diff --git a/hphp/test/slow/list_assignment/41.php b/hphp/test/slow/list_assignment/41.php
index 2688b2821..392def57d 100644
--- a/hphp/test/slow/list_assignment/41.php
+++ b/hphp/test/slow/list_assignment/41.php
@@ -1,3 +1,5 @@
 <?php
 
- var_dump(list($a,list(),$b) = array(1,array(2),3));var_dump($a); var_dump($b);
\ No newline at end of file
+var_dump(list($a,list(),$b) = array(1,array(2),3));
+var_dump($a);
+ var_dump($b);
diff --git a/hphp/test/slow/list_assignment/42.php b/hphp/test/slow/list_assignment/42.php
index a708afe78..4595ddb59 100644
--- a/hphp/test/slow/list_assignment/42.php
+++ b/hphp/test/slow/list_assignment/42.php
@@ -1,3 +1,5 @@
 <?php
 
- $info = array('coffee', 'brown', 'caffeine');list($a[0], $a[1], $a[2]) = $info;var_dump($a);
\ No newline at end of file
+$info = array('coffee', 'brown', 'caffeine');
+list($a[0], $a[1], $a[2]) = $info;
+var_dump($a);
diff --git a/hphp/test/slow/list_assignment/43.php b/hphp/test/slow/list_assignment/43.php
index ff26d9316..8942d4a96 100644
--- a/hphp/test/slow/list_assignment/43.php
+++ b/hphp/test/slow/list_assignment/43.php
@@ -1,3 +1,36 @@
 <?php
 
- class obj implements arrayaccess {    private $container = array();    public function __construct() {        $this->container = array(            'one'   => 1,            'two'   => 2,            'three' => 3,        );    }    public function offsetSet($offset, $value) {        $this->container[$offset] = $value;    }    public function offsetExists($offset) {        return isset($this->container[$offset]);    }    public function offsetUnset($offset) {        unset($this->container[$offset]);    }    public function offsetGet($offset) {        return isset($this->container[$offset]) ? $this->container[$offset] : null;    }}class SetTest {  private $_vals = array(      'one'   => 1,      'two'   => 2,      'three' => 3,      );  public function __set($name, $value) {    $this->_vals[$name] = $value;  }}$o = new obj;$q = list($o['one'], $o['two'], list($o['three'])) =  array('eins', 'zwei', array('drei'));var_dump($o);var_dump($q);$x = new SetTest;$qq = list($x->one, $x->two, list($x->three)) = 1;var_dump($x);$qq = list($x->one, $x->two, list($x->three)) = $q;var_dump($x);var_dump($qq);
\ No newline at end of file
+class obj implements arrayaccess {
+    private $container = array();
+    public function __construct() {
+        $this->container = array(            'one'   => 1,            'two'   => 2,            'three' => 3,        );
+    }
+    public function offsetSet($offset, $value) {
+        $this->container[$offset] = $value;
+    }
+    public function offsetExists($offset) {
+        return isset($this->container[$offset]);
+    }
+    public function offsetUnset($offset) {
+        unset($this->container[$offset]);
+    }
+    public function offsetGet($offset) {
+        return isset($this->container[$offset]) ? $this->container[$offset] : null;
+    }
+}
+class SetTest {
+  private $_vals = array(      'one'   => 1,      'two'   => 2,      'three' => 3,      );
+  public function __set($name, $value) {
+    $this->_vals[$name] = $value;
+  }
+}
+$o = new obj;
+$q = list($o['one'], $o['two'], list($o['three'])) =  array('eins', 'zwei', array('drei'));
+var_dump($o);
+var_dump($q);
+$x = new SetTest;
+$qq = list($x->one, $x->two, list($x->three)) = 1;
+var_dump($x);
+$qq = list($x->one, $x->two, list($x->three)) = $q;
+var_dump($x);
+var_dump($qq);
diff --git a/hphp/test/slow/list_assignment/44.php b/hphp/test/slow/list_assignment/44.php
index e8d89b498..efe23a0d2 100644
--- a/hphp/test/slow/list_assignment/44.php
+++ b/hphp/test/slow/list_assignment/44.php
@@ -1,3 +1,7 @@
 <?php
 
- function test($a) {  list($a[0], $a[1], $a) = $a;  var_dump($a);}test(array('abc', 'cde', 'fgh'));
\ No newline at end of file
+function test($a) {
+  list($a[0], $a[1], $a) = $a;
+  var_dump($a);
+}
+test(array('abc', 'cde', 'fgh'));
diff --git a/hphp/test/slow/list_assignment/45.php b/hphp/test/slow/list_assignment/45.php
index 63db28794..29e7f2948 100644
--- a/hphp/test/slow/list_assignment/45.php
+++ b/hphp/test/slow/list_assignment/45.php
@@ -1,3 +1,8 @@
 <?php
 
- function test() {  $a = array('abc', 'cde', 'fgh');  list($a[0], $a[1], $a) = $a;  var_dump($a);}test();
\ No newline at end of file
+function test() {
+  $a = array('abc', 'cde', 'fgh');
+  list($a[0], $a[1], $a) = $a;
+  var_dump($a);
+}
+test();
diff --git a/hphp/test/slow/list_assignment/46.php b/hphp/test/slow/list_assignment/46.php
index ea472efe4..3ef8c5574 100644
--- a/hphp/test/slow/list_assignment/46.php
+++ b/hphp/test/slow/list_assignment/46.php
@@ -1,3 +1,7 @@
 <?php
 
- function test($a, $b, $i) {  list($a[$i++], $a[$i++], $a[$i++]) = $b;  var_dump($a);  }test(array(), array('x', 'y', 'z'), 0);
\ No newline at end of file
+function test($a, $b, $i) {
+  list($a[$i++], $a[$i++], $a[$i++]) = $b;
+  var_dump($a);
+  }
+test(array(), array('x', 'y', 'z'), 0);
diff --git a/hphp/test/slow/list_assignment/47.php b/hphp/test/slow/list_assignment/47.php
index 14de9c114..0bdebdc37 100644
--- a/hphp/test/slow/list_assignment/47.php
+++ b/hphp/test/slow/list_assignment/47.php
@@ -1,3 +1,5 @@
 <?php
 
- $i = 0; list($a[$i++], list($a[$i++], $a[$i++]), $a[$i++]) =     array('x', array('y1', 'y2'), 'z'); var_dump($a);
\ No newline at end of file
+$i = 0;
+ list($a[$i++], list($a[$i++], $a[$i++]), $a[$i++]) =     array('x', array('y1', 'y2'), 'z');
+ var_dump($a);
diff --git a/hphp/test/slow/list_assignment/48.php b/hphp/test/slow/list_assignment/48.php
index b3cf88cb4..6307fb445 100644
--- a/hphp/test/slow/list_assignment/48.php
+++ b/hphp/test/slow/list_assignment/48.php
@@ -1,3 +1,6 @@
 <?php
 
- function foo($a) {  list($x, $y) = 'x'.$a;  return $x + $y;}
\ No newline at end of file
+function foo($a) {
+  list($x, $y) = 'x'.$a;
+  return $x + $y;
+}
diff --git a/hphp/test/slow/list_assignment/49.php b/hphp/test/slow/list_assignment/49.php
index 250057189..e46853d99 100644
--- a/hphp/test/slow/list_assignment/49.php
+++ b/hphp/test/slow/list_assignment/49.php
@@ -1,3 +1,23 @@
 <?php
 
- class X implements ArrayAccess {  function offsetget($n) { return $n; }  function offsetset($n,$v) { }  function offsetexists($n) { return true; }  function offsetunset($n) {}}list($a,$b) = new X;var_dump($a, $b);$x = 'foo';$y = 'bar';list($a, $b) = $x.$y;var_dump($a,$b);$z = $x.$y;list($a, $b) = $z;var_dump($a, $b);
\ No newline at end of file
+class X implements ArrayAccess {
+  function offsetget($n) {
+ return $n;
+ }
+  function offsetset($n,$v) {
+ }
+  function offsetexists($n) {
+ return true;
+ }
+  function offsetunset($n) {
+}
+}
+list($a,$b) = new X;
+var_dump($a, $b);
+$x = 'foo';
+$y = 'bar';
+list($a, $b) = $x.$y;
+var_dump($a,$b);
+$z = $x.$y;
+list($a, $b) = $z;
+var_dump($a, $b);
diff --git a/hphp/test/slow/list_assignment/50.php b/hphp/test/slow/list_assignment/50.php
index 56260803a..91644781f 100644
--- a/hphp/test/slow/list_assignment/50.php
+++ b/hphp/test/slow/list_assignment/50.php
@@ -1,3 +1,12 @@
 <?php
 
- class X {  static public $val = array(1,2,3);  function foo() {    list($a, $b) = self::$val;    var_dump($a, $b);  }}$x = new X;$x->foo();X::$val = null;
\ No newline at end of file
+class X {
+  static public $val = array(1,2,3);
+  function foo() {
+    list($a, $b) = self::$val;
+    var_dump($a, $b);
+  }
+}
+$x = new X;
+$x->foo();
+X::$val = null;
diff --git a/hphp/test/slow/locale/173.php b/hphp/test/slow/locale/173.php
index 5ded76284..76dd70452 100644
--- a/hphp/test/slow/locale/173.php
+++ b/hphp/test/slow/locale/173.php
@@ -1,3 +1,15 @@
 <?php
 
- class A { public $a; function __toString() { return $this->a;}} $a = new A; $a->a = 'a'; $b = new A; $b->a = 'b'; $arr = array($a, $b); sort($arr, SORT_REGULAR, true); print ((string)$arr[0]);
\ No newline at end of file
+class A {
+ public $a;
+ function __toString() {
+ return $this->a;
+}
+}
+ $a = new A;
+ $a->a = 'a';
+ $b = new A;
+ $b->a = 'b';
+ $arr = array($a, $b);
+ sort($arr, SORT_REGULAR, true);
+ print ((string)$arr[0]);
diff --git a/hphp/test/slow/locale/174.php b/hphp/test/slow/locale/174.php
index 1b32a7456..25b10c971 100644
--- a/hphp/test/slow/locale/174.php
+++ b/hphp/test/slow/locale/174.php
@@ -1,3 +1,13 @@
 <?php
 
- class A { public $a; }$a = new A; $a->a = 'a'; $b = new A; $b->a = 'b'; $arr = array($b, $a);print $arr[0]->a;sort($arr, SORT_REGULAR, true); print $arr[0]->a;
\ No newline at end of file
+class A {
+ public $a;
+ }
+$a = new A;
+ $a->a = 'a';
+ $b = new A;
+ $b->a = 'b';
+ $arr = array($b, $a);
+print $arr[0]->a;
+sort($arr, SORT_REGULAR, true);
+ print $arr[0]->a;
diff --git a/hphp/test/slow/locale/175.php b/hphp/test/slow/locale/175.php
index 7f0ab6462..a53edaef1 100644
--- a/hphp/test/slow/locale/175.php
+++ b/hphp/test/slow/locale/175.php
@@ -1,3 +1,8 @@
 <?php
 
- $a = array(1);$b = array(2);$arr = array($b, $a);print $arr[0][0];asort($arr, SORT_REGULAR, true); print $arr[0][0];
\ No newline at end of file
+$a = array(1);
+$b = array(2);
+$arr = array($b, $a);
+print $arr[0][0];
+asort($arr, SORT_REGULAR, true);
+ print $arr[0][0];
diff --git a/hphp/test/slow/logical_operators/1451.php b/hphp/test/slow/logical_operators/1451.php
index 9cb7e6ebb..abdabac06 100644
--- a/hphp/test/slow/logical_operators/1451.php
+++ b/hphp/test/slow/logical_operators/1451.php
@@ -1,3 +1,14 @@
 <?php
 
- function foo() { echo "foo"; }$a = (false && foo());$b = (true  || foo());$c = (false and foo());$d = (true  or  foo());$e = ($e || true);$f = ($f or true);$g = ($g && false);$h = ($h and false);var_dump($a, $b, $c, $d, $e, $f, $g, $h);
\ No newline at end of file
+function foo() {
+ echo "foo";
+ }
+$a = (false && foo());
+$b = (true  || foo());
+$c = (false and foo());
+$d = (true  or  foo());
+$e = ($e || true);
+$f = ($f or true);
+$g = ($g && false);
+$h = ($h and false);
+var_dump($a, $b, $c, $d, $e, $f, $g, $h);
diff --git a/hphp/test/slow/logical_operators/1452.php b/hphp/test/slow/logical_operators/1452.php
index 02f34517c..0c5b89f1a 100644
--- a/hphp/test/slow/logical_operators/1452.php
+++ b/hphp/test/slow/logical_operators/1452.php
@@ -1,3 +1,16 @@
 <?php
 
- function foo($a) { echo "foo"; return $a; }$x = true;$x = $x and foo(false);var_dump($x);$x = $x && foo(false);var_dump($x);$x = false;$x = $x or foo(true);var_dump($x);$x = $x || foo(true);var_dump($x);
\ No newline at end of file
+function foo($a) {
+ echo "foo";
+ return $a;
+ }
+$x = true;
+$x = $x and foo(false);
+var_dump($x);
+$x = $x && foo(false);
+var_dump($x);
+$x = false;
+$x = $x or foo(true);
+var_dump($x);
+$x = $x || foo(true);
+var_dump($x);
diff --git a/hphp/test/slow/logical_operators/1453.php b/hphp/test/slow/logical_operators/1453.php
index f0e2a2e26..d1931c4a0 100644
--- a/hphp/test/slow/logical_operators/1453.php
+++ b/hphp/test/slow/logical_operators/1453.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump($a || null);
\ No newline at end of file
+var_dump($a || null);
diff --git a/hphp/test/slow/logical_operators/1454.php b/hphp/test/slow/logical_operators/1454.php
index 0336f06c9..c1572eed1 100644
--- a/hphp/test/slow/logical_operators/1454.php
+++ b/hphp/test/slow/logical_operators/1454.php
@@ -1,3 +1,26 @@
 <?php
 
- function f($a) { var_dump('f:'.$a); return $a; }function foo($a) {  var_dump($a && true);  var_dump(f($a) && true);  var_dump(true && $a);  var_dump(true && f($a));  var_dump($a && false);  var_dump(f($a) && false);  var_dump(false && $a);  var_dump(false && f($a));  var_dump($a || true);  var_dump(f($a) || true);  var_dump(true || $a);  var_dump(true || f($a));  var_dump($a || false);  var_dump(f($a) || false);  var_dump(false || $a);  var_dump(false || f($a));}foo(34);foo(0);
\ No newline at end of file
+function f($a) {
+ var_dump('f:'.$a);
+ return $a;
+ }
+function foo($a) {
+  var_dump($a && true);
+  var_dump(f($a) && true);
+  var_dump(true && $a);
+  var_dump(true && f($a));
+  var_dump($a && false);
+  var_dump(f($a) && false);
+  var_dump(false && $a);
+  var_dump(false && f($a));
+  var_dump($a || true);
+  var_dump(f($a) || true);
+  var_dump(true || $a);
+  var_dump(true || f($a));
+  var_dump($a || false);
+  var_dump(f($a) || false);
+  var_dump(false || $a);
+  var_dump(false || f($a));
+}
+foo(34);
+foo(0);
diff --git a/hphp/test/slow/max_int/1201.php b/hphp/test/slow/max_int/1201.php
index 41d826b5c..533ca3c51 100644
--- a/hphp/test/slow/max_int/1201.php
+++ b/hphp/test/slow/max_int/1201.php
@@ -1,3 +1,7 @@
 <?php
 
- $val1 = ~PHP_INT_MAX; $val2 = PHP_INT_MAX; var_dump($val1); var_dump($val2); 
\ No newline at end of file
+$val1 = ~PHP_INT_MAX;
+ $val2 = PHP_INT_MAX;
+ var_dump($val1);
+ var_dump($val2);
+
diff --git a/hphp/test/slow/minus/1423.php b/hphp/test/slow/minus/1423.php
index e02bed842..37784f163 100644
--- a/hphp/test/slow/minus/1423.php
+++ b/hphp/test/slow/minus/1423.php
@@ -1,3 +1,6 @@
 <?php
 
- printf("%s\n", 30 - 30);printf("%s\n", "30" - 30);printf("%s\n", 30 - "30");printf("%s\n", "30" - "30");
\ No newline at end of file
+printf("%s\n", 30 - 30);
+printf("%s\n", "30" - 30);
+printf("%s\n", 30 - "30");
+printf("%s\n", "30" - "30");
diff --git a/hphp/test/slow/minus/1424.php b/hphp/test/slow/minus/1424.php
index d6b9d3560..44d914803 100644
--- a/hphp/test/slow/minus/1424.php
+++ b/hphp/test/slow/minus/1424.php
@@ -1,3 +1,22 @@
 <?php
 
- $a = "123.456" - 123;var_dump($a);$a = "123.456" - 456.123;var_dump($a);$a = "123.456" - "123";var_dump($a);$a = "123.456" - "456.123";var_dump($a);$a = "123.456";$a -= 123;var_dump($a);$a = "123.456";$a -= 456.123;var_dump($a);$a = "123.456";$a -= "123";var_dump($a);$a = "123.456";$a -= "456.123";var_dump($a);
\ No newline at end of file
+$a = "123.456" - 123;
+var_dump($a);
+$a = "123.456" - 456.123;
+var_dump($a);
+$a = "123.456" - "123";
+var_dump($a);
+$a = "123.456" - "456.123";
+var_dump($a);
+$a = "123.456";
+$a -= 123;
+var_dump($a);
+$a = "123.456";
+$a -= 456.123;
+var_dump($a);
+$a = "123.456";
+$a -= "123";
+var_dump($a);
+$a = "123.456";
+$a -= "456.123";
+var_dump($a);
diff --git a/hphp/test/slow/modulus/1429.php b/hphp/test/slow/modulus/1429.php
index c7f348cbc..d650be580 100644
--- a/hphp/test/slow/modulus/1429.php
+++ b/hphp/test/slow/modulus/1429.php
@@ -1,3 +1,6 @@
 <?php
 
- printf("%s\n", 30 % 30);printf("%s\n", "30" % 30);printf("%s\n", 30 % "30");printf("%s\n", "30" % "30");
\ No newline at end of file
+printf("%s\n", 30 % 30);
+printf("%s\n", "30" % 30);
+printf("%s\n", 30 % "30");
+printf("%s\n", "30" % "30");
diff --git a/hphp/test/slow/modulus/1430.php b/hphp/test/slow/modulus/1430.php
index 99f992f8c..7ab028546 100644
--- a/hphp/test/slow/modulus/1430.php
+++ b/hphp/test/slow/modulus/1430.php
@@ -1,3 +1,30 @@
 <?php
 
- $a = "123.456" % 123;var_dump($a);$a = "123.456" % 456.123;var_dump($a);$a = "123.456" % "123";var_dump($a);$a = "123.456" % "456.123";var_dump($a);$a = "123.456";$a %= 123;var_dump($a);$a = "123.456";$a %= 456.123;var_dump($a);$a = "123.456";$a %= "123";var_dump($a);$a = "123.456";$a %= "456.123";var_dump($a);$a = "123" % 123;var_dump($a);$a = "123" % "123";var_dump($a);$a = "321" % 123;var_dump($a);$a = "321" % 123.456;var_dump($a);
\ No newline at end of file
+$a = "123.456" % 123;
+var_dump($a);
+$a = "123.456" % 456.123;
+var_dump($a);
+$a = "123.456" % "123";
+var_dump($a);
+$a = "123.456" % "456.123";
+var_dump($a);
+$a = "123.456";
+$a %= 123;
+var_dump($a);
+$a = "123.456";
+$a %= 456.123;
+var_dump($a);
+$a = "123.456";
+$a %= "123";
+var_dump($a);
+$a = "123.456";
+$a %= "456.123";
+var_dump($a);
+$a = "123" % 123;
+var_dump($a);
+$a = "123" % "123";
+var_dump($a);
+$a = "321" % 123;
+var_dump($a);
+$a = "321" % 123.456;
+var_dump($a);
diff --git a/hphp/test/slow/modulus/1431.php b/hphp/test/slow/modulus/1431.php
index ec7f859fe..304400275 100644
--- a/hphp/test/slow/modulus/1431.php
+++ b/hphp/test/slow/modulus/1431.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 1 % 9223372036854775807;var_dump($a);
\ No newline at end of file
+$a = 1 % 9223372036854775807;
+var_dump($a);
diff --git a/hphp/test/slow/multiply/1425.php b/hphp/test/slow/multiply/1425.php
index c40c8fb9a..df2abda72 100644
--- a/hphp/test/slow/multiply/1425.php
+++ b/hphp/test/slow/multiply/1425.php
@@ -1,3 +1,6 @@
 <?php
 
- printf("%s\n", 30 * 30);printf("%s\n", "30" * 30);printf("%s\n", 30 * "30");printf("%s\n", "30" * "30");
\ No newline at end of file
+printf("%s\n", 30 * 30);
+printf("%s\n", "30" * 30);
+printf("%s\n", 30 * "30");
+printf("%s\n", "30" * "30");
diff --git a/hphp/test/slow/multiply/1426.php b/hphp/test/slow/multiply/1426.php
index 5888776aa..eb6f4e8e1 100644
--- a/hphp/test/slow/multiply/1426.php
+++ b/hphp/test/slow/multiply/1426.php
@@ -1,3 +1,22 @@
 <?php
 
- $a = "123.456" * 123;var_dump($a);$a = "123.456" * 456.123;var_dump($a);$a = "123.456" * "123";var_dump($a);$a = "123.456" * "456.123";var_dump($a);$a = "123.456";$a *= 123;var_dump($a);$a = "123.456";$a *= 456.123;var_dump($a);$a = "123.456";$a *= "123";var_dump($a);$a = "123.456";$a *= "456.123";var_dump($a);
\ No newline at end of file
+$a = "123.456" * 123;
+var_dump($a);
+$a = "123.456" * 456.123;
+var_dump($a);
+$a = "123.456" * "123";
+var_dump($a);
+$a = "123.456" * "456.123";
+var_dump($a);
+$a = "123.456";
+$a *= 123;
+var_dump($a);
+$a = "123.456";
+$a *= 456.123;
+var_dump($a);
+$a = "123.456";
+$a *= "123";
+var_dump($a);
+$a = "123.456";
+$a *= "456.123";
+var_dump($a);
diff --git a/hphp/test/slow/namespace/2216.php b/hphp/test/slow/namespace/2216.php
index dd435a712..93a9b6e5e 100644
--- a/hphp/test/slow/namespace/2216.php
+++ b/hphp/test/slow/namespace/2216.php
@@ -1,14 +1,20 @@
 <?php
 
-
 namespace my\name;
-class MyClass {}
-function myfunction() {}
+class MyClass {
+}
+function myfunction() {
+}
 const MYCONST = 123;
 
-$a = new MyClass; var_dump(get_class($a));
-$c = new \my\name\MyClass; var_dump(get_class($a));
-$a = strlen('hi'); var_dump($a);
-$d = namespace\MYCONST; var_dump($d);
-$d = __NAMESPACE__ . '\MYCONST'; var_dump(constant($d));
+$a = new MyClass;
+ var_dump(get_class($a));
+$c = new \my\name\MyClass;
+ var_dump(get_class($a));
+$a = strlen('hi');
+ var_dump($a);
+$d = namespace\MYCONST;
+ var_dump($d);
+$d = __NAMESPACE__ . '\MYCONST';
+ var_dump(constant($d));
 var_dump(defined('MYCONST'));
diff --git a/hphp/test/slow/namespace/2217.php b/hphp/test/slow/namespace/2217.php
index 5af2a4180..0300573e0 100644
--- a/hphp/test/slow/namespace/2217.php
+++ b/hphp/test/slow/namespace/2217.php
@@ -1,11 +1,14 @@
 <?php
 
-
 namespace foo\baz {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace bar\baz {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace {
   use foo\baz as baz;
diff --git a/hphp/test/slow/namespace/2218.php b/hphp/test/slow/namespace/2218.php
index 745680413..51a010093 100644
--- a/hphp/test/slow/namespace/2218.php
+++ b/hphp/test/slow/namespace/2218.php
@@ -1,11 +1,14 @@
 <?php
 
-
 namespace foo\baz {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace bar\baz {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace bar {
   use foo\baz as baz;
diff --git a/hphp/test/slow/namespace/2219.php b/hphp/test/slow/namespace/2219.php
index ca50ef15b..627d10f0e 100644
--- a/hphp/test/slow/namespace/2219.php
+++ b/hphp/test/slow/namespace/2219.php
@@ -1,11 +1,15 @@
 <?php
 
-
-  namespace foo\baz {
-  function foo() { var_dump(__NAMESPACE__);}
+namespace foo\baz {
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace bar\baz {
-  function foo() { var_dump(__NAMESPACE__);}}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
+}
 namespace bar {
   baz\foo();
 }
diff --git a/hphp/test/slow/namespace/2220.php b/hphp/test/slow/namespace/2220.php
index 8cae90ccf..bb6b46579 100644
--- a/hphp/test/slow/namespace/2220.php
+++ b/hphp/test/slow/namespace/2220.php
@@ -1,8 +1,9 @@
 <?php
 
-
 namespace {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
 }
diff --git a/hphp/test/slow/namespace/2221.php b/hphp/test/slow/namespace/2221.php
index 3714c5d61..bd9e30da6 100644
--- a/hphp/test/slow/namespace/2221.php
+++ b/hphp/test/slow/namespace/2221.php
@@ -1,11 +1,14 @@
 <?php
 
-
 namespace {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
   foo();
diff --git a/hphp/test/slow/namespace/2222.php b/hphp/test/slow/namespace/2222.php
index d733a4827..1c235f660 100644
--- a/hphp/test/slow/namespace/2222.php
+++ b/hphp/test/slow/namespace/2222.php
@@ -1,11 +1,14 @@
 <?php
 
-
 namespace {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
   \B\foo();
diff --git a/hphp/test/slow/namespace/2223.php b/hphp/test/slow/namespace/2223.php
index 8b3aec4c2..04ba9dbba 100644
--- a/hphp/test/slow/namespace/2223.php
+++ b/hphp/test/slow/namespace/2223.php
@@ -1,11 +1,14 @@
 <?php
 
-
 namespace {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
   \foo();
diff --git a/hphp/test/slow/namespace/2224.php b/hphp/test/slow/namespace/2224.php
index 828e736a3..f8dec1022 100644
--- a/hphp/test/slow/namespace/2224.php
+++ b/hphp/test/slow/namespace/2224.php
@@ -1,11 +1,14 @@
 <?php
 
-
 namespace {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
   $a = 'foo';
diff --git a/hphp/test/slow/namespace/2225.php b/hphp/test/slow/namespace/2225.php
index f313c8902..b909e6cc6 100644
--- a/hphp/test/slow/namespace/2225.php
+++ b/hphp/test/slow/namespace/2225.php
@@ -1,11 +1,14 @@
 <?php
 
-
 namespace {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
-  function foo() { var_dump(__NAMESPACE__);}
+  function foo() {
+ var_dump(__NAMESPACE__);
+}
 }
 namespace B {
   call_user_func('foo');
diff --git a/hphp/test/slow/namespace/2226.php b/hphp/test/slow/namespace/2226.php
index 5e4644b22..e1f6cea6e 100644
--- a/hphp/test/slow/namespace/2226.php
+++ b/hphp/test/slow/namespace/2226.php
@@ -1,3 +1,34 @@
 <?php
 
- namespace {  function fiz() { var_dump(__METHOD__); }  const FIZ = 25;  const FUZ = 1;}namespace foo {  class bar {    public function test() { echo __CLASS__ . PHP_EOL; }  }  const FUZ = 2;  class baz extends bar {    public function fiz() {      self::test();      parent::test();      static::test();      bar::test();    }  }  $x = new baz();  $x->fiz();  var_dump(true);  var_dump(false);  var_dump(null);  var_dump(INF);  var_dump(FIZ);  var_dump(FUZ);  var_dump(\FUZ);}
\ No newline at end of file
+namespace {
+  function fiz() {
+ var_dump(__METHOD__);
+ }
+  const FIZ = 25;
+  const FUZ = 1;
+}
+namespace foo {
+  class bar {
+    public function test() {
+ echo __CLASS__ . PHP_EOL;
+ }
+  }
+  const FUZ = 2;
+  class baz extends bar {
+    public function fiz() {
+      self::test();
+      parent::test();
+      static::test();
+      bar::test();
+    }
+  }
+  $x = new baz();
+  $x->fiz();
+  var_dump(true);
+  var_dump(false);
+  var_dump(null);
+  var_dump(INF);
+  var_dump(FIZ);
+  var_dump(FUZ);
+  var_dump(\FUZ);
+}
diff --git a/hphp/test/slow/namespace/2227.php b/hphp/test/slow/namespace/2227.php
index fd3826377..ecc72e81d 100644
--- a/hphp/test/slow/namespace/2227.php
+++ b/hphp/test/slow/namespace/2227.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace A\B;
 class Foo {
   static $baz = 32;
@@ -22,7 +21,8 @@ if (rand(0, 1)) {
       return Foo::NoSuchConstant;
     }
   }
-} else {
+}
+ else {
   class B {
     static $baz = 'baz';
     const FOO = 30;
diff --git a/hphp/test/slow/new_object_expression/775.php b/hphp/test/slow/new_object_expression/775.php
index f5932b4ba..b25672c54 100644
--- a/hphp/test/slow/new_object_expression/775.php
+++ b/hphp/test/slow/new_object_expression/775.php
@@ -1,3 +1,13 @@
 <?php
 
- class A { var $num; }function foo() { return new A(); }foreach(($a=(object)new A()) as $v);foreach(($a=(object)foo()) as $v);foreach(($a=new A()) as $v);$a->num = 1;print($a->num);
\ No newline at end of file
+class A {
+ var $num;
+ }
+function foo() {
+ return new A();
+ }
+foreach(($a=(object)new A()) as $v);
+foreach(($a=(object)foo()) as $v);
+foreach(($a=new A()) as $v);
+$a->num = 1;
+print($a->num);
diff --git a/hphp/test/slow/new_object_expression/776.php b/hphp/test/slow/new_object_expression/776.php
index 5c66ebb5a..f6952f0b2 100644
--- a/hphp/test/slow/new_object_expression/776.php
+++ b/hphp/test/slow/new_object_expression/776.php
@@ -1,3 +1,10 @@
 <?php
 
- class A {} class B extends A { static function foo() { return new self();} } var_dump(B::foo());
\ No newline at end of file
+class A {
+}
+ class B extends A {
+ static function foo() {
+ return new self();
+}
+ }
+ var_dump(B::foo());
diff --git a/hphp/test/slow/new_object_expression/777.php b/hphp/test/slow/new_object_expression/777.php
index a038ea469..e17b0e3fb 100644
--- a/hphp/test/slow/new_object_expression/777.php
+++ b/hphp/test/slow/new_object_expression/777.php
@@ -1,3 +1,10 @@
 <?php
 
- class A {} class B extends A { static function foo() { return new parent();} } var_dump(B::foo());
\ No newline at end of file
+class A {
+}
+ class B extends A {
+ static function foo() {
+ return new parent();
+}
+ }
+ var_dump(B::foo());
diff --git a/hphp/test/slow/new_object_expression/778.php b/hphp/test/slow/new_object_expression/778.php
index 6f7a73128..3f383e350 100644
--- a/hphp/test/slow/new_object_expression/778.php
+++ b/hphp/test/slow/new_object_expression/778.php
@@ -1,3 +1,9 @@
 <?php
 
- function g() {}function h() {}class C {}new C(g(), h());
\ No newline at end of file
+function g() {
+}
+function h() {
+}
+class C {
+}
+new C(g(), h());
diff --git a/hphp/test/slow/new_object_expression/779.php b/hphp/test/slow/new_object_expression/779.php
index b8dad196d..02e280abe 100644
--- a/hphp/test/slow/new_object_expression/779.php
+++ b/hphp/test/slow/new_object_expression/779.php
@@ -1,3 +1,11 @@
 <?php
 
- class X {  function __construct($a, &$b) {  }}function test($a) {  $b = 1;  return new X($a, $b);}var_dump(test(3));
\ No newline at end of file
+class X {
+  function __construct($a, &$b) {
+  }
+}
+function test($a) {
+  $b = 1;
+  return new X($a, $b);
+}
+var_dump(test(3));
diff --git a/hphp/test/slow/new_object_expression/780.php b/hphp/test/slow/new_object_expression/780.php
index 1a1a348c7..0f0e49ee5 100644
--- a/hphp/test/slow/new_object_expression/780.php
+++ b/hphp/test/slow/new_object_expression/780.php
@@ -1,3 +1,21 @@
 <?php
 
- class A1 {  public function A1($id) {    $this->id = $id;  }}class B1 extends A1 {}class C1 extends B1 {  public function __construct($id) {    parent::__construct($id);  }  function zz($id) {    parent::__construct($id);  }}$x = new C1(100);echo $x->id."\n";$x->zz(1);echo $x->id."\n";
\ No newline at end of file
+class A1 {
+  public function A1($id) {
+    $this->id = $id;
+  }
+}
+class B1 extends A1 {
+}
+class C1 extends B1 {
+  public function __construct($id) {
+    parent::__construct($id);
+  }
+  function zz($id) {
+    parent::__construct($id);
+  }
+}
+$x = new C1(100);
+echo $x->id."\n";
+$x->zz(1);
+echo $x->id."\n";
diff --git a/hphp/test/slow/new_object_expression/781.php b/hphp/test/slow/new_object_expression/781.php
index 73d288d13..85cfb4746 100644
--- a/hphp/test/slow/new_object_expression/781.php
+++ b/hphp/test/slow/new_object_expression/781.php
@@ -1,10 +1,22 @@
 <?php
 
-
 class A {
-  function __construct($a) { echo "A\n"; }
-  function __destruct() { var_dump($this); }
+  function __construct($a) {
+ echo "A\n";
+ }
+  function __destruct() {
+ var_dump($this);
+ }
 }
-function f() { echo "f\n"; throw new Exception(); }
-function test() { $a = new A(f()); }
-try { test(); } catch (Exception $e) { }
+function f() {
+ echo "f\n";
+ throw new Exception();
+ }
+function test() {
+ $a = new A(f());
+ }
+try {
+ test();
+ }
+ catch (Exception $e) {
+ }
diff --git a/hphp/test/slow/new_object_expression/782.php b/hphp/test/slow/new_object_expression/782.php
index a012ab8e6..b40395202 100644
--- a/hphp/test/slow/new_object_expression/782.php
+++ b/hphp/test/slow/new_object_expression/782.php
@@ -1,3 +1,14 @@
 <?php
 
- class foo {  static function ioo($y, &$x) {    return new self(1);  }  function __construct($a, $b) {}}function t() {  $x = 1;  foo::ioo($x, $y);}t();
\ No newline at end of file
+class foo {
+  static function ioo($y, &$x) {
+    return new self(1);
+  }
+  function __construct($a, $b) {
+}
+}
+function t() {
+  $x = 1;
+  foo::ioo($x, $y);
+}
+t();
diff --git a/hphp/test/slow/new_object_expression/783.php b/hphp/test/slow/new_object_expression/783.php
index b694dcffb..0ce5cdc85 100644
--- a/hphp/test/slow/new_object_expression/783.php
+++ b/hphp/test/slow/new_object_expression/783.php
@@ -1,3 +1,20 @@
 <?php
 
- class X {  function __toString() { return 'hello'; }}function f() {  return 'bar';}function test($e) {  $a = 'foo';  for ($i = 0; $i < 10; $i++) {    $a .= new X($e['x']) . f();  }  return $a;}var_dump(test());
\ No newline at end of file
+class X {
+  function __toString() {
+ return 'hello';
+ }
+}
+function f() {
+  return 'bar';
+}
+function test($e) {
+  $a = 'foo';
+  for ($i = 0;
+ $i < 10;
+ $i++) {
+    $a .= new X($e['x']) . f();
+  }
+  return $a;
+}
+var_dump(test());
diff --git a/hphp/test/slow/new_object_expression/784.php b/hphp/test/slow/new_object_expression/784.php
index b59a65cff..c23668c34 100644
--- a/hphp/test/slow/new_object_expression/784.php
+++ b/hphp/test/slow/new_object_expression/784.php
@@ -1,3 +1,10 @@
 <?php
 
- class X {}class Y {}function test($x) {  return new $x($x = 'y');}var_dump(test('x'));
\ No newline at end of file
+class X {
+}
+class Y {
+}
+function test($x) {
+  return new $x($x = 'y');
+}
+var_dump(test('x'));
diff --git a/hphp/test/slow/now_doc/1906.php b/hphp/test/slow/now_doc/1906.php
index 301ecfe13..26e9af8cf 100644
--- a/hphp/test/slow/now_doc/1906.php
+++ b/hphp/test/slow/now_doc/1906.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $b = 'bad';
 $a = <<<'NOWDOC'
 $b
diff --git a/hphp/test/slow/now_doc/1907.php b/hphp/test/slow/now_doc/1907.php
index c876a8bf6..2215ec5af 100644
--- a/hphp/test/slow/now_doc/1907.php
+++ b/hphp/test/slow/now_doc/1907.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = <<<NOWDOC
 "'\t
 NOWDOC;
diff --git a/hphp/test/slow/object/640.php b/hphp/test/slow/object/640.php
index 5b2ad9151..04b5bd9bd 100644
--- a/hphp/test/slow/object/640.php
+++ b/hphp/test/slow/object/640.php
@@ -1,3 +1,7 @@
 <?php
 
- var_dump((object)NULL);var_dump((object)true);var_dump((object)10);var_dump((object)'test');var_dump((object)array(10, 20));
\ No newline at end of file
+var_dump((object)NULL);
+var_dump((object)true);
+var_dump((object)10);
+var_dump((object)'test');
+var_dump((object)array(10, 20));
diff --git a/hphp/test/slow/object/641.php b/hphp/test/slow/object/641.php
index 178fe63a9..1987969d0 100644
--- a/hphp/test/slow/object/641.php
+++ b/hphp/test/slow/object/641.php
@@ -1,3 +1,10 @@
 <?php
 
- class A {} $obj = new A(); var_dump($obj);var_dump((bool)$obj);var_dump((int)$obj);var_dump((array)$obj);var_dump((object)$obj);
\ No newline at end of file
+class A {
+}
+ $obj = new A();
+ var_dump($obj);
+var_dump((bool)$obj);
+var_dump((int)$obj);
+var_dump((array)$obj);
+var_dump((object)$obj);
diff --git a/hphp/test/slow/object/642.php b/hphp/test/slow/object/642.php
index 4cfb30748..44dbe65f5 100644
--- a/hphp/test/slow/object/642.php
+++ b/hphp/test/slow/object/642.php
@@ -1,3 +1,11 @@
 <?php
 
- class A { public $test = 'ok';} $obj = new A(); var_dump($obj);var_dump((bool)$obj);var_dump((int)$obj);var_dump((array)$obj);var_dump((object)$obj);
\ No newline at end of file
+class A {
+ public $test = 'ok';
+}
+ $obj = new A();
+ var_dump($obj);
+var_dump((bool)$obj);
+var_dump((int)$obj);
+var_dump((array)$obj);
+var_dump((object)$obj);
diff --git a/hphp/test/slow/object/643.php b/hphp/test/slow/object/643.php
index 5b2ad9151..04b5bd9bd 100644
--- a/hphp/test/slow/object/643.php
+++ b/hphp/test/slow/object/643.php
@@ -1,3 +1,7 @@
 <?php
 
- var_dump((object)NULL);var_dump((object)true);var_dump((object)10);var_dump((object)'test');var_dump((object)array(10, 20));
\ No newline at end of file
+var_dump((object)NULL);
+var_dump((object)true);
+var_dump((object)10);
+var_dump((object)'test');
+var_dump((object)array(10, 20));
diff --git a/hphp/test/slow/object/644.php b/hphp/test/slow/object/644.php
index ce533eacd..7cfa6505e 100644
--- a/hphp/test/slow/object/644.php
+++ b/hphp/test/slow/object/644.php
@@ -1,3 +1,21 @@
 <?php
 
- class A { public $a = 0;} class B extends A {}$obj1 = new A(); $obj2 = new A(); $obj2->a++; $obj3 = new B(); $obj3->a = 10;var_dump($obj1->a);var_dump($obj1);var_dump($obj2->a);var_dump($obj2);var_dump($obj3);var_dump($obj1 instanceof A);var_dump($obj3 instanceof A);var_dump($obj1 instanceof B);var_dump($obj3 instanceof B);
\ No newline at end of file
+class A {
+ public $a = 0;
+}
+ class B extends A {
+}
+$obj1 = new A();
+ $obj2 = new A();
+ $obj2->a++;
+ $obj3 = new B();
+ $obj3->a = 10;
+var_dump($obj1->a);
+var_dump($obj1);
+var_dump($obj2->a);
+var_dump($obj2);
+var_dump($obj3);
+var_dump($obj1 instanceof A);
+var_dump($obj3 instanceof A);
+var_dump($obj1 instanceof B);
+var_dump($obj3 instanceof B);
diff --git a/hphp/test/slow/object/645.php b/hphp/test/slow/object/645.php
index a2dbf48ff..043851a6d 100644
--- a/hphp/test/slow/object/645.php
+++ b/hphp/test/slow/object/645.php
@@ -1,3 +1,28 @@
 <?php
 
- class A {  public $a = 3;  public function __construct($a) {    $this->a = $a + 1;  }  public function __destruct() {    $this->a += 2;    var_dump($this->a);  }}class B extends A {  public function __construct($a) {  }}class C extends A {  public function __construct($a) {    parent::__construct($a);  }}$obj = new A(1); var_dump($obj->a);$obj = new B(1); var_dump($obj->a);$obj = new C(1); var_dump($obj->a);unset($obj);
\ No newline at end of file
+class A {
+  public $a = 3;
+  public function __construct($a) {
+    $this->a = $a + 1;
+  }
+  public function __destruct() {
+    $this->a += 2;
+    var_dump($this->a);
+  }
+}
+class B extends A {
+  public function __construct($a) {
+  }
+}
+class C extends A {
+  public function __construct($a) {
+    parent::__construct($a);
+  }
+}
+$obj = new A(1);
+ var_dump($obj->a);
+$obj = new B(1);
+ var_dump($obj->a);
+$obj = new C(1);
+ var_dump($obj->a);
+unset($obj);
diff --git a/hphp/test/slow/object/646.php b/hphp/test/slow/object/646.php
index 4f5d8de52..a5a3e66ca 100644
--- a/hphp/test/slow/object/646.php
+++ b/hphp/test/slow/object/646.php
@@ -1,3 +1,9 @@
 <?php
 
- class A {  public $b = 3;  public $a = 2;}$obj = new A(); var_dump($obj); var_dump($obj->c);
\ No newline at end of file
+class A {
+  public $b = 3;
+  public $a = 2;
+}
+$obj = new A();
+ var_dump($obj);
+ var_dump($obj->c);
diff --git a/hphp/test/slow/object/647.php b/hphp/test/slow/object/647.php
index 22dae6bf4..943debc3d 100644
--- a/hphp/test/slow/object/647.php
+++ b/hphp/test/slow/object/647.php
@@ -1,3 +1,14 @@
 <?php
 
- class A {  public $a = 2;}class B {  public $b = 3;}$obj = new A(); var_dump($obj); /*var_dump($obj->b);*/$obj = new B(); var_dump($obj); var_dump($obj->b);
\ No newline at end of file
+class A {
+  public $a = 2;
+}
+class B {
+  public $b = 3;
+}
+$obj = new A();
+ var_dump($obj);
+ /*var_dump($obj->b);
+*/$obj = new B();
+ var_dump($obj);
+ var_dump($obj->b);
diff --git a/hphp/test/slow/object/648.php b/hphp/test/slow/object/648.php
index 8d5f8c1fc..c696710a3 100644
--- a/hphp/test/slow/object/648.php
+++ b/hphp/test/slow/object/648.php
@@ -1,3 +1,14 @@
 <?php
 
- class A {  public $a = 2;}class B {  public $b = 3;}$obj = new A(); var_dump($obj); var_dump($obj->a);$obj = new B(); var_dump($obj); var_dump($obj->b);
\ No newline at end of file
+class A {
+  public $a = 2;
+}
+class B {
+  public $b = 3;
+}
+$obj = new A();
+ var_dump($obj);
+ var_dump($obj->a);
+$obj = new B();
+ var_dump($obj);
+ var_dump($obj->b);
diff --git a/hphp/test/slow/object/649.php b/hphp/test/slow/object/649.php
index b4698c5e9..c1b2d7f6d 100644
--- a/hphp/test/slow/object/649.php
+++ b/hphp/test/slow/object/649.php
@@ -1,3 +1,14 @@
 <?php
 
- class A {  public $a = 2;}class B extends A {  public $b = 3;}$obj = new A(); var_dump($obj); var_dump($obj->b);$obj = new B(); var_dump($obj); var_dump($obj->b);
\ No newline at end of file
+class A {
+  public $a = 2;
+}
+class B extends A {
+  public $b = 3;
+}
+$obj = new A();
+ var_dump($obj);
+ var_dump($obj->b);
+$obj = new B();
+ var_dump($obj);
+ var_dump($obj->b);
diff --git a/hphp/test/slow/object/650.php b/hphp/test/slow/object/650.php
index 49ff68412..6fc492c64 100644
--- a/hphp/test/slow/object/650.php
+++ b/hphp/test/slow/object/650.php
@@ -1,3 +1,15 @@
 <?php
 
- class A {  public $a = 2;  public $b = 1;}class B extends A {  public $b = 3;}$obj = new A(); var_dump($obj); var_dump($obj->b);$obj = new B(); var_dump($obj); var_dump($obj->b);
\ No newline at end of file
+class A {
+  public $a = 2;
+  public $b = 1;
+}
+class B extends A {
+  public $b = 3;
+}
+$obj = new A();
+ var_dump($obj);
+ var_dump($obj->b);
+$obj = new B();
+ var_dump($obj);
+ var_dump($obj->b);
diff --git a/hphp/test/slow/object/651.php b/hphp/test/slow/object/651.php
index 19914b8c1..164a9ad3b 100644
--- a/hphp/test/slow/object/651.php
+++ b/hphp/test/slow/object/651.php
@@ -1,3 +1,13 @@
 <?php
 
- interface I { public function test($a);}class A implements I { public function test($a) { print $a;}}$obj = new A(); var_dump($obj instanceof I); $obj->test('cool');
\ No newline at end of file
+interface I {
+ public function test($a);
+}
+class A implements I {
+ public function test($a) {
+ print $a;
+}
+}
+$obj = new A();
+ var_dump($obj instanceof I);
+ $obj->test('cool');
diff --git a/hphp/test/slow/object/652.php b/hphp/test/slow/object/652.php
index a9534d888..34e658d23 100644
--- a/hphp/test/slow/object/652.php
+++ b/hphp/test/slow/object/652.php
@@ -1,3 +1,19 @@
 <?php
 
- interface I { public function test($a);} class A { public function test($a) { print 'A';}} class B extends A implements I {   public function test($a) { print 'B';} }$obj = new A(); $obj->test(1);$obj = new B(); $obj->test(1);
\ No newline at end of file
+interface I {
+ public function test($a);
+}
+ class A {
+ public function test($a) {
+ print 'A';
+}
+}
+ class B extends A implements I {
+   public function test($a) {
+ print 'B';
+}
+ }
+$obj = new A();
+ $obj->test(1);
+$obj = new B();
+ $obj->test(1);
diff --git a/hphp/test/slow/object/653.php b/hphp/test/slow/object/653.php
index ead1a4b9b..613f24611 100644
--- a/hphp/test/slow/object/653.php
+++ b/hphp/test/slow/object/653.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { public $a;} $obj1 = new A(); $obj2 = new A(); $obj1->a = $obj2; $obj2->a = $obj1;var_dump($obj1);
\ No newline at end of file
+class A {
+ public $a;
+}
+ $obj1 = new A();
+ $obj2 = new A();
+ $obj1->a = $obj2;
+ $obj2->a = $obj1;
+var_dump($obj1);
diff --git a/hphp/test/slow/object/654.php b/hphp/test/slow/object/654.php
index 9d99a1bda..e0ced4ad2 100644
--- a/hphp/test/slow/object/654.php
+++ b/hphp/test/slow/object/654.php
@@ -1,3 +1,12 @@
 <?php
 
- $a = 1; class A { public function t() { global $a; $b = 'a'; var_dump($$b);}} $obj = new A(); $obj->t();
\ No newline at end of file
+$a = 1;
+ class A {
+ public function t() {
+ global $a;
+ $b = 'a';
+ var_dump($$b);
+}
+}
+ $obj = new A();
+ $obj->t();
diff --git a/hphp/test/slow/object/655.php b/hphp/test/slow/object/655.php
index dc31e76cb..c452b9709 100644
--- a/hphp/test/slow/object/655.php
+++ b/hphp/test/slow/object/655.php
@@ -1,3 +1,22 @@
 <?php
 
- class g {  public $v;  function set($v) {    $this->v = $v;    return $this;  }}function foo() {  $z = 1;  $qd = array('x' => $z);  $a = G()->set($qd);  var_dump($a);  $qd['e'] = true;  $b = G()->set($qd);  var_dump($a);}function G() {  return new g;}foo();
\ No newline at end of file
+class g {
+  public $v;
+  function set($v) {
+    $this->v = $v;
+    return $this;
+  }
+}
+function foo() {
+  $z = 1;
+  $qd = array('x' => $z);
+  $a = G()->set($qd);
+  var_dump($a);
+  $qd['e'] = true;
+  $b = G()->set($qd);
+  var_dump($a);
+}
+function G() {
+  return new g;
+}
+foo();
diff --git a/hphp/test/slow/object/656.php b/hphp/test/slow/object/656.php
index c92a23b31..6cc6b3c4a 100644
--- a/hphp/test/slow/object/656.php
+++ b/hphp/test/slow/object/656.php
@@ -1,3 +1,13 @@
 <?php
 
- class EE extends Exception {}class E extends EE {  function foo() {}  function __construct() {    echo 'MAKING E';    parent::__construct();  }}new E;
\ No newline at end of file
+class EE extends Exception {
+}
+class E extends EE {
+  function foo() {
+}
+  function __construct() {
+    echo 'MAKING E';
+    parent::__construct();
+  }
+}
+new E;
diff --git a/hphp/test/slow/object/657.php b/hphp/test/slow/object/657.php
index c6a0f7ac3..24979cf61 100644
--- a/hphp/test/slow/object/657.php
+++ b/hphp/test/slow/object/657.php
@@ -1,3 +1,19 @@
 <?php
 
- class A {  var $a;  var $b;};$obj = new A();var_dump($obj);foreach ($obj as &$value) {  $value = 1;}var_dump($obj);$obj->c = 3;var_dump($obj);foreach ($obj as &$value) {  $value = 2;}var_dump($obj);
\ No newline at end of file
+class A {
+  var $a;
+  var $b;
+}
+;
+$obj = new A();
+var_dump($obj);
+foreach ($obj as &$value) {
+  $value = 1;
+}
+var_dump($obj);
+$obj->c = 3;
+var_dump($obj);
+foreach ($obj as &$value) {
+  $value = 2;
+}
+var_dump($obj);
diff --git a/hphp/test/slow/object/658.php b/hphp/test/slow/object/658.php
index 2197bf757..a6820bd5f 100644
--- a/hphp/test/slow/object/658.php
+++ b/hphp/test/slow/object/658.php
@@ -1,3 +1,25 @@
 <?php
 
- class A {  var $a;  var $b;};function gen() {  $obj = new A();  var_dump($obj);  foreach ($obj as &$value) {    yield null;    $value = 1;  }  var_dump($obj);  $obj->c = 3;  var_dump($obj);  foreach ($obj as &$value) {    yield null;    $value = 2;  }  var_dump($obj);}foreach (gen() as $_) {}
\ No newline at end of file
+class A {
+  var $a;
+  var $b;
+}
+;
+function gen() {
+  $obj = new A();
+  var_dump($obj);
+  foreach ($obj as &$value) {
+    yield null;
+    $value = 1;
+  }
+  var_dump($obj);
+  $obj->c = 3;
+  var_dump($obj);
+  foreach ($obj as &$value) {
+    yield null;
+    $value = 2;
+  }
+  var_dump($obj);
+}
+foreach (gen() as $_) {
+}
diff --git a/hphp/test/slow/object/659.php b/hphp/test/slow/object/659.php
index b5c77e6c9..822f6db10 100644
--- a/hphp/test/slow/object/659.php
+++ b/hphp/test/slow/object/659.php
@@ -1,3 +1,14 @@
 <?php
 
- class A {  var $a;  var $b;};$obj = new A();$obj2 = $obj;foreach ($obj2 as $k => &$value) {  $value = 'ok';}var_dump($obj);var_dump($obj2);
\ No newline at end of file
+class A {
+  var $a;
+  var $b;
+}
+;
+$obj = new A();
+$obj2 = $obj;
+foreach ($obj2 as $k => &$value) {
+  $value = 'ok';
+}
+var_dump($obj);
+var_dump($obj2);
diff --git a/hphp/test/slow/object/660.php b/hphp/test/slow/object/660.php
index 62c602e35..b4d67983c 100644
--- a/hphp/test/slow/object/660.php
+++ b/hphp/test/slow/object/660.php
@@ -1,3 +1,19 @@
 <?php
 
- class A {  var $a;  var $b;};function gen() {  $obj = new A();  $obj2 = $obj;  foreach ($obj2 as $k => &$value) {    yield null;    $value = 'ok';  }  var_dump($obj);  var_dump($obj2);}foreach (gen() as $_) {}
\ No newline at end of file
+class A {
+  var $a;
+  var $b;
+}
+;
+function gen() {
+  $obj = new A();
+  $obj2 = $obj;
+  foreach ($obj2 as $k => &$value) {
+    yield null;
+    $value = 'ok';
+  }
+  var_dump($obj);
+  var_dump($obj2);
+}
+foreach (gen() as $_) {
+}
diff --git a/hphp/test/slow/object/661.php b/hphp/test/slow/object/661.php
index 85aa03500..5a4bdecf1 100644
--- a/hphp/test/slow/object/661.php
+++ b/hphp/test/slow/object/661.php
@@ -1,3 +1,29 @@
 <?php
 
- class A {  var $a;  var $b;  var $c;  var $d;  public function __construct($p1, $p2, $p3, $p4) {    $this->a = $p1;    $this->b = $p2;    $this->c = $p3;    $this->d = $p4;  }};$obj = new A(1, 2, 3, 4);foreach ($obj as $key => &$val) {  if($val == 2) {    $obj->$key = 0;  } else if($val == 3) {    var_dump($key);    unset($obj->$key);  } else {    $val++;  }}var_dump($obj);
\ No newline at end of file
+class A {
+  var $a;
+  var $b;
+  var $c;
+  var $d;
+  public function __construct($p1, $p2, $p3, $p4) {
+    $this->a = $p1;
+    $this->b = $p2;
+    $this->c = $p3;
+    $this->d = $p4;
+  }
+}
+;
+$obj = new A(1, 2, 3, 4);
+foreach ($obj as $key => &$val) {
+  if($val == 2) {
+    $obj->$key = 0;
+  }
+ else if($val == 3) {
+    var_dump($key);
+    unset($obj->$key);
+  }
+ else {
+    $val++;
+  }
+}
+var_dump($obj);
diff --git a/hphp/test/slow/object/662.php b/hphp/test/slow/object/662.php
index e138cdbb7..df37a2aa8 100644
--- a/hphp/test/slow/object/662.php
+++ b/hphp/test/slow/object/662.php
@@ -1,3 +1,34 @@
 <?php
 
- class A {  var $a;  var $b;  var $c;  var $d;  public function __construct($p1, $p2, $p3, $p4) {    $this->a = $p1;    $this->b = $p2;    $this->c = $p3;    $this->d = $p4;  }};function gen() {  $obj = new A(1, 2, 3, 4);  foreach ($obj as $key => &$val) {    yield null;    if($val == 2) {      $obj->$key = 0;    } else if($val == 3) {      var_dump($key);      unset($obj->$key);    } else {      $val++;    }  }  var_dump($obj);}foreach (gen() as $_) {}
\ No newline at end of file
+class A {
+  var $a;
+  var $b;
+  var $c;
+  var $d;
+  public function __construct($p1, $p2, $p3, $p4) {
+    $this->a = $p1;
+    $this->b = $p2;
+    $this->c = $p3;
+    $this->d = $p4;
+  }
+}
+;
+function gen() {
+  $obj = new A(1, 2, 3, 4);
+  foreach ($obj as $key => &$val) {
+    yield null;
+    if($val == 2) {
+      $obj->$key = 0;
+    }
+ else if($val == 3) {
+      var_dump($key);
+      unset($obj->$key);
+    }
+ else {
+      $val++;
+    }
+  }
+  var_dump($obj);
+}
+foreach (gen() as $_) {
+}
diff --git a/hphp/test/slow/object/663.php b/hphp/test/slow/object/663.php
index 1941933db..6c390c046 100644
--- a/hphp/test/slow/object/663.php
+++ b/hphp/test/slow/object/663.php
@@ -1,3 +1,23 @@
 <?php
 
- class A {  var $a = 1;  var $b = 2;  var $c = 3;  var $d = 4;  public function __construct() {    $this->a = 1;    $this->b = 2;    $this->c = 3;    $this->d = 4;  }};function f() {  $obj = new A();  foreach ($obj as $key => &$val) {    $val = 5;  }  var_dump($obj);}f();
\ No newline at end of file
+class A {
+  var $a = 1;
+  var $b = 2;
+  var $c = 3;
+  var $d = 4;
+  public function __construct() {
+    $this->a = 1;
+    $this->b = 2;
+    $this->c = 3;
+    $this->d = 4;
+  }
+}
+;
+function f() {
+  $obj = new A();
+  foreach ($obj as $key => &$val) {
+    $val = 5;
+  }
+  var_dump($obj);
+}
+f();
diff --git a/hphp/test/slow/object/664.php b/hphp/test/slow/object/664.php
index 06bb60833..b3865e05e 100644
--- a/hphp/test/slow/object/664.php
+++ b/hphp/test/slow/object/664.php
@@ -1,3 +1,25 @@
 <?php
 
- class A {  var $a = 1;  var $b = 2;  var $c = 3;  var $d = 4;  public function __construct() {    $this->a = 1;    $this->b = 2;    $this->c = 3;    $this->d = 4;  }};function f() {  $obj = new A();  foreach ($obj as $key => &$val) {    yield null;    $val = 5;  }  var_dump($obj);}foreach (f() as $_) {}
\ No newline at end of file
+class A {
+  var $a = 1;
+  var $b = 2;
+  var $c = 3;
+  var $d = 4;
+  public function __construct() {
+    $this->a = 1;
+    $this->b = 2;
+    $this->c = 3;
+    $this->d = 4;
+  }
+}
+;
+function f() {
+  $obj = new A();
+  foreach ($obj as $key => &$val) {
+    yield null;
+    $val = 5;
+  }
+  var_dump($obj);
+}
+foreach (f() as $_) {
+}
diff --git a/hphp/test/slow/object/665.php b/hphp/test/slow/object/665.php
index 713228147..17b746e70 100644
--- a/hphp/test/slow/object/665.php
+++ b/hphp/test/slow/object/665.php
@@ -1,3 +1,7 @@
 <?php
 
- function test() {$abc = 'abc'; var_dump($abc instanceof Nothing); }test();
\ No newline at end of file
+function test() {
+$abc = 'abc';
+ var_dump($abc instanceof Nothing);
+ }
+test();
diff --git a/hphp/test/slow/object/666.php b/hphp/test/slow/object/666.php
index b710fce1c..337c38685 100644
--- a/hphp/test/slow/object/666.php
+++ b/hphp/test/slow/object/666.php
@@ -1,3 +1,15 @@
 <?php
 
- class X {  public $x = 1;  }class Y {  public $x = array();}function test() {  $x = (object)new Y;  var_dump($x->x);  $x = new X;  var_dump($x->x);}test();
\ No newline at end of file
+class X {
+  public $x = 1;
+  }
+class Y {
+  public $x = array();
+}
+function test() {
+  $x = (object)new Y;
+  var_dump($x->x);
+  $x = new X;
+  var_dump($x->x);
+}
+test();
diff --git a/hphp/test/slow/object/667.php b/hphp/test/slow/object/667.php
index 2c14c226a..6087aa54a 100644
--- a/hphp/test/slow/object/667.php
+++ b/hphp/test/slow/object/667.php
@@ -1,10 +1,14 @@
 <?php
 
-
-class A { }
+class A {
+ }
 class B extends A {
-  static function check1($a) { return $a instanceof self; }
-  static function check2($a) { return $a instanceof parent; }
+  static function check1($a) {
+ return $a instanceof self;
+ }
+  static function check2($a) {
+ return $a instanceof parent;
+ }
 }
 $a = new B;
 var_dump(B::check1($a), B::check2($a));
diff --git a/hphp/test/slow/object/668.php b/hphp/test/slow/object/668.php
index 46b8f523d..aeed8a51a 100644
--- a/hphp/test/slow/object/668.php
+++ b/hphp/test/slow/object/668.php
@@ -1,5 +1,9 @@
-<php
-class X { static function f($o, $s) { return $o instanceof $s; } }
+<?php
+class X {
+  static function f($o, $s) {
+    return $o instanceof $s;
+  }
+}
 $x = new X;
 var_dump(X::f($x, 'self'));
 var_dump(X::f($x, 'X'));
diff --git a/hphp/test/slow/object/668.php.expect b/hphp/test/slow/object/668.php.expect
index 46b8f523d..5d42d704e 100644
--- a/hphp/test/slow/object/668.php.expect
+++ b/hphp/test/slow/object/668.php.expect
@@ -1,5 +1,2 @@
-<php
-class X { static function f($o, $s) { return $o instanceof $s; } }
-$x = new X;
-var_dump(X::f($x, 'self'));
-var_dump(X::f($x, 'X'));
+bool(false)
+bool(true)
diff --git a/hphp/test/slow/object/669.php b/hphp/test/slow/object/669.php
index 404114ca7..6e5b4b4a7 100644
--- a/hphp/test/slow/object/669.php
+++ b/hphp/test/slow/object/669.php
@@ -1,7 +1,8 @@
-<php
+<?php
 class X {
   static function f($o) {
-    $s = 'self'; return $o instanceof $s;
+    $s = 'self';
+    return $o instanceof $s;
   }
 }
-X::f(new X);
+var_dump(X::f(new X));
diff --git a/hphp/test/slow/object/669.php.expect b/hphp/test/slow/object/669.php.expect
index 404114ca7..5c0c0681d 100644
--- a/hphp/test/slow/object/669.php.expect
+++ b/hphp/test/slow/object/669.php.expect
@@ -1,7 +1 @@
-<php
-class X {
-  static function f($o) {
-    $s = 'self'; return $o instanceof $s;
-  }
-}
-X::f(new X);
+bool(false)
diff --git a/hphp/test/slow/object/670.php b/hphp/test/slow/object/670.php
index 66831e732..d1f4b7f2f 100644
--- a/hphp/test/slow/object/670.php
+++ b/hphp/test/slow/object/670.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $x = null;
 $y = 0;
 class C {
diff --git a/hphp/test/slow/object/671.php b/hphp/test/slow/object/671.php
index 125a25916..713f2fb96 100644
--- a/hphp/test/slow/object/671.php
+++ b/hphp/test/slow/object/671.php
@@ -1,3 +1,20 @@
 <?php
 
- class X {  function foo() { var_dump(__METHOD__); }  }function foo($a) {  $x = null;  if ($a) $x = new X;  return $x;}function test($x, $a) {  $x = foo($a);  if ($x) {    $x->foo();  }}test(45, 0);test(77, 1);
\ No newline at end of file
+class X {
+  function foo() {
+ var_dump(__METHOD__);
+ }
+  }
+function foo($a) {
+  $x = null;
+  if ($a) $x = new X;
+  return $x;
+}
+function test($x, $a) {
+  $x = foo($a);
+  if ($x) {
+    $x->foo();
+  }
+}
+test(45, 0);
+test(77, 1);
diff --git a/hphp/test/slow/object/672.php b/hphp/test/slow/object/672.php
index 160c2f35f..94c075bc1 100644
--- a/hphp/test/slow/object/672.php
+++ b/hphp/test/slow/object/672.php
@@ -1,9 +1,12 @@
 <?php
 
-
 class FOo {
-  public function exclAIM() { echo "FOo::exclAIM\n"; }
-  public function teST() { echo "FOo::teST\n"; }
+  public function exclAIM() {
+ echo "FOo::exclAIM\n";
+ }
+  public function teST() {
+ echo "FOo::teST\n";
+ }
   public function __CaLL($name, $args) {
     echo "FOo::" . $name . "\n";
   }
@@ -11,12 +14,20 @@ class FOo {
 class TesT {
   public static function ExclAim() {
     $obj = new fOO();
-    $obj->{__fUNCTION__} = 1;
-    $obj->{__cLASS__} = 2;
+    $obj->{
+__fUNCTION__}
+ = 1;
+    $obj->{
+__cLASS__}
+ = 2;
     $obj->__FuNCTION__ = 3;
     $obj->__ClASS__ = 4;
-    $obj->{__FUnCTION__}();
-    $obj->{__CLaSS__}();
+    $obj->{
+__FUnCTION__}
+();
+    $obj->{
+__CLaSS__}
+();
     $obj->__FUNcTION__();
     $obj->__CLAsS__();
     $arr = array();
diff --git a/hphp/test/slow/object_assignment/774.php b/hphp/test/slow/object_assignment/774.php
index 54fb3406d..c697ad423 100644
--- a/hphp/test/slow/object_assignment/774.php
+++ b/hphp/test/slow/object_assignment/774.php
@@ -1,3 +1,33 @@
 <?php
 
- class foo {  public function __construct() {    $this->val = 1;  }  function bar() {    echo $this->val;    $ref = &$this;    $ref->val = 2;    echo $this->val;    $ref2 = $this;    $ref2->val = 3;    echo $this->val;    $x = new foo();    echo $x->val;    $ref3 = &$x;    $ref3->val = 4;    echo $x->val;    $ref4 = $x;    $ref4->val = 5;    echo $x->val;  }  var $val;}$x = new foo();$x->bar();$ref5 = $x;$ref5->val = 6;echo $x->val;$ref6 = &$x;$ref6->val = 7;echo $x->val;
\ No newline at end of file
+class foo {
+  public function __construct() {
+    $this->val = 1;
+  }
+  function bar() {
+    echo $this->val;
+    $ref = &$this;
+    $ref->val = 2;
+    echo $this->val;
+    $ref2 = $this;
+    $ref2->val = 3;
+    echo $this->val;
+    $x = new foo();
+    echo $x->val;
+    $ref3 = &$x;
+    $ref3->val = 4;
+    echo $x->val;
+    $ref4 = $x;
+    $ref4->val = 5;
+    echo $x->val;
+  }
+  var $val;
+}
+$x = new foo();
+$x->bar();
+$ref5 = $x;
+$ref5->val = 6;
+echo $x->val;
+$ref6 = &$x;
+$ref6->val = 7;
+echo $x->val;
diff --git a/hphp/test/slow/object_invoke_method/764.php b/hphp/test/slow/object_invoke_method/764.php
index eb9be1dfe..6763c4b45 100644
--- a/hphp/test/slow/object_invoke_method/764.php
+++ b/hphp/test/slow/object_invoke_method/764.php
@@ -1,6 +1,5 @@
 <?php
 
-
 // standard execution
 class C1 {
   public function __invoke($a0, $a1) {
@@ -8,7 +7,8 @@ class C1 {
     var_dump($a0, $a1);
   }
 }
-class D1 extends C1 {}
+class D1 extends C1 {
+}
 class E1 extends D1 {
   public function __invoke($a0, $a1) {
     var_dump('D2');
@@ -38,7 +38,9 @@ $e->__invoke(0, 1);
 C1::__invoke(0, 1);
 D1::__invoke(0, 1);
 E1::__invoke(0, 1);
-function mk($n) { return $n . '::__invoke'; }
+function mk($n) {
+ return $n . '::__invoke';
+ }
 call_user_func(mk('C1'), 0, 1);
 call_user_func(mk('D1'), 0, 1);
 call_user_func(mk('E1'), 0, 1);
diff --git a/hphp/test/slow/object_invoke_method/765.php b/hphp/test/slow/object_invoke_method/765.php
index 87b59aeff..98ccb13b6 100644
--- a/hphp/test/slow/object_invoke_method/765.php
+++ b/hphp/test/slow/object_invoke_method/765.php
@@ -1,6 +1,5 @@
 <?php
 
-
 // taking references
 class C2 {
   public function __invoke(&$a0) {
@@ -11,6 +10,8 @@ class C2 {
 $x = 0;
 $c = new C2;
 $c($x);
-var_dump($x); // $x = 1
+var_dump($x);
+ // $x = 1
 call_user_func_array($c, array(&$x));
-var_dump($x); // $x = 2
+var_dump($x);
+ // $x = 2
diff --git a/hphp/test/slow/object_invoke_method/766.php b/hphp/test/slow/object_invoke_method/766.php
index 9bab38b3b..8ed6142c7 100644
--- a/hphp/test/slow/object_invoke_method/766.php
+++ b/hphp/test/slow/object_invoke_method/766.php
@@ -1,6 +1,5 @@
 <?php
 
-
 // taking default args
 class C3 {
   public function __invoke($a0, $a1 = array(), $a2 = false) {
diff --git a/hphp/test/slow/object_invoke_method/767.php b/hphp/test/slow/object_invoke_method/767.php
index 6f256c8f7..78dd53ea6 100644
--- a/hphp/test/slow/object_invoke_method/767.php
+++ b/hphp/test/slow/object_invoke_method/767.php
@@ -1,6 +1,5 @@
 <?php
 
-
 // as a static method
 class C4 {
   public static function __invoke($a0, $a1) {
@@ -8,7 +7,8 @@ class C4 {
     var_dump($a0, $a1);
   }
 }
-class D4 extends C4 {}
+class D4 extends C4 {
+}
 class E4 extends D4 {
   public static function __invoke($a0, $a1) {
     static $x = 0;
@@ -23,7 +23,8 @@ class C5 {
     var_dump($x ++);
   }
 }
-class D5 extends C5 {}
+class D5 extends C5 {
+}
 $c = new C4;
 $d = new D4;
 $c(0, 1);
@@ -39,5 +40,7 @@ call_user_func($e, 0, 1);
 E4::__invoke(0, 1);
 $c = new C5;
 $d = new D5;
-$c(); $d();
-$c(); $d();
+$c();
+ $d();
+$c();
+ $d();
diff --git a/hphp/test/slow/object_invoke_method/768.php b/hphp/test/slow/object_invoke_method/768.php
index adec22dc2..494c863c2 100644
--- a/hphp/test/slow/object_invoke_method/768.php
+++ b/hphp/test/slow/object_invoke_method/768.php
@@ -1,6 +1,5 @@
 <?php
 
-
 // as a private/protected method
 class C6 {
   private function __invoke($a0) {
@@ -13,6 +12,8 @@ class C7 {
   }
 }
 $c = new C6;
-$c(10); // still works...
+$c(10);
+ // still works...
 $c = new C7;
-$c(20); // still works...
+$c(20);
+ // still works...
diff --git a/hphp/test/slow/object_invoke_method/769.php b/hphp/test/slow/object_invoke_method/769.php
index bbe5efd80..76ff584dd 100644
--- a/hphp/test/slow/object_invoke_method/769.php
+++ b/hphp/test/slow/object_invoke_method/769.php
@@ -1,6 +1,5 @@
 <?php
 
-
 // with type hints
 class C8 {
   public function __invoke(array $a0) {
diff --git a/hphp/test/slow/object_invoke_method/770.php b/hphp/test/slow/object_invoke_method/770.php
index b26bd4276..e17718c39 100644
--- a/hphp/test/slow/object_invoke_method/770.php
+++ b/hphp/test/slow/object_invoke_method/770.php
@@ -1,6 +1,5 @@
 <?php
 
-
 // with var args
 class C9 {
   public function __invoke() {
diff --git a/hphp/test/slow/object_invoke_method/771.php b/hphp/test/slow/object_invoke_method/771.php
index c0733dc7e..bd3e43aa8 100644
--- a/hphp/test/slow/object_invoke_method/771.php
+++ b/hphp/test/slow/object_invoke_method/771.php
@@ -1,7 +1,7 @@
 <?php
 
+class X {
 
-class X { 
   public function __invoke($x) {
     var_dump($x);
   }
@@ -11,7 +11,8 @@ class X {
     call_user_func_array($this, array(0, 1));
   }
 }
-class Y { 
+class Y {
+
   public function test($x) {
     $x(10);
     call_user_func($x, 300);
diff --git a/hphp/test/slow/object_invoke_method/772.php b/hphp/test/slow/object_invoke_method/772.php
index faf80dc98..fd8e9f2c4 100644
--- a/hphp/test/slow/object_invoke_method/772.php
+++ b/hphp/test/slow/object_invoke_method/772.php
@@ -1,9 +1,10 @@
 <?php
 
-
-class X {}
+class X {
+}
 class Y {
-  public function __invoke() {}
+  public function __invoke() {
+}
 }
 var_dump(is_callable(new X));
 var_dump(is_callable(new Y));
diff --git a/hphp/test/slow/object_invoke_method/773.php b/hphp/test/slow/object_invoke_method/773.php
index d1c9eb327..f85ab0881 100644
--- a/hphp/test/slow/object_invoke_method/773.php
+++ b/hphp/test/slow/object_invoke_method/773.php
@@ -1,6 +1,5 @@
 <?php
 
-
 abstract class A {
   abstract public function __invoke($x);
 }
@@ -19,9 +18,18 @@ class Test2 implements IfaceInvoke {
     var_dump($x);
   }
 }
-function f1($x, $y)             { $x($y); $x->__invoke($y); }
-function f2(A $x, $y)           { $x($y); $x->__invoke($y); }
-function f3(IfaceInvoke $x, $y) { $x($y); $x->__invoke($y); }
+function f1($x, $y)             {
+ $x($y);
+ $x->__invoke($y);
+ }
+function f2(A $x, $y)           {
+ $x($y);
+ $x->__invoke($y);
+ }
+function f3(IfaceInvoke $x, $y) {
+ $x($y);
+ $x->__invoke($y);
+ }
 $t1 = new Test1;
 $t2 = new Test2;
 f1($t1, 1);
diff --git a/hphp/test/slow/object_magic_method/746.php b/hphp/test/slow/object_magic_method/746.php
index cc4aadee2..ea08d0272 100644
--- a/hphp/test/slow/object_magic_method/746.php
+++ b/hphp/test/slow/object_magic_method/746.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Test {
   public function __call($name, $args) {
     var_dump($args);
diff --git a/hphp/test/slow/object_magic_method/747.php b/hphp/test/slow/object_magic_method/747.php
index 5593080f7..3064644c8 100644
--- a/hphp/test/slow/object_magic_method/747.php
+++ b/hphp/test/slow/object_magic_method/747.php
@@ -1,3 +1,15 @@
 <?php
 
- class A {  private $foo, $bar;   function __construct() { $this->foo = 1; $this->bar = 2;}   public function __sleep() { $this->foo = 3; return array('foo');} } $a = new A(); var_dump(serialize($a));
\ No newline at end of file
+class A {
+  private $foo, $bar;
+   function __construct() {
+ $this->foo = 1;
+ $this->bar = 2;
+}
+   public function __sleep() {
+ $this->foo = 3;
+ return array('foo');
+}
+ }
+ $a = new A();
+ var_dump(serialize($a));
diff --git a/hphp/test/slow/object_magic_method/748.php b/hphp/test/slow/object_magic_method/748.php
index a22a2e491..202c07058 100644
--- a/hphp/test/slow/object_magic_method/748.php
+++ b/hphp/test/slow/object_magic_method/748.php
@@ -1,3 +1,14 @@
 <?php
 
- class A {   public $a = array();   function __set($name, $value) { $this->a[$name] = $value.'set';}   function __get($name) { return $this->a[$name].'get';} } $obj = new A(); $obj->test = 'test'; var_dump($obj->test);
\ No newline at end of file
+class A {
+   public $a = array();
+   function __set($name, $value) {
+ $this->a[$name] = $value.'set';
+}
+   function __get($name) {
+ return $this->a[$name].'get';
+}
+ }
+ $obj = new A();
+ $obj->test = 'test';
+ var_dump($obj->test);
diff --git a/hphp/test/slow/object_magic_method/749.php b/hphp/test/slow/object_magic_method/749.php
index 983312601..058297269 100644
--- a/hphp/test/slow/object_magic_method/749.php
+++ b/hphp/test/slow/object_magic_method/749.php
@@ -1,3 +1,19 @@
 <?php
 
- class A {  public $a = 'aaa';  public function __get($name) { return 'getA';}}class B extends A {  public function __get($name) { return 'getB';}}$obj = new A();var_dump($obj->a);var_dump($obj->b);$obj = new B();var_dump($obj->a);var_dump($obj->b);
\ No newline at end of file
+class A {
+  public $a = 'aaa';
+  public function __get($name) {
+ return 'getA';
+}
+}
+class B extends A {
+  public function __get($name) {
+ return 'getB';
+}
+}
+$obj = new A();
+var_dump($obj->a);
+var_dump($obj->b);
+$obj = new B();
+var_dump($obj->a);
+var_dump($obj->b);
diff --git a/hphp/test/slow/object_magic_method/750.php b/hphp/test/slow/object_magic_method/750.php
index 09f6f6af6..cb9f7fc97 100644
--- a/hphp/test/slow/object_magic_method/750.php
+++ b/hphp/test/slow/object_magic_method/750.php
@@ -1,3 +1,14 @@
 <?php
 
- class A {   public $a = array();   function __set($name, $value) { $this->a[$name] = $value;}   function __get($name) { return $this->a[$name];} } $obj = new A(); $obj->test = 'test'; var_dump($obj->test);
\ No newline at end of file
+class A {
+   public $a = array();
+   function __set($name, $value) {
+ $this->a[$name] = $value;
+}
+   function __get($name) {
+ return $this->a[$name];
+}
+ }
+ $obj = new A();
+ $obj->test = 'test';
+ var_dump($obj->test);
diff --git a/hphp/test/slow/object_magic_method/751.php b/hphp/test/slow/object_magic_method/751.php
index 8714e6b04..2a9764b5f 100644
--- a/hphp/test/slow/object_magic_method/751.php
+++ b/hphp/test/slow/object_magic_method/751.php
@@ -1,3 +1,7 @@
 <?php
 
- class A {} $obj = new A(); $obj->test = 'test'; var_dump($obj->test);
\ No newline at end of file
+class A {
+}
+ $obj = new A();
+ $obj->test = 'test';
+ var_dump($obj->test);
diff --git a/hphp/test/slow/object_magic_method/752.php b/hphp/test/slow/object_magic_method/752.php
index f30ce8e32..d803567b9 100644
--- a/hphp/test/slow/object_magic_method/752.php
+++ b/hphp/test/slow/object_magic_method/752.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { function __call($a, $b) { var_dump($a, $b[0], $b[1]);}} $obj = new A(); $a = 1; $obj->test($a, 'ss');
\ No newline at end of file
+class A {
+ function __call($a, $b) {
+ var_dump($a, $b[0], $b[1]);
+}
+}
+ $obj = new A();
+ $a = 1;
+ $obj->test($a, 'ss');
diff --git a/hphp/test/slow/object_magic_method/753.php b/hphp/test/slow/object_magic_method/753.php
index bd70e9af3..2e703c670 100644
--- a/hphp/test/slow/object_magic_method/753.php
+++ b/hphp/test/slow/object_magic_method/753.php
@@ -1,3 +1,11 @@
 <?php
 
- class foo{  public $public = 'public';  public function __sleep()  { return array('public'); }}$foo = new foo();$data = serialize($foo);var_dump($data);
\ No newline at end of file
+class foo{
+  public $public = 'public';
+  public function __sleep()  {
+ return array('public');
+ }
+}
+$foo = new foo();
+$data = serialize($foo);
+var_dump($data);
diff --git a/hphp/test/slow/object_magic_method/754.php b/hphp/test/slow/object_magic_method/754.php
index 5253a3efc..9d5d2cc83 100644
--- a/hphp/test/slow/object_magic_method/754.php
+++ b/hphp/test/slow/object_magic_method/754.php
@@ -1,6 +1,29 @@
 <?php
 
- class MemberTest {  private $data = array();  public function __set($name, $value) {    echo "Setting '$name' to '$value'
-";    $this->data[$name] = $value;  }  public function __get($name) {    echo "Getting '$name'
-";    if (array_key_exists($name, $this->data)) {      return $this->data[$name];    }    return null;  }  public function __unset($name) {    echo "Unsetting '$name'
-";    unset($this->data[$name]);    return 1;  }}$obj = new MemberTest;$obj->a = 1;var_dump($obj->a);var_dump(isset($obj->a));unset($obj->a);
\ No newline at end of file
+class MemberTest {
+  private $data = array();
+  public function __set($name, $value) {
+    echo "Setting '$name' to '$value'
+";
+    $this->data[$name] = $value;
+  }
+  public function __get($name) {
+    echo "Getting '$name'
+";
+    if (array_key_exists($name, $this->data)) {
+      return $this->data[$name];
+    }
+    return null;
+  }
+  public function __unset($name) {
+    echo "Unsetting '$name'
+";
+    unset($this->data[$name]);
+    return 1;
+  }
+}
+$obj = new MemberTest;
+$obj->a = 1;
+var_dump($obj->a);
+var_dump(isset($obj->a));
+unset($obj->a);
diff --git a/hphp/test/slow/object_magic_method/755.php b/hphp/test/slow/object_magic_method/755.php
index 4f8a7eb4d..63371673c 100644
--- a/hphp/test/slow/object_magic_method/755.php
+++ b/hphp/test/slow/object_magic_method/755.php
@@ -1,9 +1,10 @@
 <?php
 
-
 class C {
   public $foo = 123;
-  public function __unset($k) { echo "__unset $k\n"; }
+  public function __unset($k) {
+ echo "__unset $k\n";
+ }
 }
 $obj = new C;
 unset($obj->foo);
diff --git a/hphp/test/slow/object_magic_method/756.php b/hphp/test/slow/object_magic_method/756.php
index e16457882..9b38f9570 100644
--- a/hphp/test/slow/object_magic_method/756.php
+++ b/hphp/test/slow/object_magic_method/756.php
@@ -1,3 +1,11 @@
 <?php
 
- class foo{  public $public = 'public';  public function __wakeup()  { echo "__wakeup called\n"; return 1; }}$foo = unserialize("O:3:\"foo\":1:{s:6:\"public\";s:6:\"public\";}");var_dump($foo);
\ No newline at end of file
+class foo{
+  public $public = 'public';
+  public function __wakeup()  {
+ echo "__wakeup called\n";
+ return 1;
+ }
+}
+$foo = unserialize("O:3:\"foo\":1:{s:6:\"public\";s:6:\"public\";}");
+var_dump($foo);
diff --git a/hphp/test/slow/object_magic_method/757.php b/hphp/test/slow/object_magic_method/757.php
index 649948542..1e0067cfd 100644
--- a/hphp/test/slow/object_magic_method/757.php
+++ b/hphp/test/slow/object_magic_method/757.php
@@ -1,3 +1,23 @@
 <?php
 
- class b {  private $f2 = 10;  function t2() {    var_dump($this->f2);  }}class c extends b{  private $f = 10;  private static $sf = 10;  function __get($n) {    echo 'got';    return 1;  }  function t() {    var_dump($this->f2);  }}$x = new c;var_dump($x->f);$x->t();$x->t2();
\ No newline at end of file
+class b {
+  private $f2 = 10;
+  function t2() {
+    var_dump($this->f2);
+  }
+}
+class c extends b{
+  private $f = 10;
+  private static $sf = 10;
+  function __get($n) {
+    echo 'got';
+    return 1;
+  }
+  function t() {
+    var_dump($this->f2);
+  }
+}
+$x = new c;
+var_dump($x->f);
+$x->t();
+$x->t2();
diff --git a/hphp/test/slow/object_magic_method/758.php b/hphp/test/slow/object_magic_method/758.php
index 9c3512853..dd4822700 100644
--- a/hphp/test/slow/object_magic_method/758.php
+++ b/hphp/test/slow/object_magic_method/758.php
@@ -1,3 +1,53 @@
 <?php
 
- class X implements arrayaccess {function offsetGet($n) { return $n; }function offsetSet($n, $v) { var_dump($n); }function offsetExists($n) { var_dump($n); return true; }function offsetUnset($n) { var_dump($n); }function __toString() { return 'baz'; }}$a = new X;echo "sets\n";$a[true] = 5;$a[NULL] = 57;$a[3.2] = 25;$a[array(3)] = 30;$a[$a] = 32;$a['57'] = 5;$a['6.5'] = 7;echo "gets\n";var_dump($a[true]);var_dump($a[NULL]);var_dump($a[3.2]);var_dump($a[array(3)]);var_dump($a[$a]);var_dump($a['57']);var_dump($a['6.5']);echo "unsets\n";unset($a[true]);unset($a[NULL]);unset($a[3.2]);unset($a[array(3)]);unset($a[$a]);unset($a['57']);unset($a['6.5']);echo "issets\n";isset($a[true]);isset($a[NULL]);isset($a[3.2]);isset($a[array(3)]);isset($a[$a]);isset($a['57']);isset($a['6.5']);
\ No newline at end of file
+class X implements arrayaccess {
+function offsetGet($n) {
+ return $n;
+ }
+function offsetSet($n, $v) {
+ var_dump($n);
+ }
+function offsetExists($n) {
+ var_dump($n);
+ return true;
+ }
+function offsetUnset($n) {
+ var_dump($n);
+ }
+function __toString() {
+ return 'baz';
+ }
+}
+$a = new X;
+echo "sets\n";
+$a[true] = 5;
+$a[NULL] = 57;
+$a[3.2] = 25;
+$a[array(3)] = 30;
+$a[$a] = 32;
+$a['57'] = 5;
+$a['6.5'] = 7;
+echo "gets\n";
+var_dump($a[true]);
+var_dump($a[NULL]);
+var_dump($a[3.2]);
+var_dump($a[array(3)]);
+var_dump($a[$a]);
+var_dump($a['57']);
+var_dump($a['6.5']);
+echo "unsets\n";
+unset($a[true]);
+unset($a[NULL]);
+unset($a[3.2]);
+unset($a[array(3)]);
+unset($a[$a]);
+unset($a['57']);
+unset($a['6.5']);
+echo "issets\n";
+isset($a[true]);
+isset($a[NULL]);
+isset($a[3.2]);
+isset($a[array(3)]);
+isset($a[$a]);
+isset($a['57']);
+isset($a['6.5']);
diff --git a/hphp/test/slow/object_magic_method/759.php b/hphp/test/slow/object_magic_method/759.php
index 7ff66edfd..a8c3758e3 100644
--- a/hphp/test/slow/object_magic_method/759.php
+++ b/hphp/test/slow/object_magic_method/759.php
@@ -1,3 +1,13 @@
 <?php
 
- class foo{  public function __get($n)  { return 'foo'; }  public function __set($n,$v)  { }}$foo = new foo; $a = $foo->x = 'baz'; $b = $foo->x .= 'bar';var_dump($a,$b);
\ No newline at end of file
+class foo{
+  public function __get($n)  {
+ return 'foo';
+ }
+  public function __set($n,$v)  {
+ }
+}
+$foo = new foo;
+ $a = $foo->x = 'baz';
+ $b = $foo->x .= 'bar';
+var_dump($a,$b);
diff --git a/hphp/test/slow/object_magic_method/760.php b/hphp/test/slow/object_magic_method/760.php
index 0c3340d6e..89a345bcc 100644
--- a/hphp/test/slow/object_magic_method/760.php
+++ b/hphp/test/slow/object_magic_method/760.php
@@ -1,11 +1,17 @@
 <?php
 
-
 class A {
   var $a;
-  function __set($n, $v) { $this->a[$n] = $v; }
-  function __get($n) { return $this->a[$n]; }
-  function f() { $this->f = 100; $this->f += 100; }
+  function __set($n, $v) {
+ $this->a[$n] = $v;
+ }
+  function __get($n) {
+ return $this->a[$n];
+ }
+  function f() {
+ $this->f = 100;
+ $this->f += 100;
+ }
 }
 function test() {
   $a = new A();
diff --git a/hphp/test/slow/object_magic_method/761.php b/hphp/test/slow/object_magic_method/761.php
index 23236c8f9..5fe3705d9 100644
--- a/hphp/test/slow/object_magic_method/761.php
+++ b/hphp/test/slow/object_magic_method/761.php
@@ -1,3 +1,21 @@
 <?php
 
- class X {  public $real = 1;  function __get($name) { echo 'get:'; var_dump($name); return 'abc'; }  function __set($name, $val) { echo 'set:'; var_dump($name,$val); }}function test($x) {  ++$x->foo;  var_dump($x->bar++);  $x->real++;  var_dump($x);}test(new X);
\ No newline at end of file
+class X {
+  public $real = 1;
+  function __get($name) {
+ echo 'get:';
+ var_dump($name);
+ return 'abc';
+ }
+  function __set($name, $val) {
+ echo 'set:';
+ var_dump($name,$val);
+ }
+}
+function test($x) {
+  ++$x->foo;
+  var_dump($x->bar++);
+  $x->real++;
+  var_dump($x);
+}
+test(new X);
diff --git a/hphp/test/slow/object_magic_method/762.php b/hphp/test/slow/object_magic_method/762.php
index 94bcffc00..cc8cfa9ba 100644
--- a/hphp/test/slow/object_magic_method/762.php
+++ b/hphp/test/slow/object_magic_method/762.php
@@ -1,3 +1,16 @@
 <?php
 
- class Foo {  public static $bar;  public function __call($fun, $args) {    self::$bar = array($fun);  }}function getName($part) {  return 'funny_'.$part;}function scoped($foo, $name) {  call_user_func(array($foo, getName($name)));}scoped(new Foo, 'a');var_dump(Foo::$bar);
\ No newline at end of file
+class Foo {
+  public static $bar;
+  public function __call($fun, $args) {
+    self::$bar = array($fun);
+  }
+}
+function getName($part) {
+  return 'funny_'.$part;
+}
+function scoped($foo, $name) {
+  call_user_func(array($foo, getName($name)));
+}
+scoped(new Foo, 'a');
+var_dump(Foo::$bar);
diff --git a/hphp/test/slow/object_magic_method/763.php b/hphp/test/slow/object_magic_method/763.php
index ba3779640..d3da25bf7 100644
--- a/hphp/test/slow/object_magic_method/763.php
+++ b/hphp/test/slow/object_magic_method/763.php
@@ -1,3 +1,28 @@
 <?php
 
- if (isset($g)) { class X {} }else {  class X {    function __destruct() {      var_dump(__METHOD__);    }  }}class Y extends X {  function __destruct() {    var_dump(__METHOD__);    parent::__destruct();  }}class Z extends X {}function test($t) {  var_dump('test:'.$t);  new $t(1,2);}test('X');test('Y');test('Z');
\ No newline at end of file
+if (isset($g)) {
+ class X {
+}
+ }
+else {
+  class X {
+    function __destruct() {
+      var_dump(__METHOD__);
+    }
+  }
+}
+class Y extends X {
+  function __destruct() {
+    var_dump(__METHOD__);
+    parent::__destruct();
+  }
+}
+class Z extends X {
+}
+function test($t) {
+  var_dump('test:'.$t);
+  new $t(1,2);
+}
+test('X');
+test('Y');
+test('Z');
diff --git a/hphp/test/slow/object_method/721.php b/hphp/test/slow/object_method/721.php
index 47bc904bb..0378dbf47 100644
--- a/hphp/test/slow/object_method/721.php
+++ b/hphp/test/slow/object_method/721.php
@@ -1,3 +1,9 @@
 <?php
 
- class A { function test() {}} $obj = new A(); $obj->test(); $obj = 1;
\ No newline at end of file
+class A {
+ function test() {
+}
+}
+ $obj = new A();
+ $obj->test();
+ $obj = 1;
diff --git a/hphp/test/slow/object_method/722.php b/hphp/test/slow/object_method/722.php
index f82e18230..0dbea48ec 100644
--- a/hphp/test/slow/object_method/722.php
+++ b/hphp/test/slow/object_method/722.php
@@ -1,3 +1,15 @@
 <?php
 
- abstract class T { function foo() { $this->test();} }class R extends T { function test() { var_dump('test'); }} $obj = new R(); $obj->test(); $obj->foo();
\ No newline at end of file
+abstract class T {
+ function foo() {
+ $this->test();
+}
+ }
+class R extends T {
+ function test() {
+ var_dump('test');
+ }
+}
+ $obj = new R();
+ $obj->test();
+ $obj->foo();
diff --git a/hphp/test/slow/object_method/723.php b/hphp/test/slow/object_method/723.php
index 4047fa3ac..b1fbd9387 100644
--- a/hphp/test/slow/object_method/723.php
+++ b/hphp/test/slow/object_method/723.php
@@ -1,3 +1,18 @@
 <?php
 
- class A { function test() { print 'A';} function foo() { $this->test();}} class B extends A { function test() { print 'B';}} $obj = new A(); $obj = new B(); $obj->foo();
\ No newline at end of file
+class A {
+ function test() {
+ print 'A';
+}
+ function foo() {
+ $this->test();
+}
+}
+ class B extends A {
+ function test() {
+ print 'B';
+}
+}
+ $obj = new A();
+ $obj = new B();
+ $obj->foo();
diff --git a/hphp/test/slow/object_method/724.php b/hphp/test/slow/object_method/724.php
index c8a512e77..5bcfea3ce 100644
--- a/hphp/test/slow/object_method/724.php
+++ b/hphp/test/slow/object_method/724.php
@@ -1,3 +1,17 @@
 <?php
 
- class A {} class AA extends A { function test() { print 'AA ok';} }class B { function foo(A $obj) { $obj->test();}}$obj = new AA(); $b = new B(); $b->foo($obj);
\ No newline at end of file
+class A {
+}
+ class AA extends A {
+ function test() {
+ print 'AA ok';
+}
+ }
+class B {
+ function foo(A $obj) {
+ $obj->test();
+}
+}
+$obj = new AA();
+ $b = new B();
+ $b->foo($obj);
diff --git a/hphp/test/slow/object_method/725.php b/hphp/test/slow/object_method/725.php
index aa1f6a8fe..4531ee824 100644
--- a/hphp/test/slow/object_method/725.php
+++ b/hphp/test/slow/object_method/725.php
@@ -1,3 +1,16 @@
 <?php
 
- abstract class T { abstract function test(); function foo() { $this->test();} }class R extends T { function test() { var_dump('test'); }} $obj = new R(); $obj->test(); $obj->foo();
\ No newline at end of file
+abstract class T {
+ abstract function test();
+ function foo() {
+ $this->test();
+}
+ }
+class R extends T {
+ function test() {
+ var_dump('test');
+ }
+}
+ $obj = new R();
+ $obj->test();
+ $obj->foo();
diff --git a/hphp/test/slow/object_method/726.php b/hphp/test/slow/object_method/726.php
index 82c368891..b3fa4ccf2 100644
--- a/hphp/test/slow/object_method/726.php
+++ b/hphp/test/slow/object_method/726.php
@@ -1,3 +1,13 @@
 <?php
 
- abstract class T { abstract function test(); } class R extends T { function test() { var_dump('test'); }} $obj = 1; $obj = new R(); $obj->test();
\ No newline at end of file
+abstract class T {
+ abstract function test();
+ }
+ class R extends T {
+ function test() {
+ var_dump('test');
+ }
+}
+ $obj = 1;
+ $obj = new R();
+ $obj->test();
diff --git a/hphp/test/slow/object_method/727.php b/hphp/test/slow/object_method/727.php
index 4d8952652..f49a327ba 100644
--- a/hphp/test/slow/object_method/727.php
+++ b/hphp/test/slow/object_method/727.php
@@ -1,3 +1,25 @@
 <?php
 
- class foo {  public function test1() {    echo 'in test1';  }  public function test2() {    self::test1();    foo::test1();    echo 'in test2';  }  public function test3() {    echo 'in test3';  }  public static function test4() {    echo 'in test4';  }}$obj = new foo();$obj->test2();foo::test1();foo::test2();foo::test3();$obj->test3();$obj->test4();
\ No newline at end of file
+class foo {
+  public function test1() {
+    echo 'in test1';
+  }
+  public function test2() {
+    self::test1();
+    foo::test1();
+    echo 'in test2';
+  }
+  public function test3() {
+    echo 'in test3';
+  }
+  public static function test4() {
+    echo 'in test4';
+  }
+}
+$obj = new foo();
+$obj->test2();
+foo::test1();
+foo::test2();
+foo::test3();
+$obj->test3();
+$obj->test4();
diff --git a/hphp/test/slow/object_method/728.php b/hphp/test/slow/object_method/728.php
index 85715ad08..dc841a39d 100644
--- a/hphp/test/slow/object_method/728.php
+++ b/hphp/test/slow/object_method/728.php
@@ -1,3 +1,31 @@
 <?php
 
- class A1 {  function a1f($a) {    var_dump('a1f:0');  }  static function a1b($a) {    var_dump('a1b:0');  }}class B1 extends A1 {  function b1f($a) {    var_dump('b1f:0');  }  static function b1b($a) {    var_dump('b1b:0');  }}$f = 'a1f';$b = 'a1b';A1::$f(1);A1::$b(1);B1::$f(1);B1::$b(1);$f = 'b1f';$b = 'b1b';B1::$f(1);B1::$b(1);$f = 'b2f';$b = 'b2b';call_user_func(array('B1', 'b1f'), 1);
\ No newline at end of file
+class A1 {
+  function a1f($a) {
+    var_dump('a1f:0');
+  }
+  static function a1b($a) {
+    var_dump('a1b:0');
+  }
+}
+class B1 extends A1 {
+  function b1f($a) {
+    var_dump('b1f:0');
+  }
+  static function b1b($a) {
+    var_dump('b1b:0');
+  }
+}
+$f = 'a1f';
+$b = 'a1b';
+A1::$f(1);
+A1::$b(1);
+B1::$f(1);
+B1::$b(1);
+$f = 'b1f';
+$b = 'b1b';
+B1::$f(1);
+B1::$b(1);
+$f = 'b2f';
+$b = 'b2b';
+call_user_func(array('B1', 'b1f'), 1);
diff --git a/hphp/test/slow/object_method/729.php b/hphp/test/slow/object_method/729.php
index 156b9ac48..c9924b6cf 100644
--- a/hphp/test/slow/object_method/729.php
+++ b/hphp/test/slow/object_method/729.php
@@ -1,3 +1,12 @@
 <?php
 
- class A {  var $a;  function f() {    var_dump($this->a);  }  function g() {    $this->a = 100;    call_user_func(array('self', 'f'));  }}
\ No newline at end of file
+class A {
+  var $a;
+  function f() {
+    var_dump($this->a);
+  }
+  function g() {
+    $this->a = 100;
+    call_user_func(array('self', 'f'));
+  }
+}
diff --git a/hphp/test/slow/object_method/730.php b/hphp/test/slow/object_method/730.php
index 0569eda1a..14b0aae4a 100644
--- a/hphp/test/slow/object_method/730.php
+++ b/hphp/test/slow/object_method/730.php
@@ -1,4 +1,16 @@
 <?php
 
- class c {function foo() { echo "called
-"; }}function meh() {}function z() {  $p = new c;  $p->foo(meh());  $p = null;}z();
\ No newline at end of file
+class c {
+function foo() {
+ echo "called
+";
+ }
+}
+function meh() {
+}
+function z() {
+  $p = new c;
+  $p->foo(meh());
+  $p = null;
+}
+z();
diff --git a/hphp/test/slow/object_method/731.php b/hphp/test/slow/object_method/731.php
index fd1f3e859..a63585bed 100644
--- a/hphp/test/slow/object_method/731.php
+++ b/hphp/test/slow/object_method/731.php
@@ -1,3 +1,24 @@
 <?php
 
- interface intf {  function meth();}class m {  function meth() {    return 1;  }}class m2 extends m implements intf {}class m3 extends m2 {  function f() {    var_dump(parent::meth());  }}$y = new m3;$y->f();function g() {  $y = new m3;  var_dump($y->meth());}g();
\ No newline at end of file
+interface intf {
+  function meth();
+}
+class m {
+  function meth() {
+    return 1;
+  }
+}
+class m2 extends m implements intf {
+}
+class m3 extends m2 {
+  function f() {
+    var_dump(parent::meth());
+  }
+}
+$y = new m3;
+$y->f();
+function g() {
+  $y = new m3;
+  var_dump($y->meth());
+}
+g();
diff --git a/hphp/test/slow/object_method/732.php b/hphp/test/slow/object_method/732.php
index f7476834c..02eb0d887 100644
--- a/hphp/test/slow/object_method/732.php
+++ b/hphp/test/slow/object_method/732.php
@@ -1,3 +1,11 @@
 <?php
 
- class c {  function x() {    var_dump($this);    $t = 'this';    var_dump($$t);  }}$x = new c;$x->x();
\ No newline at end of file
+class c {
+  function x() {
+    var_dump($this);
+    $t = 'this';
+    var_dump($$t);
+  }
+}
+$x = new c;
+$x->x();
diff --git a/hphp/test/slow/object_method/733.php b/hphp/test/slow/object_method/733.php
index b48ac3be1..d1bfb15c8 100644
--- a/hphp/test/slow/object_method/733.php
+++ b/hphp/test/slow/object_method/733.php
@@ -1,3 +1,23 @@
 <?php
 
- class RootBase {}class Base extends RootBase {  private $privateData;}class Test extends Base {  protected function f1() {    $this->privateData = 1;    var_dump('ok');  }  public function f2() {    $this->f1();  }}function foo() {  $obj = new Test();  $obj->f2();  $obj->privateData = 2;  $obj = new Base();}foo();
\ No newline at end of file
+class RootBase {
+}
+class Base extends RootBase {
+  private $privateData;
+}
+class Test extends Base {
+  protected function f1() {
+    $this->privateData = 1;
+    var_dump('ok');
+  }
+  public function f2() {
+    $this->f1();
+  }
+}
+function foo() {
+  $obj = new Test();
+  $obj->f2();
+  $obj->privateData = 2;
+  $obj = new Base();
+}
+foo();
diff --git a/hphp/test/slow/object_method/734.php b/hphp/test/slow/object_method/734.php
index 950022bda..60754c5f2 100644
--- a/hphp/test/slow/object_method/734.php
+++ b/hphp/test/slow/object_method/734.php
@@ -1,3 +1,710 @@
 <?php
 
- function test() {var_dump(is_callable('A::a_spub'));var_dump(is_callable('A::a_spro'));var_dump(is_callable('A::a_spri'));var_dump(is_callable('A::a_pro'));var_dump(is_callable('A::a_pri'));var_dump(is_callable('a_spub'));var_dump(is_callable('a_spro'));var_dump(is_callable('a_spri'));var_dump(is_callable('a_pub'));var_dump(is_callable('a_pro'));var_dump(is_callable('a_pri'));var_dump(is_callable('B::b_spub'));var_dump(is_callable('B::b_spro'));var_dump(is_callable('B::b_spri'));var_dump(is_callable('B::b_pro'));var_dump(is_callable('B::b_pri'));var_dump(is_callable('b_spub'));var_dump(is_callable('b_spro'));var_dump(is_callable('b_spri'));var_dump(is_callable('b_pub'));var_dump(is_callable('b_pro'));var_dump(is_callable('b_pri'));var_dump(is_callable(array('A', 'a_spub')));var_dump(is_callable(array('A', 'a_spro')));var_dump(is_callable(array('A', 'a_spri')));var_dump(is_callable(array('A', 'a_pub')));var_dump(is_callable(array('A', 'a_pro')));var_dump(is_callable(array('A', 'a_pri')));var_dump(is_callable(array('A', 'A::a_spub')));var_dump(is_callable(array('A', 'A::a_spro')));var_dump(is_callable(array('A', 'A::a_spri')));var_dump(is_callable(array('A', 'A::a_pro')));var_dump(is_callable(array('A', 'A::a_pri')));var_dump(is_callable(array('A', 'A::A::a_spub')));var_dump(is_callable(array('A', 'A::A::a_spro')));var_dump(is_callable(array('A', 'A::A::a_spri')));var_dump(is_callable(array('A', 'A::A::a_pro')));var_dump(is_callable(array('A', 'A::A::a_pri')));var_dump(is_callable(array('A', 'C::a_spub')));var_dump(is_callable(array('A', 'C::a_spro')));var_dump(is_callable(array('A', 'C::a_spri')));var_dump(is_callable(array('A', 'C::a_pub')));var_dump(is_callable(array('A', 'C::a_pro')));var_dump(is_callable(array('A', 'C::a_pri')));var_dump(is_callable(array('A', 'A::C::a_spub')));var_dump(is_callable(array('A', 'A::C::a_spro')));var_dump(is_callable(array('A', 'A::C::a_spri')));var_dump(is_callable(array('A', 'A::C::a_pub')));var_dump(is_callable(array('A', 'A::C::a_pro')));var_dump(is_callable(array('A', 'A::C::a_pri')));var_dump(is_callable(array('A', 'b_spub')));var_dump(is_callable(array('A', 'b_spro')));var_dump(is_callable(array('A', 'b_spri')));var_dump(is_callable(array('A', 'b_pub')));var_dump(is_callable(array('A', 'b_pro')));var_dump(is_callable(array('A', 'b_pri')));var_dump(is_callable(array('A', 'B::a_spub')));var_dump(is_callable(array('A', 'B::a_spro')));var_dump(is_callable(array('A', 'B::a_spri')));var_dump(is_callable(array('A', 'B::a_pub')));var_dump(is_callable(array('A', 'B::a_pro')));var_dump(is_callable(array('A', 'B::a_pri')));var_dump(is_callable(array('A', 'B::B::a_spub')));var_dump(is_callable(array('A', 'B::B::a_spro')));var_dump(is_callable(array('A', 'B::B::a_spri')));var_dump(is_callable(array('A', 'B::B::a_pub')));var_dump(is_callable(array('A', 'B::B::a_pro')));var_dump(is_callable(array('A', 'B::B::a_pri')));var_dump(is_callable(array('B', 'a_spub')));var_dump(is_callable(array('B', 'a_spro')));var_dump(is_callable(array('B', 'a_spri')));var_dump(is_callable(array('B', 'a_pub')));var_dump(is_callable(array('B', 'a_pro')));var_dump(is_callable(array('B', 'a_pri')));var_dump(is_callable(array('B', 'A::a_spub')));var_dump(is_callable(array('B', 'A::a_spro')));var_dump(is_callable(array('B', 'A::a_spri')));var_dump(is_callable(array('B', 'A::a_pro')));var_dump(is_callable(array('B', 'A::a_pri')));var_dump(is_callable(array('B', 'A::A::a_spub')));var_dump(is_callable(array('B', 'A::A::a_spro')));var_dump(is_callable(array('B', 'A::A::a_spri')));var_dump(is_callable(array('B', 'A::A::a_pro')));var_dump(is_callable(array('B', 'A::A::a_pri')));var_dump(is_callable(array('B', 'C::a_spub')));var_dump(is_callable(array('B', 'C::a_spro')));var_dump(is_callable(array('B', 'C::a_spri')));var_dump(is_callable(array('B', 'C::a_pub')));var_dump(is_callable(array('B', 'C::a_pro')));var_dump(is_callable(array('B', 'C::a_pri')));var_dump(is_callable(array('B', 'B::C::a_spub')));var_dump(is_callable(array('B', 'B::C::a_spro')));var_dump(is_callable(array('B', 'B::C::a_spri')));var_dump(is_callable(array('B', 'B::C::a_pub')));var_dump(is_callable(array('B', 'B::C::a_pro')));var_dump(is_callable(array('B', 'B::C::a_pri')));var_dump(is_callable(array('B', 'b_spub')));var_dump(is_callable(array('B', 'b_spro')));var_dump(is_callable(array('B', 'b_spri')));var_dump(is_callable(array('B', 'b_pub')));var_dump(is_callable(array('B', 'b_pro')));var_dump(is_callable(array('B', 'b_pri')));var_dump(is_callable(array('B', 'B::a_spub')));var_dump(is_callable(array('B', 'B::a_spro')));var_dump(is_callable(array('B', 'B::a_spri')));var_dump(is_callable(array('B', 'B::a_pub')));var_dump(is_callable(array('B', 'B::a_pro')));var_dump(is_callable(array('B', 'B::a_pri')));var_dump(is_callable(array('B', 'B::A::a_spub')));var_dump(is_callable(array('B', 'B::A::a_spro')));var_dump(is_callable(array('B', 'B::A::a_spri')));var_dump(is_callable(array('B', 'B::A::a_pro')));var_dump(is_callable(array('B', 'B::A::a_pri')));var_dump(is_callable(array('B', 'B::B::a_spub')));var_dump(is_callable(array('B', 'B::B::a_spro')));var_dump(is_callable(array('B', 'B::B::a_spri')));var_dump(is_callable(array('B', 'B::B::a_pub')));var_dump(is_callable(array('B', 'B::B::a_pro')));var_dump(is_callable(array('B', 'B::B::a_pri')));var_dump(is_callable(array(new A(), 'a_spub')));var_dump(is_callable(array(new A(), 'a_spro')));var_dump(is_callable(array(new A(), 'a_spri')));var_dump(is_callable(array(new A(), 'a_pub')));var_dump(is_callable(array(new A(), 'a_pro')));var_dump(is_callable(array(new A(), 'a_pri')));var_dump(is_callable(array(new A(), 'A::a_spub')));var_dump(is_callable(array(new A(), 'A::a_spro')));var_dump(is_callable(array(new A(), 'A::a_spri')));var_dump(is_callable(array(new A(), 'A::a_pro')));var_dump(is_callable(array(new A(), 'A::a_pri')));var_dump(is_callable(array(new A(), 'A::A::a_spub')));var_dump(is_callable(array(new A(), 'A::A::a_spro')));var_dump(is_callable(array(new A(), 'A::A::a_spri')));var_dump(is_callable(array(new A(), 'A::A::a_pro')));var_dump(is_callable(array(new A(), 'A::A::a_pri')));var_dump(is_callable(array(new A(), 'C::a_spub')));var_dump(is_callable(array(new A(), 'C::a_spro')));var_dump(is_callable(array(new A(), 'C::a_spri')));var_dump(is_callable(array(new A(), 'C::a_pub')));var_dump(is_callable(array(new A(), 'C::a_pro')));var_dump(is_callable(array(new A(), 'C::a_pri')));var_dump(is_callable(array(new A(), 'A::C::a_spub')));var_dump(is_callable(array(new A(), 'A::C::a_spro')));var_dump(is_callable(array(new A(), 'A::C::a_spri')));var_dump(is_callable(array(new A(), 'A::C::a_pub')));var_dump(is_callable(array(new A(), 'A::C::a_pro')));var_dump(is_callable(array(new A(), 'A::C::a_pri')));var_dump(is_callable(array(new A(), 'b_spub')));var_dump(is_callable(array(new A(), 'b_spro')));var_dump(is_callable(array(new A(), 'b_spri')));var_dump(is_callable(array(new A(), 'b_pub')));var_dump(is_callable(array(new A(), 'b_pro')));var_dump(is_callable(array(new A(), 'b_pri')));var_dump(is_callable(array(new A(), 'B::a_spub')));var_dump(is_callable(array(new A(), 'B::a_spro')));var_dump(is_callable(array(new A(), 'B::a_spri')));var_dump(is_callable(array(new A(), 'B::a_pub')));var_dump(is_callable(array(new A(), 'B::a_pro')));var_dump(is_callable(array(new A(), 'B::a_pri')));var_dump(is_callable(array(new A(), 'B::A::a_spub')));var_dump(is_callable(array(new A(), 'B::A::a_spro')));var_dump(is_callable(array(new A(), 'B::A::a_spri')));var_dump(is_callable(array(new A(), 'B::A::a_pro')));var_dump(is_callable(array(new A(), 'B::A::a_pri')));var_dump(is_callable(array(new B(), 'b_spub')));var_dump(is_callable(array(new B(), 'b_spro')));var_dump(is_callable(array(new B(), 'b_spri')));var_dump(is_callable(array(new B(), 'b_pub')));var_dump(is_callable(array(new B(), 'b_pro')));var_dump(is_callable(array(new B(), 'b_pri')));var_dump(is_callable(array(new B(), 'B::b_spub')));var_dump(is_callable(array(new B(), 'B::b_spro')));var_dump(is_callable(array(new B(), 'B::b_spri')));var_dump(is_callable(array(new B(), 'B::b_pro')));var_dump(is_callable(array(new B(), 'B::b_pri')));var_dump(is_callable(array(new B(), 'B::B::b_spub')));var_dump(is_callable(array(new B(), 'B::B::b_spro')));var_dump(is_callable(array(new B(), 'B::B::b_spri')));var_dump(is_callable(array(new B(), 'B::B::b_pro')));var_dump(is_callable(array(new B(), 'B::B::b_pri')));var_dump(is_callable(array(new B(), 'C::b_spub')));var_dump(is_callable(array(new B(), 'C::b_spro')));var_dump(is_callable(array(new B(), 'C::b_spri')));var_dump(is_callable(array(new B(), 'C::b_pub')));var_dump(is_callable(array(new B(), 'C::b_pro')));var_dump(is_callable(array(new B(), 'C::b_pri')));var_dump(is_callable(array(new B(), 'B::C::b_spub')));var_dump(is_callable(array(new B(), 'B::C::b_spro')));var_dump(is_callable(array(new B(), 'B::C::b_spri')));var_dump(is_callable(array(new B(), 'B::C::b_pub')));var_dump(is_callable(array(new B(), 'B::C::b_pro')));var_dump(is_callable(array(new B(), 'B::C::b_pri')));var_dump(is_callable(array(new B(), 'a_spub')));var_dump(is_callable(array(new B(), 'a_spro')));var_dump(is_callable(array(new B(), 'a_spri')));var_dump(is_callable(array(new B(), 'a_pub')));var_dump(is_callable(array(new B(), 'a_pro')));var_dump(is_callable(array(new B(), 'a_pri')));var_dump(is_callable(array(new B(), 'A::B::b_spub')));var_dump(is_callable(array(new B(), 'A::B::b_spro')));var_dump(is_callable(array(new B(), 'A::B::b_spri')));var_dump(is_callable(array(new B(), 'A::B::b_pro')));var_dump(is_callable(array(new B(), 'A::B::b_pri')));}class EXT {  static public function ext_spub() {    test();var_dump(is_callable('A::a_spub'));var_dump(is_callable('A::a_spro'));var_dump(is_callable('A::a_spri'));var_dump(is_callable('A::a_pro'));var_dump(is_callable('A::a_pri'));var_dump(is_callable('a_spub'));var_dump(is_callable('a_spro'));var_dump(is_callable('a_spri'));var_dump(is_callable('a_pub'));var_dump(is_callable('a_pro'));var_dump(is_callable('a_pri'));var_dump(is_callable('B::b_spub'));var_dump(is_callable('B::b_spro'));var_dump(is_callable('B::b_spri'));var_dump(is_callable('B::b_pro'));var_dump(is_callable('B::b_pri'));var_dump(is_callable('b_spub'));var_dump(is_callable('b_spro'));var_dump(is_callable('b_spri'));var_dump(is_callable('b_pub'));var_dump(is_callable('b_pro'));var_dump(is_callable('b_pri'));var_dump(is_callable(array('A', 'a_spub')));var_dump(is_callable(array('A', 'a_spro')));var_dump(is_callable(array('A', 'a_spri')));var_dump(is_callable(array('A', 'a_pub')));var_dump(is_callable(array('A', 'a_pro')));var_dump(is_callable(array('A', 'a_pri')));var_dump(is_callable(array('A', 'A::a_spub')));var_dump(is_callable(array('A', 'A::a_spro')));var_dump(is_callable(array('A', 'A::a_spri')));var_dump(is_callable(array('A', 'A::a_pro')));var_dump(is_callable(array('A', 'A::a_pri')));var_dump(is_callable(array('A', 'A::A::a_spub')));var_dump(is_callable(array('A', 'A::A::a_spro')));var_dump(is_callable(array('A', 'A::A::a_spri')));var_dump(is_callable(array('A', 'A::A::a_pro')));var_dump(is_callable(array('A', 'A::A::a_pri')));var_dump(is_callable(array('A', 'C::a_spub')));var_dump(is_callable(array('A', 'C::a_spro')));var_dump(is_callable(array('A', 'C::a_spri')));var_dump(is_callable(array('A', 'C::a_pub')));var_dump(is_callable(array('A', 'C::a_pro')));var_dump(is_callable(array('A', 'C::a_pri')));var_dump(is_callable(array('A', 'A::C::a_spub')));var_dump(is_callable(array('A', 'A::C::a_spro')));var_dump(is_callable(array('A', 'A::C::a_spri')));var_dump(is_callable(array('A', 'A::C::a_pub')));var_dump(is_callable(array('A', 'A::C::a_pro')));var_dump(is_callable(array('A', 'A::C::a_pri')));var_dump(is_callable(array('A', 'b_spub')));var_dump(is_callable(array('A', 'b_spro')));var_dump(is_callable(array('A', 'b_spri')));var_dump(is_callable(array('A', 'b_pub')));var_dump(is_callable(array('A', 'b_pro')));var_dump(is_callable(array('A', 'b_pri')));var_dump(is_callable(array('A', 'B::a_spub')));var_dump(is_callable(array('A', 'B::a_spro')));var_dump(is_callable(array('A', 'B::a_spri')));var_dump(is_callable(array('A', 'B::a_pub')));var_dump(is_callable(array('A', 'B::a_pro')));var_dump(is_callable(array('A', 'B::a_pri')));var_dump(is_callable(array('A', 'B::B::a_spub')));var_dump(is_callable(array('A', 'B::B::a_spro')));var_dump(is_callable(array('A', 'B::B::a_spri')));var_dump(is_callable(array('A', 'B::B::a_pub')));var_dump(is_callable(array('A', 'B::B::a_pro')));var_dump(is_callable(array('A', 'B::B::a_pri')));var_dump(is_callable(array('B', 'a_spub')));var_dump(is_callable(array('B', 'a_spro')));var_dump(is_callable(array('B', 'a_spri')));var_dump(is_callable(array('B', 'a_pub')));var_dump(is_callable(array('B', 'a_pro')));var_dump(is_callable(array('B', 'a_pri')));var_dump(is_callable(array('B', 'A::a_spub')));var_dump(is_callable(array('B', 'A::a_spro')));var_dump(is_callable(array('B', 'A::a_spri')));var_dump(is_callable(array('B', 'A::a_pro')));var_dump(is_callable(array('B', 'A::a_pri')));var_dump(is_callable(array('B', 'A::A::a_spub')));var_dump(is_callable(array('B', 'A::A::a_spro')));var_dump(is_callable(array('B', 'A::A::a_spri')));var_dump(is_callable(array('B', 'A::A::a_pro')));var_dump(is_callable(array('B', 'A::A::a_pri')));var_dump(is_callable(array('B', 'C::a_spub')));var_dump(is_callable(array('B', 'C::a_spro')));var_dump(is_callable(array('B', 'C::a_spri')));var_dump(is_callable(array('B', 'C::a_pub')));var_dump(is_callable(array('B', 'C::a_pro')));var_dump(is_callable(array('B', 'C::a_pri')));var_dump(is_callable(array('B', 'B::C::a_spub')));var_dump(is_callable(array('B', 'B::C::a_spro')));var_dump(is_callable(array('B', 'B::C::a_spri')));var_dump(is_callable(array('B', 'B::C::a_pub')));var_dump(is_callable(array('B', 'B::C::a_pro')));var_dump(is_callable(array('B', 'B::C::a_pri')));var_dump(is_callable(array('B', 'b_spub')));var_dump(is_callable(array('B', 'b_spro')));var_dump(is_callable(array('B', 'b_spri')));var_dump(is_callable(array('B', 'b_pub')));var_dump(is_callable(array('B', 'b_pro')));var_dump(is_callable(array('B', 'b_pri')));var_dump(is_callable(array('B', 'B::a_spub')));var_dump(is_callable(array('B', 'B::a_spro')));var_dump(is_callable(array('B', 'B::a_spri')));var_dump(is_callable(array('B', 'B::a_pub')));var_dump(is_callable(array('B', 'B::a_pro')));var_dump(is_callable(array('B', 'B::a_pri')));var_dump(is_callable(array('B', 'B::A::a_spub')));var_dump(is_callable(array('B', 'B::A::a_spro')));var_dump(is_callable(array('B', 'B::A::a_spri')));var_dump(is_callable(array('B', 'B::A::a_pro')));var_dump(is_callable(array('B', 'B::A::a_pri')));var_dump(is_callable(array('B', 'B::B::a_spub')));var_dump(is_callable(array('B', 'B::B::a_spro')));var_dump(is_callable(array('B', 'B::B::a_spri')));var_dump(is_callable(array('B', 'B::B::a_pub')));var_dump(is_callable(array('B', 'B::B::a_pro')));var_dump(is_callable(array('B', 'B::B::a_pri')));var_dump(is_callable(array(new A(), 'a_spub')));var_dump(is_callable(array(new A(), 'a_spro')));var_dump(is_callable(array(new A(), 'a_spri')));var_dump(is_callable(array(new A(), 'a_pub')));var_dump(is_callable(array(new A(), 'a_pro')));var_dump(is_callable(array(new A(), 'a_pri')));var_dump(is_callable(array(new A(), 'A::a_spub')));var_dump(is_callable(array(new A(), 'A::a_spro')));var_dump(is_callable(array(new A(), 'A::a_spri')));var_dump(is_callable(array(new A(), 'A::a_pro')));var_dump(is_callable(array(new A(), 'A::a_pri')));var_dump(is_callable(array(new A(), 'A::A::a_spub')));var_dump(is_callable(array(new A(), 'A::A::a_spro')));var_dump(is_callable(array(new A(), 'A::A::a_spri')));var_dump(is_callable(array(new A(), 'A::A::a_pro')));var_dump(is_callable(array(new A(), 'A::A::a_pri')));var_dump(is_callable(array(new A(), 'C::a_spub')));var_dump(is_callable(array(new A(), 'C::a_spro')));var_dump(is_callable(array(new A(), 'C::a_spri')));var_dump(is_callable(array(new A(), 'C::a_pub')));var_dump(is_callable(array(new A(), 'C::a_pro')));var_dump(is_callable(array(new A(), 'C::a_pri')));var_dump(is_callable(array(new A(), 'A::C::a_spub')));var_dump(is_callable(array(new A(), 'A::C::a_spro')));var_dump(is_callable(array(new A(), 'A::C::a_spri')));var_dump(is_callable(array(new A(), 'A::C::a_pub')));var_dump(is_callable(array(new A(), 'A::C::a_pro')));var_dump(is_callable(array(new A(), 'A::C::a_pri')));var_dump(is_callable(array(new A(), 'b_spub')));var_dump(is_callable(array(new A(), 'b_spro')));var_dump(is_callable(array(new A(), 'b_spri')));var_dump(is_callable(array(new A(), 'b_pub')));var_dump(is_callable(array(new A(), 'b_pro')));var_dump(is_callable(array(new A(), 'b_pri')));var_dump(is_callable(array(new A(), 'B::a_spub')));var_dump(is_callable(array(new A(), 'B::a_spro')));var_dump(is_callable(array(new A(), 'B::a_spri')));var_dump(is_callable(array(new A(), 'B::a_pub')));var_dump(is_callable(array(new A(), 'B::a_pro')));var_dump(is_callable(array(new A(), 'B::a_pri')));var_dump(is_callable(array(new A(), 'B::A::a_spub')));var_dump(is_callable(array(new A(), 'B::A::a_spro')));var_dump(is_callable(array(new A(), 'B::A::a_spri')));var_dump(is_callable(array(new A(), 'B::A::a_pro')));var_dump(is_callable(array(new A(), 'B::A::a_pri')));var_dump(is_callable(array(new B(), 'b_spub')));var_dump(is_callable(array(new B(), 'b_spro')));var_dump(is_callable(array(new B(), 'b_spri')));var_dump(is_callable(array(new B(), 'b_pub')));var_dump(is_callable(array(new B(), 'b_pro')));var_dump(is_callable(array(new B(), 'b_pri')));var_dump(is_callable(array(new B(), 'B::b_spub')));var_dump(is_callable(array(new B(), 'B::b_spro')));var_dump(is_callable(array(new B(), 'B::b_spri')));var_dump(is_callable(array(new B(), 'B::b_pro')));var_dump(is_callable(array(new B(), 'B::b_pri')));var_dump(is_callable(array(new B(), 'B::B::b_spub')));var_dump(is_callable(array(new B(), 'B::B::b_spro')));var_dump(is_callable(array(new B(), 'B::B::b_spri')));var_dump(is_callable(array(new B(), 'B::B::b_pro')));var_dump(is_callable(array(new B(), 'B::B::b_pri')));var_dump(is_callable(array(new B(), 'C::b_spub')));var_dump(is_callable(array(new B(), 'C::b_spro')));var_dump(is_callable(array(new B(), 'C::b_spri')));var_dump(is_callable(array(new B(), 'C::b_pub')));var_dump(is_callable(array(new B(), 'C::b_pro')));var_dump(is_callable(array(new B(), 'C::b_pri')));var_dump(is_callable(array(new B(), 'B::C::b_spub')));var_dump(is_callable(array(new B(), 'B::C::b_spro')));var_dump(is_callable(array(new B(), 'B::C::b_spri')));var_dump(is_callable(array(new B(), 'B::C::b_pub')));var_dump(is_callable(array(new B(), 'B::C::b_pro')));var_dump(is_callable(array(new B(), 'B::C::b_pri')));var_dump(is_callable(array(new B(), 'a_spub')));var_dump(is_callable(array(new B(), 'a_spro')));var_dump(is_callable(array(new B(), 'a_spri')));var_dump(is_callable(array(new B(), 'a_pub')));var_dump(is_callable(array(new B(), 'a_pro')));var_dump(is_callable(array(new B(), 'a_pri')));var_dump(is_callable(array(new B(), 'A::B::b_spub')));var_dump(is_callable(array(new B(), 'A::B::b_spro')));var_dump(is_callable(array(new B(), 'A::B::b_spri')));var_dump(is_callable(array(new B(), 'A::B::b_pro')));var_dump(is_callable(array(new B(), 'A::B::b_pri')));  }}class A {  static public function a_spub() {    test();  }  static protected function a_spro() {    test();  }  static private function a_spri() {    test();  }  public function a_pub() {    test();  }  protected function a_pro() {    test();  }  private function a_pri() {    test();  }  public static function a_sf() {    test();    self::a_spub();    self::a_spro();    self::a_spri();    self::a_pub();    self::a_pro();    self::a_pri();  }  public function a_f() {    test();    self::a_spub();    self::a_spro();    self::a_spri();    self::a_pub();    self::a_pro();    self::a_pri();  }};class B extends A {  static public function b_spub() {    test();  }  static protected function b_spro() {    test();  }  static private function b_spri() {    test();  }  public function b_pub() {    test();  }  protected function b_pro() {    test();  }  private function b_pri() {    test();  }  public static function b_sf() {    test();    self::b_spub();    self::b_spro();    self::b_spri();    self::b_pub();    self::b_pro();    self::b_pri();  }  public function b_f() {    test();    self::b_spub();    self::b_spro();    self::b_spri();    self::b_pub();    self::b_pro();    self::b_pri();  }}EXT::ext_spub();test();var_dump(is_callable('A::a_spub'));var_dump(is_callable('A::a_spro'));var_dump(is_callable('A::a_spri'));var_dump(is_callable('A::a_pro'));var_dump(is_callable('A::a_pri'));var_dump(is_callable('a_spub'));var_dump(is_callable('a_spro'));var_dump(is_callable('a_spri'));var_dump(is_callable('a_pub'));var_dump(is_callable('a_pro'));var_dump(is_callable('a_pri'));var_dump(is_callable('B::b_spub'));var_dump(is_callable('B::b_spro'));var_dump(is_callable('B::b_spri'));var_dump(is_callable('B::b_pro'));var_dump(is_callable('B::b_pri'));var_dump(is_callable('b_spub'));var_dump(is_callable('b_spro'));var_dump(is_callable('b_spri'));var_dump(is_callable('b_pub'));var_dump(is_callable('b_pro'));var_dump(is_callable('b_pri'));var_dump(is_callable(array('A', 'a_spub')));var_dump(is_callable(array('A', 'a_spro')));var_dump(is_callable(array('A', 'a_spri')));var_dump(is_callable(array('A', 'a_pub')));var_dump(is_callable(array('A', 'a_pro')));var_dump(is_callable(array('A', 'a_pri')));var_dump(is_callable(array('A', 'A::a_spub')));var_dump(is_callable(array('A', 'A::a_spro')));var_dump(is_callable(array('A', 'A::a_spri')));var_dump(is_callable(array('A', 'A::a_pro')));var_dump(is_callable(array('A', 'A::a_pri')));var_dump(is_callable(array('A', 'A::A::a_spub')));var_dump(is_callable(array('A', 'A::A::a_spro')));var_dump(is_callable(array('A', 'A::A::a_spri')));var_dump(is_callable(array('A', 'A::A::a_pro')));var_dump(is_callable(array('A', 'A::A::a_pri')));var_dump(is_callable(array('A', 'C::a_spub')));var_dump(is_callable(array('A', 'C::a_spro')));var_dump(is_callable(array('A', 'C::a_spri')));var_dump(is_callable(array('A', 'C::a_pub')));var_dump(is_callable(array('A', 'C::a_pro')));var_dump(is_callable(array('A', 'C::a_pri')));var_dump(is_callable(array('A', 'A::C::a_spub')));var_dump(is_callable(array('A', 'A::C::a_spro')));var_dump(is_callable(array('A', 'A::C::a_spri')));var_dump(is_callable(array('A', 'A::C::a_pub')));var_dump(is_callable(array('A', 'A::C::a_pro')));var_dump(is_callable(array('A', 'A::C::a_pri')));var_dump(is_callable(array('A', 'b_spub')));var_dump(is_callable(array('A', 'b_spro')));var_dump(is_callable(array('A', 'b_spri')));var_dump(is_callable(array('A', 'b_pub')));var_dump(is_callable(array('A', 'b_pro')));var_dump(is_callable(array('A', 'b_pri')));var_dump(is_callable(array('A', 'B::a_spub')));var_dump(is_callable(array('A', 'B::a_spro')));var_dump(is_callable(array('A', 'B::a_spri')));var_dump(is_callable(array('A', 'B::a_pub')));var_dump(is_callable(array('A', 'B::a_pro')));var_dump(is_callable(array('A', 'B::a_pri')));var_dump(is_callable(array('A', 'B::B::a_spub')));var_dump(is_callable(array('A', 'B::B::a_spro')));var_dump(is_callable(array('A', 'B::B::a_spri')));var_dump(is_callable(array('A', 'B::B::a_pub')));var_dump(is_callable(array('A', 'B::B::a_pro')));var_dump(is_callable(array('A', 'B::B::a_pri')));var_dump(is_callable(array('B', 'a_spub')));var_dump(is_callable(array('B', 'a_spro')));var_dump(is_callable(array('B', 'a_spri')));var_dump(is_callable(array('B', 'a_pub')));var_dump(is_callable(array('B', 'a_pro')));var_dump(is_callable(array('B', 'a_pri')));var_dump(is_callable(array('B', 'A::a_spub')));var_dump(is_callable(array('B', 'A::a_spro')));var_dump(is_callable(array('B', 'A::a_spri')));var_dump(is_callable(array('B', 'A::a_pro')));var_dump(is_callable(array('B', 'A::a_pri')));var_dump(is_callable(array('B', 'A::A::a_spub')));var_dump(is_callable(array('B', 'A::A::a_spro')));var_dump(is_callable(array('B', 'A::A::a_spri')));var_dump(is_callable(array('B', 'A::A::a_pro')));var_dump(is_callable(array('B', 'A::A::a_pri')));var_dump(is_callable(array('B', 'C::a_spub')));var_dump(is_callable(array('B', 'C::a_spro')));var_dump(is_callable(array('B', 'C::a_spri')));var_dump(is_callable(array('B', 'C::a_pub')));var_dump(is_callable(array('B', 'C::a_pro')));var_dump(is_callable(array('B', 'C::a_pri')));var_dump(is_callable(array('B', 'B::C::a_spub')));var_dump(is_callable(array('B', 'B::C::a_spro')));var_dump(is_callable(array('B', 'B::C::a_spri')));var_dump(is_callable(array('B', 'B::C::a_pub')));var_dump(is_callable(array('B', 'B::C::a_pro')));var_dump(is_callable(array('B', 'B::C::a_pri')));var_dump(is_callable(array('B', 'b_spub')));var_dump(is_callable(array('B', 'b_spro')));var_dump(is_callable(array('B', 'b_spri')));var_dump(is_callable(array('B', 'b_pub')));var_dump(is_callable(array('B', 'b_pro')));var_dump(is_callable(array('B', 'b_pri')));var_dump(is_callable(array('B', 'B::a_spub')));var_dump(is_callable(array('B', 'B::a_spro')));var_dump(is_callable(array('B', 'B::a_spri')));var_dump(is_callable(array('B', 'B::a_pub')));var_dump(is_callable(array('B', 'B::a_pro')));var_dump(is_callable(array('B', 'B::a_pri')));var_dump(is_callable(array('B', 'B::A::a_spub')));var_dump(is_callable(array('B', 'B::A::a_spro')));var_dump(is_callable(array('B', 'B::A::a_spri')));var_dump(is_callable(array('B', 'B::A::a_pro')));var_dump(is_callable(array('B', 'B::A::a_pri')));var_dump(is_callable(array('B', 'B::B::a_spub')));var_dump(is_callable(array('B', 'B::B::a_spro')));var_dump(is_callable(array('B', 'B::B::a_spri')));var_dump(is_callable(array('B', 'B::B::a_pub')));var_dump(is_callable(array('B', 'B::B::a_pro')));var_dump(is_callable(array('B', 'B::B::a_pri')));var_dump(is_callable(array(new A(), 'a_spub')));var_dump(is_callable(array(new A(), 'a_spro')));var_dump(is_callable(array(new A(), 'a_spri')));var_dump(is_callable(array(new A(), 'a_pub')));var_dump(is_callable(array(new A(), 'a_pro')));var_dump(is_callable(array(new A(), 'a_pri')));var_dump(is_callable(array(new A(), 'A::a_spub')));var_dump(is_callable(array(new A(), 'A::a_spro')));var_dump(is_callable(array(new A(), 'A::a_spri')));var_dump(is_callable(array(new A(), 'A::a_pro')));var_dump(is_callable(array(new A(), 'A::a_pri')));var_dump(is_callable(array(new A(), 'A::A::a_spub')));var_dump(is_callable(array(new A(), 'A::A::a_spro')));var_dump(is_callable(array(new A(), 'A::A::a_spri')));var_dump(is_callable(array(new A(), 'A::A::a_pro')));var_dump(is_callable(array(new A(), 'A::A::a_pri')));var_dump(is_callable(array(new A(), 'C::a_spub')));var_dump(is_callable(array(new A(), 'C::a_spro')));var_dump(is_callable(array(new A(), 'C::a_spri')));var_dump(is_callable(array(new A(), 'C::a_pub')));var_dump(is_callable(array(new A(), 'C::a_pro')));var_dump(is_callable(array(new A(), 'C::a_pri')));var_dump(is_callable(array(new A(), 'A::C::a_spub')));var_dump(is_callable(array(new A(), 'A::C::a_spro')));var_dump(is_callable(array(new A(), 'A::C::a_spri')));var_dump(is_callable(array(new A(), 'A::C::a_pub')));var_dump(is_callable(array(new A(), 'A::C::a_pro')));var_dump(is_callable(array(new A(), 'A::C::a_pri')));var_dump(is_callable(array(new A(), 'b_spub')));var_dump(is_callable(array(new A(), 'b_spro')));var_dump(is_callable(array(new A(), 'b_spri')));var_dump(is_callable(array(new A(), 'b_pub')));var_dump(is_callable(array(new A(), 'b_pro')));var_dump(is_callable(array(new A(), 'b_pri')));var_dump(is_callable(array(new A(), 'B::a_spub')));var_dump(is_callable(array(new A(), 'B::a_spro')));var_dump(is_callable(array(new A(), 'B::a_spri')));var_dump(is_callable(array(new A(), 'B::a_pub')));var_dump(is_callable(array(new A(), 'B::a_pro')));var_dump(is_callable(array(new A(), 'B::a_pri')));var_dump(is_callable(array(new A(), 'B::A::a_spub')));var_dump(is_callable(array(new A(), 'B::A::a_spro')));var_dump(is_callable(array(new A(), 'B::A::a_spri')));var_dump(is_callable(array(new A(), 'B::A::a_pro')));var_dump(is_callable(array(new A(), 'B::A::a_pri')));var_dump(is_callable(array(new B(), 'b_spub')));var_dump(is_callable(array(new B(), 'b_spro')));var_dump(is_callable(array(new B(), 'b_spri')));var_dump(is_callable(array(new B(), 'b_pub')));var_dump(is_callable(array(new B(), 'b_pro')));var_dump(is_callable(array(new B(), 'b_pri')));var_dump(is_callable(array(new B(), 'B::b_spub')));var_dump(is_callable(array(new B(), 'B::b_spro')));var_dump(is_callable(array(new B(), 'B::b_spri')));var_dump(is_callable(array(new B(), 'B::b_pro')));var_dump(is_callable(array(new B(), 'B::b_pri')));var_dump(is_callable(array(new B(), 'B::B::b_spub')));var_dump(is_callable(array(new B(), 'B::B::b_spro')));var_dump(is_callable(array(new B(), 'B::B::b_spri')));var_dump(is_callable(array(new B(), 'B::B::b_pro')));var_dump(is_callable(array(new B(), 'B::B::b_pri')));var_dump(is_callable(array(new B(), 'C::b_spub')));var_dump(is_callable(array(new B(), 'C::b_spro')));var_dump(is_callable(array(new B(), 'C::b_spri')));var_dump(is_callable(array(new B(), 'C::b_pub')));var_dump(is_callable(array(new B(), 'C::b_pro')));var_dump(is_callable(array(new B(), 'C::b_pri')));var_dump(is_callable(array(new B(), 'B::C::b_spub')));var_dump(is_callable(array(new B(), 'B::C::b_spro')));var_dump(is_callable(array(new B(), 'B::C::b_spri')));var_dump(is_callable(array(new B(), 'B::C::b_pub')));var_dump(is_callable(array(new B(), 'B::C::b_pro')));var_dump(is_callable(array(new B(), 'B::C::b_pri')));var_dump(is_callable(array(new B(), 'a_spub')));var_dump(is_callable(array(new B(), 'a_spro')));var_dump(is_callable(array(new B(), 'a_spri')));var_dump(is_callable(array(new B(), 'a_pub')));var_dump(is_callable(array(new B(), 'a_pro')));var_dump(is_callable(array(new B(), 'a_pri')));var_dump(is_callable(array(new B(), 'A::B::b_spub')));var_dump(is_callable(array(new B(), 'A::B::b_spro')));var_dump(is_callable(array(new B(), 'A::B::b_spri')));var_dump(is_callable(array(new B(), 'A::B::b_pro')));var_dump(is_callable(array(new B(), 'A::B::b_pri')));var_dump(is_callable('A::b_spub'));var_dump(is_callable('A::b_spro'));var_dump(is_callable('A::b_spri'));var_dump(is_callable('A::b_pub'));var_dump(is_callable('A::b_pro'));var_dump(is_callable('A::b_pri'));B::a_sf();B::b_sf();$obj = new B;$obj->a_sf();$obj->b_sf();$obj->a_f();$obj->b_f();
\ No newline at end of file
+function test() {
+var_dump(is_callable('A::a_spub'));
+var_dump(is_callable('A::a_spro'));
+var_dump(is_callable('A::a_spri'));
+var_dump(is_callable('A::a_pro'));
+var_dump(is_callable('A::a_pri'));
+var_dump(is_callable('a_spub'));
+var_dump(is_callable('a_spro'));
+var_dump(is_callable('a_spri'));
+var_dump(is_callable('a_pub'));
+var_dump(is_callable('a_pro'));
+var_dump(is_callable('a_pri'));
+var_dump(is_callable('B::b_spub'));
+var_dump(is_callable('B::b_spro'));
+var_dump(is_callable('B::b_spri'));
+var_dump(is_callable('B::b_pro'));
+var_dump(is_callable('B::b_pri'));
+var_dump(is_callable('b_spub'));
+var_dump(is_callable('b_spro'));
+var_dump(is_callable('b_spri'));
+var_dump(is_callable('b_pub'));
+var_dump(is_callable('b_pro'));
+var_dump(is_callable('b_pri'));
+var_dump(is_callable(array('A', 'a_spub')));
+var_dump(is_callable(array('A', 'a_spro')));
+var_dump(is_callable(array('A', 'a_spri')));
+var_dump(is_callable(array('A', 'a_pub')));
+var_dump(is_callable(array('A', 'a_pro')));
+var_dump(is_callable(array('A', 'a_pri')));
+var_dump(is_callable(array('A', 'A::a_spub')));
+var_dump(is_callable(array('A', 'A::a_spro')));
+var_dump(is_callable(array('A', 'A::a_spri')));
+var_dump(is_callable(array('A', 'A::a_pro')));
+var_dump(is_callable(array('A', 'A::a_pri')));
+var_dump(is_callable(array('A', 'A::A::a_spub')));
+var_dump(is_callable(array('A', 'A::A::a_spro')));
+var_dump(is_callable(array('A', 'A::A::a_spri')));
+var_dump(is_callable(array('A', 'A::A::a_pro')));
+var_dump(is_callable(array('A', 'A::A::a_pri')));
+var_dump(is_callable(array('A', 'C::a_spub')));
+var_dump(is_callable(array('A', 'C::a_spro')));
+var_dump(is_callable(array('A', 'C::a_spri')));
+var_dump(is_callable(array('A', 'C::a_pub')));
+var_dump(is_callable(array('A', 'C::a_pro')));
+var_dump(is_callable(array('A', 'C::a_pri')));
+var_dump(is_callable(array('A', 'A::C::a_spub')));
+var_dump(is_callable(array('A', 'A::C::a_spro')));
+var_dump(is_callable(array('A', 'A::C::a_spri')));
+var_dump(is_callable(array('A', 'A::C::a_pub')));
+var_dump(is_callable(array('A', 'A::C::a_pro')));
+var_dump(is_callable(array('A', 'A::C::a_pri')));
+var_dump(is_callable(array('A', 'b_spub')));
+var_dump(is_callable(array('A', 'b_spro')));
+var_dump(is_callable(array('A', 'b_spri')));
+var_dump(is_callable(array('A', 'b_pub')));
+var_dump(is_callable(array('A', 'b_pro')));
+var_dump(is_callable(array('A', 'b_pri')));
+var_dump(is_callable(array('A', 'B::a_spub')));
+var_dump(is_callable(array('A', 'B::a_spro')));
+var_dump(is_callable(array('A', 'B::a_spri')));
+var_dump(is_callable(array('A', 'B::a_pub')));
+var_dump(is_callable(array('A', 'B::a_pro')));
+var_dump(is_callable(array('A', 'B::a_pri')));
+var_dump(is_callable(array('A', 'B::B::a_spub')));
+var_dump(is_callable(array('A', 'B::B::a_spro')));
+var_dump(is_callable(array('A', 'B::B::a_spri')));
+var_dump(is_callable(array('A', 'B::B::a_pub')));
+var_dump(is_callable(array('A', 'B::B::a_pro')));
+var_dump(is_callable(array('A', 'B::B::a_pri')));
+var_dump(is_callable(array('B', 'a_spub')));
+var_dump(is_callable(array('B', 'a_spro')));
+var_dump(is_callable(array('B', 'a_spri')));
+var_dump(is_callable(array('B', 'a_pub')));
+var_dump(is_callable(array('B', 'a_pro')));
+var_dump(is_callable(array('B', 'a_pri')));
+var_dump(is_callable(array('B', 'A::a_spub')));
+var_dump(is_callable(array('B', 'A::a_spro')));
+var_dump(is_callable(array('B', 'A::a_spri')));
+var_dump(is_callable(array('B', 'A::a_pro')));
+var_dump(is_callable(array('B', 'A::a_pri')));
+var_dump(is_callable(array('B', 'A::A::a_spub')));
+var_dump(is_callable(array('B', 'A::A::a_spro')));
+var_dump(is_callable(array('B', 'A::A::a_spri')));
+var_dump(is_callable(array('B', 'A::A::a_pro')));
+var_dump(is_callable(array('B', 'A::A::a_pri')));
+var_dump(is_callable(array('B', 'C::a_spub')));
+var_dump(is_callable(array('B', 'C::a_spro')));
+var_dump(is_callable(array('B', 'C::a_spri')));
+var_dump(is_callable(array('B', 'C::a_pub')));
+var_dump(is_callable(array('B', 'C::a_pro')));
+var_dump(is_callable(array('B', 'C::a_pri')));
+var_dump(is_callable(array('B', 'B::C::a_spub')));
+var_dump(is_callable(array('B', 'B::C::a_spro')));
+var_dump(is_callable(array('B', 'B::C::a_spri')));
+var_dump(is_callable(array('B', 'B::C::a_pub')));
+var_dump(is_callable(array('B', 'B::C::a_pro')));
+var_dump(is_callable(array('B', 'B::C::a_pri')));
+var_dump(is_callable(array('B', 'b_spub')));
+var_dump(is_callable(array('B', 'b_spro')));
+var_dump(is_callable(array('B', 'b_spri')));
+var_dump(is_callable(array('B', 'b_pub')));
+var_dump(is_callable(array('B', 'b_pro')));
+var_dump(is_callable(array('B', 'b_pri')));
+var_dump(is_callable(array('B', 'B::a_spub')));
+var_dump(is_callable(array('B', 'B::a_spro')));
+var_dump(is_callable(array('B', 'B::a_spri')));
+var_dump(is_callable(array('B', 'B::a_pub')));
+var_dump(is_callable(array('B', 'B::a_pro')));
+var_dump(is_callable(array('B', 'B::a_pri')));
+var_dump(is_callable(array('B', 'B::A::a_spub')));
+var_dump(is_callable(array('B', 'B::A::a_spro')));
+var_dump(is_callable(array('B', 'B::A::a_spri')));
+var_dump(is_callable(array('B', 'B::A::a_pro')));
+var_dump(is_callable(array('B', 'B::A::a_pri')));
+var_dump(is_callable(array('B', 'B::B::a_spub')));
+var_dump(is_callable(array('B', 'B::B::a_spro')));
+var_dump(is_callable(array('B', 'B::B::a_spri')));
+var_dump(is_callable(array('B', 'B::B::a_pub')));
+var_dump(is_callable(array('B', 'B::B::a_pro')));
+var_dump(is_callable(array('B', 'B::B::a_pri')));
+var_dump(is_callable(array(new A(), 'a_spub')));
+var_dump(is_callable(array(new A(), 'a_spro')));
+var_dump(is_callable(array(new A(), 'a_spri')));
+var_dump(is_callable(array(new A(), 'a_pub')));
+var_dump(is_callable(array(new A(), 'a_pro')));
+var_dump(is_callable(array(new A(), 'a_pri')));
+var_dump(is_callable(array(new A(), 'A::a_spub')));
+var_dump(is_callable(array(new A(), 'A::a_spro')));
+var_dump(is_callable(array(new A(), 'A::a_spri')));
+var_dump(is_callable(array(new A(), 'A::a_pro')));
+var_dump(is_callable(array(new A(), 'A::a_pri')));
+var_dump(is_callable(array(new A(), 'A::A::a_spub')));
+var_dump(is_callable(array(new A(), 'A::A::a_spro')));
+var_dump(is_callable(array(new A(), 'A::A::a_spri')));
+var_dump(is_callable(array(new A(), 'A::A::a_pro')));
+var_dump(is_callable(array(new A(), 'A::A::a_pri')));
+var_dump(is_callable(array(new A(), 'C::a_spub')));
+var_dump(is_callable(array(new A(), 'C::a_spro')));
+var_dump(is_callable(array(new A(), 'C::a_spri')));
+var_dump(is_callable(array(new A(), 'C::a_pub')));
+var_dump(is_callable(array(new A(), 'C::a_pro')));
+var_dump(is_callable(array(new A(), 'C::a_pri')));
+var_dump(is_callable(array(new A(), 'A::C::a_spub')));
+var_dump(is_callable(array(new A(), 'A::C::a_spro')));
+var_dump(is_callable(array(new A(), 'A::C::a_spri')));
+var_dump(is_callable(array(new A(), 'A::C::a_pub')));
+var_dump(is_callable(array(new A(), 'A::C::a_pro')));
+var_dump(is_callable(array(new A(), 'A::C::a_pri')));
+var_dump(is_callable(array(new A(), 'b_spub')));
+var_dump(is_callable(array(new A(), 'b_spro')));
+var_dump(is_callable(array(new A(), 'b_spri')));
+var_dump(is_callable(array(new A(), 'b_pub')));
+var_dump(is_callable(array(new A(), 'b_pro')));
+var_dump(is_callable(array(new A(), 'b_pri')));
+var_dump(is_callable(array(new A(), 'B::a_spub')));
+var_dump(is_callable(array(new A(), 'B::a_spro')));
+var_dump(is_callable(array(new A(), 'B::a_spri')));
+var_dump(is_callable(array(new A(), 'B::a_pub')));
+var_dump(is_callable(array(new A(), 'B::a_pro')));
+var_dump(is_callable(array(new A(), 'B::a_pri')));
+var_dump(is_callable(array(new A(), 'B::A::a_spub')));
+var_dump(is_callable(array(new A(), 'B::A::a_spro')));
+var_dump(is_callable(array(new A(), 'B::A::a_spri')));
+var_dump(is_callable(array(new A(), 'B::A::a_pro')));
+var_dump(is_callable(array(new A(), 'B::A::a_pri')));
+var_dump(is_callable(array(new B(), 'b_spub')));
+var_dump(is_callable(array(new B(), 'b_spro')));
+var_dump(is_callable(array(new B(), 'b_spri')));
+var_dump(is_callable(array(new B(), 'b_pub')));
+var_dump(is_callable(array(new B(), 'b_pro')));
+var_dump(is_callable(array(new B(), 'b_pri')));
+var_dump(is_callable(array(new B(), 'B::b_spub')));
+var_dump(is_callable(array(new B(), 'B::b_spro')));
+var_dump(is_callable(array(new B(), 'B::b_spri')));
+var_dump(is_callable(array(new B(), 'B::b_pro')));
+var_dump(is_callable(array(new B(), 'B::b_pri')));
+var_dump(is_callable(array(new B(), 'B::B::b_spub')));
+var_dump(is_callable(array(new B(), 'B::B::b_spro')));
+var_dump(is_callable(array(new B(), 'B::B::b_spri')));
+var_dump(is_callable(array(new B(), 'B::B::b_pro')));
+var_dump(is_callable(array(new B(), 'B::B::b_pri')));
+var_dump(is_callable(array(new B(), 'C::b_spub')));
+var_dump(is_callable(array(new B(), 'C::b_spro')));
+var_dump(is_callable(array(new B(), 'C::b_spri')));
+var_dump(is_callable(array(new B(), 'C::b_pub')));
+var_dump(is_callable(array(new B(), 'C::b_pro')));
+var_dump(is_callable(array(new B(), 'C::b_pri')));
+var_dump(is_callable(array(new B(), 'B::C::b_spub')));
+var_dump(is_callable(array(new B(), 'B::C::b_spro')));
+var_dump(is_callable(array(new B(), 'B::C::b_spri')));
+var_dump(is_callable(array(new B(), 'B::C::b_pub')));
+var_dump(is_callable(array(new B(), 'B::C::b_pro')));
+var_dump(is_callable(array(new B(), 'B::C::b_pri')));
+var_dump(is_callable(array(new B(), 'a_spub')));
+var_dump(is_callable(array(new B(), 'a_spro')));
+var_dump(is_callable(array(new B(), 'a_spri')));
+var_dump(is_callable(array(new B(), 'a_pub')));
+var_dump(is_callable(array(new B(), 'a_pro')));
+var_dump(is_callable(array(new B(), 'a_pri')));
+var_dump(is_callable(array(new B(), 'A::B::b_spub')));
+var_dump(is_callable(array(new B(), 'A::B::b_spro')));
+var_dump(is_callable(array(new B(), 'A::B::b_spri')));
+var_dump(is_callable(array(new B(), 'A::B::b_pro')));
+var_dump(is_callable(array(new B(), 'A::B::b_pri')));
+}
+class EXT {
+  static public function ext_spub() {
+    test();
+var_dump(is_callable('A::a_spub'));
+var_dump(is_callable('A::a_spro'));
+var_dump(is_callable('A::a_spri'));
+var_dump(is_callable('A::a_pro'));
+var_dump(is_callable('A::a_pri'));
+var_dump(is_callable('a_spub'));
+var_dump(is_callable('a_spro'));
+var_dump(is_callable('a_spri'));
+var_dump(is_callable('a_pub'));
+var_dump(is_callable('a_pro'));
+var_dump(is_callable('a_pri'));
+var_dump(is_callable('B::b_spub'));
+var_dump(is_callable('B::b_spro'));
+var_dump(is_callable('B::b_spri'));
+var_dump(is_callable('B::b_pro'));
+var_dump(is_callable('B::b_pri'));
+var_dump(is_callable('b_spub'));
+var_dump(is_callable('b_spro'));
+var_dump(is_callable('b_spri'));
+var_dump(is_callable('b_pub'));
+var_dump(is_callable('b_pro'));
+var_dump(is_callable('b_pri'));
+var_dump(is_callable(array('A', 'a_spub')));
+var_dump(is_callable(array('A', 'a_spro')));
+var_dump(is_callable(array('A', 'a_spri')));
+var_dump(is_callable(array('A', 'a_pub')));
+var_dump(is_callable(array('A', 'a_pro')));
+var_dump(is_callable(array('A', 'a_pri')));
+var_dump(is_callable(array('A', 'A::a_spub')));
+var_dump(is_callable(array('A', 'A::a_spro')));
+var_dump(is_callable(array('A', 'A::a_spri')));
+var_dump(is_callable(array('A', 'A::a_pro')));
+var_dump(is_callable(array('A', 'A::a_pri')));
+var_dump(is_callable(array('A', 'A::A::a_spub')));
+var_dump(is_callable(array('A', 'A::A::a_spro')));
+var_dump(is_callable(array('A', 'A::A::a_spri')));
+var_dump(is_callable(array('A', 'A::A::a_pro')));
+var_dump(is_callable(array('A', 'A::A::a_pri')));
+var_dump(is_callable(array('A', 'C::a_spub')));
+var_dump(is_callable(array('A', 'C::a_spro')));
+var_dump(is_callable(array('A', 'C::a_spri')));
+var_dump(is_callable(array('A', 'C::a_pub')));
+var_dump(is_callable(array('A', 'C::a_pro')));
+var_dump(is_callable(array('A', 'C::a_pri')));
+var_dump(is_callable(array('A', 'A::C::a_spub')));
+var_dump(is_callable(array('A', 'A::C::a_spro')));
+var_dump(is_callable(array('A', 'A::C::a_spri')));
+var_dump(is_callable(array('A', 'A::C::a_pub')));
+var_dump(is_callable(array('A', 'A::C::a_pro')));
+var_dump(is_callable(array('A', 'A::C::a_pri')));
+var_dump(is_callable(array('A', 'b_spub')));
+var_dump(is_callable(array('A', 'b_spro')));
+var_dump(is_callable(array('A', 'b_spri')));
+var_dump(is_callable(array('A', 'b_pub')));
+var_dump(is_callable(array('A', 'b_pro')));
+var_dump(is_callable(array('A', 'b_pri')));
+var_dump(is_callable(array('A', 'B::a_spub')));
+var_dump(is_callable(array('A', 'B::a_spro')));
+var_dump(is_callable(array('A', 'B::a_spri')));
+var_dump(is_callable(array('A', 'B::a_pub')));
+var_dump(is_callable(array('A', 'B::a_pro')));
+var_dump(is_callable(array('A', 'B::a_pri')));
+var_dump(is_callable(array('A', 'B::B::a_spub')));
+var_dump(is_callable(array('A', 'B::B::a_spro')));
+var_dump(is_callable(array('A', 'B::B::a_spri')));
+var_dump(is_callable(array('A', 'B::B::a_pub')));
+var_dump(is_callable(array('A', 'B::B::a_pro')));
+var_dump(is_callable(array('A', 'B::B::a_pri')));
+var_dump(is_callable(array('B', 'a_spub')));
+var_dump(is_callable(array('B', 'a_spro')));
+var_dump(is_callable(array('B', 'a_spri')));
+var_dump(is_callable(array('B', 'a_pub')));
+var_dump(is_callable(array('B', 'a_pro')));
+var_dump(is_callable(array('B', 'a_pri')));
+var_dump(is_callable(array('B', 'A::a_spub')));
+var_dump(is_callable(array('B', 'A::a_spro')));
+var_dump(is_callable(array('B', 'A::a_spri')));
+var_dump(is_callable(array('B', 'A::a_pro')));
+var_dump(is_callable(array('B', 'A::a_pri')));
+var_dump(is_callable(array('B', 'A::A::a_spub')));
+var_dump(is_callable(array('B', 'A::A::a_spro')));
+var_dump(is_callable(array('B', 'A::A::a_spri')));
+var_dump(is_callable(array('B', 'A::A::a_pro')));
+var_dump(is_callable(array('B', 'A::A::a_pri')));
+var_dump(is_callable(array('B', 'C::a_spub')));
+var_dump(is_callable(array('B', 'C::a_spro')));
+var_dump(is_callable(array('B', 'C::a_spri')));
+var_dump(is_callable(array('B', 'C::a_pub')));
+var_dump(is_callable(array('B', 'C::a_pro')));
+var_dump(is_callable(array('B', 'C::a_pri')));
+var_dump(is_callable(array('B', 'B::C::a_spub')));
+var_dump(is_callable(array('B', 'B::C::a_spro')));
+var_dump(is_callable(array('B', 'B::C::a_spri')));
+var_dump(is_callable(array('B', 'B::C::a_pub')));
+var_dump(is_callable(array('B', 'B::C::a_pro')));
+var_dump(is_callable(array('B', 'B::C::a_pri')));
+var_dump(is_callable(array('B', 'b_spub')));
+var_dump(is_callable(array('B', 'b_spro')));
+var_dump(is_callable(array('B', 'b_spri')));
+var_dump(is_callable(array('B', 'b_pub')));
+var_dump(is_callable(array('B', 'b_pro')));
+var_dump(is_callable(array('B', 'b_pri')));
+var_dump(is_callable(array('B', 'B::a_spub')));
+var_dump(is_callable(array('B', 'B::a_spro')));
+var_dump(is_callable(array('B', 'B::a_spri')));
+var_dump(is_callable(array('B', 'B::a_pub')));
+var_dump(is_callable(array('B', 'B::a_pro')));
+var_dump(is_callable(array('B', 'B::a_pri')));
+var_dump(is_callable(array('B', 'B::A::a_spub')));
+var_dump(is_callable(array('B', 'B::A::a_spro')));
+var_dump(is_callable(array('B', 'B::A::a_spri')));
+var_dump(is_callable(array('B', 'B::A::a_pro')));
+var_dump(is_callable(array('B', 'B::A::a_pri')));
+var_dump(is_callable(array('B', 'B::B::a_spub')));
+var_dump(is_callable(array('B', 'B::B::a_spro')));
+var_dump(is_callable(array('B', 'B::B::a_spri')));
+var_dump(is_callable(array('B', 'B::B::a_pub')));
+var_dump(is_callable(array('B', 'B::B::a_pro')));
+var_dump(is_callable(array('B', 'B::B::a_pri')));
+var_dump(is_callable(array(new A(), 'a_spub')));
+var_dump(is_callable(array(new A(), 'a_spro')));
+var_dump(is_callable(array(new A(), 'a_spri')));
+var_dump(is_callable(array(new A(), 'a_pub')));
+var_dump(is_callable(array(new A(), 'a_pro')));
+var_dump(is_callable(array(new A(), 'a_pri')));
+var_dump(is_callable(array(new A(), 'A::a_spub')));
+var_dump(is_callable(array(new A(), 'A::a_spro')));
+var_dump(is_callable(array(new A(), 'A::a_spri')));
+var_dump(is_callable(array(new A(), 'A::a_pro')));
+var_dump(is_callable(array(new A(), 'A::a_pri')));
+var_dump(is_callable(array(new A(), 'A::A::a_spub')));
+var_dump(is_callable(array(new A(), 'A::A::a_spro')));
+var_dump(is_callable(array(new A(), 'A::A::a_spri')));
+var_dump(is_callable(array(new A(), 'A::A::a_pro')));
+var_dump(is_callable(array(new A(), 'A::A::a_pri')));
+var_dump(is_callable(array(new A(), 'C::a_spub')));
+var_dump(is_callable(array(new A(), 'C::a_spro')));
+var_dump(is_callable(array(new A(), 'C::a_spri')));
+var_dump(is_callable(array(new A(), 'C::a_pub')));
+var_dump(is_callable(array(new A(), 'C::a_pro')));
+var_dump(is_callable(array(new A(), 'C::a_pri')));
+var_dump(is_callable(array(new A(), 'A::C::a_spub')));
+var_dump(is_callable(array(new A(), 'A::C::a_spro')));
+var_dump(is_callable(array(new A(), 'A::C::a_spri')));
+var_dump(is_callable(array(new A(), 'A::C::a_pub')));
+var_dump(is_callable(array(new A(), 'A::C::a_pro')));
+var_dump(is_callable(array(new A(), 'A::C::a_pri')));
+var_dump(is_callable(array(new A(), 'b_spub')));
+var_dump(is_callable(array(new A(), 'b_spro')));
+var_dump(is_callable(array(new A(), 'b_spri')));
+var_dump(is_callable(array(new A(), 'b_pub')));
+var_dump(is_callable(array(new A(), 'b_pro')));
+var_dump(is_callable(array(new A(), 'b_pri')));
+var_dump(is_callable(array(new A(), 'B::a_spub')));
+var_dump(is_callable(array(new A(), 'B::a_spro')));
+var_dump(is_callable(array(new A(), 'B::a_spri')));
+var_dump(is_callable(array(new A(), 'B::a_pub')));
+var_dump(is_callable(array(new A(), 'B::a_pro')));
+var_dump(is_callable(array(new A(), 'B::a_pri')));
+var_dump(is_callable(array(new A(), 'B::A::a_spub')));
+var_dump(is_callable(array(new A(), 'B::A::a_spro')));
+var_dump(is_callable(array(new A(), 'B::A::a_spri')));
+var_dump(is_callable(array(new A(), 'B::A::a_pro')));
+var_dump(is_callable(array(new A(), 'B::A::a_pri')));
+var_dump(is_callable(array(new B(), 'b_spub')));
+var_dump(is_callable(array(new B(), 'b_spro')));
+var_dump(is_callable(array(new B(), 'b_spri')));
+var_dump(is_callable(array(new B(), 'b_pub')));
+var_dump(is_callable(array(new B(), 'b_pro')));
+var_dump(is_callable(array(new B(), 'b_pri')));
+var_dump(is_callable(array(new B(), 'B::b_spub')));
+var_dump(is_callable(array(new B(), 'B::b_spro')));
+var_dump(is_callable(array(new B(), 'B::b_spri')));
+var_dump(is_callable(array(new B(), 'B::b_pro')));
+var_dump(is_callable(array(new B(), 'B::b_pri')));
+var_dump(is_callable(array(new B(), 'B::B::b_spub')));
+var_dump(is_callable(array(new B(), 'B::B::b_spro')));
+var_dump(is_callable(array(new B(), 'B::B::b_spri')));
+var_dump(is_callable(array(new B(), 'B::B::b_pro')));
+var_dump(is_callable(array(new B(), 'B::B::b_pri')));
+var_dump(is_callable(array(new B(), 'C::b_spub')));
+var_dump(is_callable(array(new B(), 'C::b_spro')));
+var_dump(is_callable(array(new B(), 'C::b_spri')));
+var_dump(is_callable(array(new B(), 'C::b_pub')));
+var_dump(is_callable(array(new B(), 'C::b_pro')));
+var_dump(is_callable(array(new B(), 'C::b_pri')));
+var_dump(is_callable(array(new B(), 'B::C::b_spub')));
+var_dump(is_callable(array(new B(), 'B::C::b_spro')));
+var_dump(is_callable(array(new B(), 'B::C::b_spri')));
+var_dump(is_callable(array(new B(), 'B::C::b_pub')));
+var_dump(is_callable(array(new B(), 'B::C::b_pro')));
+var_dump(is_callable(array(new B(), 'B::C::b_pri')));
+var_dump(is_callable(array(new B(), 'a_spub')));
+var_dump(is_callable(array(new B(), 'a_spro')));
+var_dump(is_callable(array(new B(), 'a_spri')));
+var_dump(is_callable(array(new B(), 'a_pub')));
+var_dump(is_callable(array(new B(), 'a_pro')));
+var_dump(is_callable(array(new B(), 'a_pri')));
+var_dump(is_callable(array(new B(), 'A::B::b_spub')));
+var_dump(is_callable(array(new B(), 'A::B::b_spro')));
+var_dump(is_callable(array(new B(), 'A::B::b_spri')));
+var_dump(is_callable(array(new B(), 'A::B::b_pro')));
+var_dump(is_callable(array(new B(), 'A::B::b_pri')));
+  }
+}
+class A {
+  static public function a_spub() {
+    test();
+  }
+  static protected function a_spro() {
+    test();
+  }
+  static private function a_spri() {
+    test();
+  }
+  public function a_pub() {
+    test();
+  }
+  protected function a_pro() {
+    test();
+  }
+  private function a_pri() {
+    test();
+  }
+  public static function a_sf() {
+    test();
+    self::a_spub();
+    self::a_spro();
+    self::a_spri();
+    self::a_pub();
+    self::a_pro();
+    self::a_pri();
+  }
+  public function a_f() {
+    test();
+    self::a_spub();
+    self::a_spro();
+    self::a_spri();
+    self::a_pub();
+    self::a_pro();
+    self::a_pri();
+  }
+}
+;
+class B extends A {
+  static public function b_spub() {
+    test();
+  }
+  static protected function b_spro() {
+    test();
+  }
+  static private function b_spri() {
+    test();
+  }
+  public function b_pub() {
+    test();
+  }
+  protected function b_pro() {
+    test();
+  }
+  private function b_pri() {
+    test();
+  }
+  public static function b_sf() {
+    test();
+    self::b_spub();
+    self::b_spro();
+    self::b_spri();
+    self::b_pub();
+    self::b_pro();
+    self::b_pri();
+  }
+  public function b_f() {
+    test();
+    self::b_spub();
+    self::b_spro();
+    self::b_spri();
+    self::b_pub();
+    self::b_pro();
+    self::b_pri();
+  }
+}
+EXT::ext_spub();
+test();
+var_dump(is_callable('A::a_spub'));
+var_dump(is_callable('A::a_spro'));
+var_dump(is_callable('A::a_spri'));
+var_dump(is_callable('A::a_pro'));
+var_dump(is_callable('A::a_pri'));
+var_dump(is_callable('a_spub'));
+var_dump(is_callable('a_spro'));
+var_dump(is_callable('a_spri'));
+var_dump(is_callable('a_pub'));
+var_dump(is_callable('a_pro'));
+var_dump(is_callable('a_pri'));
+var_dump(is_callable('B::b_spub'));
+var_dump(is_callable('B::b_spro'));
+var_dump(is_callable('B::b_spri'));
+var_dump(is_callable('B::b_pro'));
+var_dump(is_callable('B::b_pri'));
+var_dump(is_callable('b_spub'));
+var_dump(is_callable('b_spro'));
+var_dump(is_callable('b_spri'));
+var_dump(is_callable('b_pub'));
+var_dump(is_callable('b_pro'));
+var_dump(is_callable('b_pri'));
+var_dump(is_callable(array('A', 'a_spub')));
+var_dump(is_callable(array('A', 'a_spro')));
+var_dump(is_callable(array('A', 'a_spri')));
+var_dump(is_callable(array('A', 'a_pub')));
+var_dump(is_callable(array('A', 'a_pro')));
+var_dump(is_callable(array('A', 'a_pri')));
+var_dump(is_callable(array('A', 'A::a_spub')));
+var_dump(is_callable(array('A', 'A::a_spro')));
+var_dump(is_callable(array('A', 'A::a_spri')));
+var_dump(is_callable(array('A', 'A::a_pro')));
+var_dump(is_callable(array('A', 'A::a_pri')));
+var_dump(is_callable(array('A', 'A::A::a_spub')));
+var_dump(is_callable(array('A', 'A::A::a_spro')));
+var_dump(is_callable(array('A', 'A::A::a_spri')));
+var_dump(is_callable(array('A', 'A::A::a_pro')));
+var_dump(is_callable(array('A', 'A::A::a_pri')));
+var_dump(is_callable(array('A', 'C::a_spub')));
+var_dump(is_callable(array('A', 'C::a_spro')));
+var_dump(is_callable(array('A', 'C::a_spri')));
+var_dump(is_callable(array('A', 'C::a_pub')));
+var_dump(is_callable(array('A', 'C::a_pro')));
+var_dump(is_callable(array('A', 'C::a_pri')));
+var_dump(is_callable(array('A', 'A::C::a_spub')));
+var_dump(is_callable(array('A', 'A::C::a_spro')));
+var_dump(is_callable(array('A', 'A::C::a_spri')));
+var_dump(is_callable(array('A', 'A::C::a_pub')));
+var_dump(is_callable(array('A', 'A::C::a_pro')));
+var_dump(is_callable(array('A', 'A::C::a_pri')));
+var_dump(is_callable(array('A', 'b_spub')));
+var_dump(is_callable(array('A', 'b_spro')));
+var_dump(is_callable(array('A', 'b_spri')));
+var_dump(is_callable(array('A', 'b_pub')));
+var_dump(is_callable(array('A', 'b_pro')));
+var_dump(is_callable(array('A', 'b_pri')));
+var_dump(is_callable(array('A', 'B::a_spub')));
+var_dump(is_callable(array('A', 'B::a_spro')));
+var_dump(is_callable(array('A', 'B::a_spri')));
+var_dump(is_callable(array('A', 'B::a_pub')));
+var_dump(is_callable(array('A', 'B::a_pro')));
+var_dump(is_callable(array('A', 'B::a_pri')));
+var_dump(is_callable(array('A', 'B::B::a_spub')));
+var_dump(is_callable(array('A', 'B::B::a_spro')));
+var_dump(is_callable(array('A', 'B::B::a_spri')));
+var_dump(is_callable(array('A', 'B::B::a_pub')));
+var_dump(is_callable(array('A', 'B::B::a_pro')));
+var_dump(is_callable(array('A', 'B::B::a_pri')));
+var_dump(is_callable(array('B', 'a_spub')));
+var_dump(is_callable(array('B', 'a_spro')));
+var_dump(is_callable(array('B', 'a_spri')));
+var_dump(is_callable(array('B', 'a_pub')));
+var_dump(is_callable(array('B', 'a_pro')));
+var_dump(is_callable(array('B', 'a_pri')));
+var_dump(is_callable(array('B', 'A::a_spub')));
+var_dump(is_callable(array('B', 'A::a_spro')));
+var_dump(is_callable(array('B', 'A::a_spri')));
+var_dump(is_callable(array('B', 'A::a_pro')));
+var_dump(is_callable(array('B', 'A::a_pri')));
+var_dump(is_callable(array('B', 'A::A::a_spub')));
+var_dump(is_callable(array('B', 'A::A::a_spro')));
+var_dump(is_callable(array('B', 'A::A::a_spri')));
+var_dump(is_callable(array('B', 'A::A::a_pro')));
+var_dump(is_callable(array('B', 'A::A::a_pri')));
+var_dump(is_callable(array('B', 'C::a_spub')));
+var_dump(is_callable(array('B', 'C::a_spro')));
+var_dump(is_callable(array('B', 'C::a_spri')));
+var_dump(is_callable(array('B', 'C::a_pub')));
+var_dump(is_callable(array('B', 'C::a_pro')));
+var_dump(is_callable(array('B', 'C::a_pri')));
+var_dump(is_callable(array('B', 'B::C::a_spub')));
+var_dump(is_callable(array('B', 'B::C::a_spro')));
+var_dump(is_callable(array('B', 'B::C::a_spri')));
+var_dump(is_callable(array('B', 'B::C::a_pub')));
+var_dump(is_callable(array('B', 'B::C::a_pro')));
+var_dump(is_callable(array('B', 'B::C::a_pri')));
+var_dump(is_callable(array('B', 'b_spub')));
+var_dump(is_callable(array('B', 'b_spro')));
+var_dump(is_callable(array('B', 'b_spri')));
+var_dump(is_callable(array('B', 'b_pub')));
+var_dump(is_callable(array('B', 'b_pro')));
+var_dump(is_callable(array('B', 'b_pri')));
+var_dump(is_callable(array('B', 'B::a_spub')));
+var_dump(is_callable(array('B', 'B::a_spro')));
+var_dump(is_callable(array('B', 'B::a_spri')));
+var_dump(is_callable(array('B', 'B::a_pub')));
+var_dump(is_callable(array('B', 'B::a_pro')));
+var_dump(is_callable(array('B', 'B::a_pri')));
+var_dump(is_callable(array('B', 'B::A::a_spub')));
+var_dump(is_callable(array('B', 'B::A::a_spro')));
+var_dump(is_callable(array('B', 'B::A::a_spri')));
+var_dump(is_callable(array('B', 'B::A::a_pro')));
+var_dump(is_callable(array('B', 'B::A::a_pri')));
+var_dump(is_callable(array('B', 'B::B::a_spub')));
+var_dump(is_callable(array('B', 'B::B::a_spro')));
+var_dump(is_callable(array('B', 'B::B::a_spri')));
+var_dump(is_callable(array('B', 'B::B::a_pub')));
+var_dump(is_callable(array('B', 'B::B::a_pro')));
+var_dump(is_callable(array('B', 'B::B::a_pri')));
+var_dump(is_callable(array(new A(), 'a_spub')));
+var_dump(is_callable(array(new A(), 'a_spro')));
+var_dump(is_callable(array(new A(), 'a_spri')));
+var_dump(is_callable(array(new A(), 'a_pub')));
+var_dump(is_callable(array(new A(), 'a_pro')));
+var_dump(is_callable(array(new A(), 'a_pri')));
+var_dump(is_callable(array(new A(), 'A::a_spub')));
+var_dump(is_callable(array(new A(), 'A::a_spro')));
+var_dump(is_callable(array(new A(), 'A::a_spri')));
+var_dump(is_callable(array(new A(), 'A::a_pro')));
+var_dump(is_callable(array(new A(), 'A::a_pri')));
+var_dump(is_callable(array(new A(), 'A::A::a_spub')));
+var_dump(is_callable(array(new A(), 'A::A::a_spro')));
+var_dump(is_callable(array(new A(), 'A::A::a_spri')));
+var_dump(is_callable(array(new A(), 'A::A::a_pro')));
+var_dump(is_callable(array(new A(), 'A::A::a_pri')));
+var_dump(is_callable(array(new A(), 'C::a_spub')));
+var_dump(is_callable(array(new A(), 'C::a_spro')));
+var_dump(is_callable(array(new A(), 'C::a_spri')));
+var_dump(is_callable(array(new A(), 'C::a_pub')));
+var_dump(is_callable(array(new A(), 'C::a_pro')));
+var_dump(is_callable(array(new A(), 'C::a_pri')));
+var_dump(is_callable(array(new A(), 'A::C::a_spub')));
+var_dump(is_callable(array(new A(), 'A::C::a_spro')));
+var_dump(is_callable(array(new A(), 'A::C::a_spri')));
+var_dump(is_callable(array(new A(), 'A::C::a_pub')));
+var_dump(is_callable(array(new A(), 'A::C::a_pro')));
+var_dump(is_callable(array(new A(), 'A::C::a_pri')));
+var_dump(is_callable(array(new A(), 'b_spub')));
+var_dump(is_callable(array(new A(), 'b_spro')));
+var_dump(is_callable(array(new A(), 'b_spri')));
+var_dump(is_callable(array(new A(), 'b_pub')));
+var_dump(is_callable(array(new A(), 'b_pro')));
+var_dump(is_callable(array(new A(), 'b_pri')));
+var_dump(is_callable(array(new A(), 'B::a_spub')));
+var_dump(is_callable(array(new A(), 'B::a_spro')));
+var_dump(is_callable(array(new A(), 'B::a_spri')));
+var_dump(is_callable(array(new A(), 'B::a_pub')));
+var_dump(is_callable(array(new A(), 'B::a_pro')));
+var_dump(is_callable(array(new A(), 'B::a_pri')));
+var_dump(is_callable(array(new A(), 'B::A::a_spub')));
+var_dump(is_callable(array(new A(), 'B::A::a_spro')));
+var_dump(is_callable(array(new A(), 'B::A::a_spri')));
+var_dump(is_callable(array(new A(), 'B::A::a_pro')));
+var_dump(is_callable(array(new A(), 'B::A::a_pri')));
+var_dump(is_callable(array(new B(), 'b_spub')));
+var_dump(is_callable(array(new B(), 'b_spro')));
+var_dump(is_callable(array(new B(), 'b_spri')));
+var_dump(is_callable(array(new B(), 'b_pub')));
+var_dump(is_callable(array(new B(), 'b_pro')));
+var_dump(is_callable(array(new B(), 'b_pri')));
+var_dump(is_callable(array(new B(), 'B::b_spub')));
+var_dump(is_callable(array(new B(), 'B::b_spro')));
+var_dump(is_callable(array(new B(), 'B::b_spri')));
+var_dump(is_callable(array(new B(), 'B::b_pro')));
+var_dump(is_callable(array(new B(), 'B::b_pri')));
+var_dump(is_callable(array(new B(), 'B::B::b_spub')));
+var_dump(is_callable(array(new B(), 'B::B::b_spro')));
+var_dump(is_callable(array(new B(), 'B::B::b_spri')));
+var_dump(is_callable(array(new B(), 'B::B::b_pro')));
+var_dump(is_callable(array(new B(), 'B::B::b_pri')));
+var_dump(is_callable(array(new B(), 'C::b_spub')));
+var_dump(is_callable(array(new B(), 'C::b_spro')));
+var_dump(is_callable(array(new B(), 'C::b_spri')));
+var_dump(is_callable(array(new B(), 'C::b_pub')));
+var_dump(is_callable(array(new B(), 'C::b_pro')));
+var_dump(is_callable(array(new B(), 'C::b_pri')));
+var_dump(is_callable(array(new B(), 'B::C::b_spub')));
+var_dump(is_callable(array(new B(), 'B::C::b_spro')));
+var_dump(is_callable(array(new B(), 'B::C::b_spri')));
+var_dump(is_callable(array(new B(), 'B::C::b_pub')));
+var_dump(is_callable(array(new B(), 'B::C::b_pro')));
+var_dump(is_callable(array(new B(), 'B::C::b_pri')));
+var_dump(is_callable(array(new B(), 'a_spub')));
+var_dump(is_callable(array(new B(), 'a_spro')));
+var_dump(is_callable(array(new B(), 'a_spri')));
+var_dump(is_callable(array(new B(), 'a_pub')));
+var_dump(is_callable(array(new B(), 'a_pro')));
+var_dump(is_callable(array(new B(), 'a_pri')));
+var_dump(is_callable(array(new B(), 'A::B::b_spub')));
+var_dump(is_callable(array(new B(), 'A::B::b_spro')));
+var_dump(is_callable(array(new B(), 'A::B::b_spri')));
+var_dump(is_callable(array(new B(), 'A::B::b_pro')));
+var_dump(is_callable(array(new B(), 'A::B::b_pri')));
+var_dump(is_callable('A::b_spub'));
+var_dump(is_callable('A::b_spro'));
+var_dump(is_callable('A::b_spri'));
+var_dump(is_callable('A::b_pub'));
+var_dump(is_callable('A::b_pro'));
+var_dump(is_callable('A::b_pri'));
+B::a_sf();
+B::b_sf();
+$obj = new B;
+$obj->a_sf();
+$obj->b_sf();
+$obj->a_f();
+$obj->b_f();
diff --git a/hphp/test/slow/object_method/735.php b/hphp/test/slow/object_method/735.php
index bb4bc966d..fe6ac6849 100644
--- a/hphp/test/slow/object_method/735.php
+++ b/hphp/test/slow/object_method/735.php
@@ -1,3 +1,21 @@
 <?php
 
- function foo() { echo 'Caught'; exit; }set_error_handler('foo', E_ALL);class X { function foo() { var_dump($this); } }class Y {  function bar(X $a) { $a->foo(); }}function test($y,$z) {  $y->$z($y);}test(new Y, 'bar');
\ No newline at end of file
+function foo() {
+ echo 'Caught';
+ exit;
+ }
+set_error_handler('foo', E_ALL);
+class X {
+ function foo() {
+ var_dump($this);
+ }
+ }
+class Y {
+  function bar(X $a) {
+ $a->foo();
+ }
+}
+function test($y,$z) {
+  $y->$z($y);
+}
+test(new Y, 'bar');
diff --git a/hphp/test/slow/object_method/736.php b/hphp/test/slow/object_method/736.php
index 7c58115a8..f236a22b8 100644
--- a/hphp/test/slow/object_method/736.php
+++ b/hphp/test/slow/object_method/736.php
@@ -1,16 +1,20 @@
 <?php
 
-
 /*
    some random tests used for debugging fast method call and various  invoke paths
    // php53 means this feature cannot be tested under php 5.2
 */
 
-$fix249639=0; // when this task is fixed or o_id on static calls
+$fix249639=0;
+ // when this task is fixed or o_id on static calls
 
 global $trace;
-function f2 ($a) { return $a+200; }
-function f4 ($a) { return $a+400; }
+function f2 ($a) {
+  return $a+200;
+}
+function f4 ($a) {
+  return $a+400;
+}
 class B {
   public $id;
   public $x;
@@ -19,62 +23,112 @@ class B {
     echo "Calling B object method '$name' " . implode(', ', $arguments). "\n";
   }
 
-  function f1($a) { return $x=$a+11; }
-  function f2($a) { return $x=$a+12; }
-  function f4($a) { return $x=$a+12; }
-  function trace($s) { global $trace; $trace = "<$s(".$this->id.")>"; }
-  private function f4helper($a) { return $x=$a+12; }
+  function f1($a) {
+    return $x=$a+11;
+  }
+  function f2($a) {
+    return $x=$a+12;
+  }
+  function f4($a) {
+    return $x=$a+12;
+  }
+  function trace($s) {
+    global $trace;
+    $trace = "<$s(".$this->id.")>";
+  }
+  private function f4helper($a) {
+    return $x=$a+12;
+  }
 }
-class G  extends B {
+
+class G extends B {
   public $pointless;
   function __call($name, $arguments) {
     // keep f4bogus from fatalling
     echo "Calling G object method '$name' " . implode(', ', $arguments). "\n";
   }
-  function __construct($i) { $this->id=$i; }
-  function f($a) { $this->trace("G::f"); return $a; }
-  function f1($a) { return $a; } // override
-  function flongerthan8($a,$b,$c) { return $a+$b+$c+1; }
-  function f4($a) { return B::f4($a); } 
+  function __construct($i) {
+    $this->id=$i;
+  }
+  function f($a) {
+    $this->trace("G::f");
+    return $a;
+  }
+  function f1($a) {
+    return $a;
+  }
+  // override
+  function flongerthan8($a,$b,$c) {
+    return $a+$b+$c+1;
+  }
+  function f4($a) {
+    return B::f4($a);
+  }
+
   // check SimpleFunctionCall::outputCPPParamOrderControlled
   /// !m_valid, !m_className.empty() case
   // called method must not exist anywhere even though it
   // looks like it might
-  function f4missing($a) { 
+  function f4missing($a) {
+
     // check SimpleFunctionCall::outputCPPParamOrderControlled
     // !m_valid, !m_className.empty() cases
 
-    // m_validClass 
-    echo "Calling G object 'f4missing' 3 == "; 
-    //php53 echo parent::f4missing(3),"\n";  // fatals in PHP
+    // m_validClass
+    echo "Calling G object 'f4missing' 3 == ";
+
+    //php53 echo parent::f4missing(3),"\n";
+    // fatals in PHP
 
     // !m_validClass, m_class
-    $b="B"; // $b::f4(4);   // task 217171
-    echo "static parent method B::f4, 16 == ", B::f4(4),"\n";   // should work
-  
-    // call an non-existant method on the one object via dynamic class name
-    //php53 if($fix249639) echo "Calling G object method 'f4bogus' 5 == ", $b::f4bogus(5); __call, 
-    // call existing method on the one object via dynamic class name
-    //php53 if($fix249639) echo "Calling G object method 'f4missing' 5 == ", $b::f4missing(5); 
-    // $b="Bbogus"; $b::f4bogus(6); // report error
-    // !m_validClass, !m_class // DDD need this test yet 
-    //echo "missing 3 ", Bbogus::f4bogus(6),"\n"; // fatals in PHP
+    $b="B";
+    // $b::f4(4);
+    // task 217171
+    echo "static parent method B::f4, 16 == ", B::f4(4),"\n";
+    // should work
 
-  } 
-  function f5($a) { return H::f4($a); } // static call
+    // call an non-existant method on the one object via dynamic class name
+    //php53 if($fix249639) echo "Calling G object method 'f4bogus' 5 == ", $b::f4bogus(5); __call,
+    // call existing method on the one object via dynamic class name
+    //php53 if($fix249639) echo "Calling G object method 'f4missing' 5 == ", $b::f4missing(5);
+
+    // $b="Bbogus"; $b::f4bogus(6);
+    // report error
+    // !m_validClass, !m_class // DDD need this test yet
+    //echo "missing 3 ", Bbogus::f4bogus(6),"\n";
+    // fatals in PHP
+
+  }
+
+  function f5($a) {
+    return H::f4($a);
+  }
+  // static call
 }
 class H {
-  function f($a) { global $trace; $trace="H::f,"; return ""; }
-  function f3($a) { return ""; }
-  function f4($a) { return $a+12; }
-  function f7($a) { return ""; }
+  function f($a) {
+    global $trace;
+    $trace="H::f,";
+    return "";
+  }
+  function f3($a) {
+    return "";
+  }
+  function f4($a) {
+    return $a+12;
+  }
+  function f7($a) {
+    return "";
+  }
 }
 
 class J {
   function __call($name, $arguments) {
     echo "Calling object method '$name' " . implode(', ', $arguments). "\n";
   }
-  function f6($a) { return ""; }
+  function f6($a) {
+    return "";
+  }
 }
 
 function error_handler ($errnor, $errstr, $errfile, $errline) {
@@ -87,69 +141,82 @@ function error_handler ($errnor, $errstr, $errfile, $errline) {
   return true;
 }
 // test invoke_builtin_static_method
-//echo "bar == ", 
- //    call_user_func_array(array('Normalizer','normalize'),array("bar")), "\n";
+//echo "bar == ",
+//    call_user_func_array(array('Normalizer','normalize'),array("bar")), "\n";
 
 $g = new G(5);
 // test simple function case
 echo "600 == ",
-  call_user_func_array('f2',array(call_user_func_array('f4',array(0)))), "\n";
+     call_user_func_array('f2',array(call_user_func_array('f4',array(0)))), "\n";
 
 // test C::o_invoke, C::o_invoke_few_args, lookup in call_user_func
 // static method call (in G::f4).
-echo "1 1 13 34 12 == ",$g->f(1)," ", $g->f1(1),"  ", 
-    $g->f2(1)," ",$g->flongerthan8(10,11,12,13,14,15,16),
-    " ",$g->f4(0),"\n";
+echo "1 1 13 34 12 == ",$g->f(1)," ", $g->f1(1),"  ",
+     $g->f2(1)," ",$g->flongerthan8(10,11,12,13,14,15,16),
+     " ",$g->f4(0),"\n";
 // check case insensitive
-echo "1 1 13 34 12 == ",$g->F(1)," ", $g->F1(1),"  ", 
-    $g->F2(1)," ",$g->Flongerthan8(10,11,12,13,14,15,16),
-    " ",$g->F4(0),"\n";
+echo "1 1 13 34 12 == ",$g->F(1)," ", $g->F1(1),"  ",
+     $g->F2(1)," ",$g->Flongerthan8(10,11,12,13,14,15,16),
+     " ",$g->F4(0),"\n";
 
 // check SimpleFunctionCall::outputCPPParamOrderControlled
 $prev_handler=set_error_handler("error_handler");
 $g->f4missing(3);
-// $b="G"; $b::f4(4); 
+// $b="G"; $b::f4(4);
+
 
 // For those dynamic cases, check:
 // 1) A call to an existing method
 // 2) A call to a method which exists, but not in this class (exists in methodMap)
 // 3) A call to a method which does not exist anywhere
 
-// $func="f3"; echo "{G::f3}(3) = ",$g->$func(3),"\n";
-// $func="missing"; echo "{G::missing}(3) = ",$g->$func(3),"\n";
-// tests direct dynamic call 
-$f='f'; $f1='f1';
-echo "1 1 == ",$g->{$f}(1)," ", $g->{$f1}(1),"\n"; 
-echo "1 1 == ",$g->{'F'}(1)," ", $g->{$f1}(1),"\n"; 
+// $func="f3"; echo "{G::f3} (3) = ",$g->$func(3),"\n";
+// $func="missing"; echo "{G::missing} (3) = ",$g->$func(3),"\n";
+// tests direct dynamic call
+$f='f';
+$f1='f1';
+echo "1 1 == ",$g->{$f} (1)," ", $g->{$f1} (1),"\n";
+echo "1 1 == ",$g->{'F'} (1)," ", $g->{$f1} (1),"\n";
 
-$res = call_user_func_array("H::f",array(2)); // ok
+$res = call_user_func_array("H::f",array(2));
+ // ok
 
 // tests methodIndexLookup and this variety of dynamic calls
 // trying to exhause f_call_user_func_array cases
-$res = call_user_func_array(array($g,'f'),array(20)); // ok
-echo "dynamic call \$g->'f' $trace, 20 == $res\n"; 
-$res= call_user_func_array(array($g,'G::f'),array(21)); // G::G::f a bit wierd
+$res = call_user_func_array(array($g,'f'),array(20));
+ // ok
+echo "dynamic call \$g->'f' $trace, 20 == $res\n";
+
+$res= call_user_func_array(array($g,'G::f'),array(21));
+ // G::G::f a bit weird
 echo "dynamic call \$g->'G::f' $trace, 21 == $res\n";
 //echo "dynamic call \$g->'H::f' $trace, FAIL = ",
-//      call_user_func_array(array($g,'H::f'),array(22)),"\n"; // G::H::f better break
+//      call_user_func_array(array($g,'H::f'),array(22)),"\n";
+ // G::H::f better break
 
 // Test on static class, dynamic method name, static call
 $f = 'f1';
-echo "31 == ",G::$f(31),"\n"; // G::f exists
+echo "31 == ",G::$f(31),"\n";
+ // G::f exists
 $f = 'f3';
-if ($fix249639) echo "<method not found>(32) == ",G::$f(32),"\n"; // H::f3 exists, but not G::f3
+if ($fix249639) echo "<method not found>(32) == ",G::$f(32),"\n";
+ // H::f3 exists, but not G::f3
 $f = 'missing';
-if ($fix249639) echo "<method not found>(33) == ",G::$f(33),"\n"; // missing does not exist 
+if ($fix249639) echo "<method not found>(33) == ",G::$f(33),"\n";
+ // missing does not exist
 
 // Test dynamic class, dynamic method name, static call
 $cls='G';
 $f = 'f1';
 
-//php53 echo "31 == ",$cls::$f(31),"\n"; // G::f1 exists
+//php53 echo "31 == ",$cls::$f(31),"\n";
+ // G::f1 exists
 $f = 'f3';
-//php53 if ($fix249639) echo "<method not found>(32) == ",$cls::$f(32),"\n"; // H::f3 exists, but not G::f3
+//php53 if ($fix249639) echo "<method not found>(32) == ",$cls::$f(32),"\n";
+ // H::f3 exists, but not G::f3
 $f = 'missing';
-//php53 if ($fix249639) echo "<method not found>(33) == ",$cls::$f(33),"\n"; // missing does not exist 
+//php53 if ($fix249639) echo "<method not found>(33) == ",$cls::$f(33),"\n";
+ // missing does not exist
 
 
 // test methodIndexLookupReverse
@@ -159,7 +226,8 @@ echo "dynamic call 'missing(2)' $trace, FAIL =", call_user_func_array('missing',
 // more __call testing
 $j = new J();
 echo "Calling object method 'missing' 3 = ";
-call_user_func_array(array($j,'missing'),array(3)); 
+call_user_func_array(array($j,'missing'),array(3));
+
 
 // test mapping for system function names
 $ourFileName = "testFile.txt";
@@ -167,4 +235,4 @@ $ourFileHandle = fopen($ourFileName, 'w') or die("can't open file");
 fclose($ourFileHandle);
 unlink($ourFileName);
 
-echo "done\n";
\ No newline at end of file
+echo "done\n";
diff --git a/hphp/test/slow/object_method/737.php b/hphp/test/slow/object_method/737.php
index f270cbcfd..e74ca105a 100644
--- a/hphp/test/slow/object_method/737.php
+++ b/hphp/test/slow/object_method/737.php
@@ -1,3 +1,17 @@
 <?php
 
- class B {  public function foo() {    $this->bar();  }  private function bar() {    var_dump('in B::bar...');  }}class C extends B {  private function bar() {    var_dump('in C::bar!');  }}$obj = new C;$obj->foo();
\ No newline at end of file
+class B {
+  public function foo() {
+    $this->bar();
+  }
+  private function bar() {
+    var_dump('in B::bar...');
+  }
+}
+class C extends B {
+  private function bar() {
+    var_dump('in C::bar!');
+  }
+}
+$obj = new C;
+$obj->foo();
diff --git a/hphp/test/slow/object_property/673.php b/hphp/test/slow/object_property/673.php
index 44a1ab2ea..893b281cd 100644
--- a/hphp/test/slow/object_property/673.php
+++ b/hphp/test/slow/object_property/673.php
@@ -1,3 +1,14 @@
 <?php
 
- class A { static protected $foo = 11;   function foo() { var_dump(A::$foo);}} class B extends A { static public $foo;} var_dump(B::$foo); B::$foo = 123; A::foo();
\ No newline at end of file
+class A {
+ static protected $foo = 11;
+   function foo() {
+ var_dump(A::$foo);
+}
+}
+ class B extends A {
+ static public $foo;
+}
+ var_dump(B::$foo);
+ B::$foo = 123;
+ A::foo();
diff --git a/hphp/test/slow/object_property/674.php b/hphp/test/slow/object_property/674.php
index 0f3c8ac5a..fd54e84d1 100644
--- a/hphp/test/slow/object_property/674.php
+++ b/hphp/test/slow/object_property/674.php
@@ -1,3 +1,12 @@
 <?php
 
- class A { static protected $foo = 11; } class B extends A {} class C extends B { static public $foo;} var_dump(C::$foo); 
\ No newline at end of file
+class A {
+ static protected $foo = 11;
+ }
+ class B extends A {
+}
+ class C extends B {
+ static public $foo;
+}
+ var_dump(C::$foo);
+
diff --git a/hphp/test/slow/object_property/675.php b/hphp/test/slow/object_property/675.php
index 687ae6f54..51de622fa 100644
--- a/hphp/test/slow/object_property/675.php
+++ b/hphp/test/slow/object_property/675.php
@@ -1,3 +1,12 @@
 <?php
 
- class A { static private $foo = 11; } class B extends A {} class C extends B { static public $foo;} var_dump(C::$foo); 
\ No newline at end of file
+class A {
+ static private $foo = 11;
+ }
+ class B extends A {
+}
+ class C extends B {
+ static public $foo;
+}
+ var_dump(C::$foo);
+
diff --git a/hphp/test/slow/object_property/676.php b/hphp/test/slow/object_property/676.php
index cf11ef40f..041e03a82 100644
--- a/hphp/test/slow/object_property/676.php
+++ b/hphp/test/slow/object_property/676.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   public $a = 'apple';
   public $b = 'banana';
diff --git a/hphp/test/slow/object_property/677.php b/hphp/test/slow/object_property/677.php
index 39e5d1071..97c57a4a5 100644
--- a/hphp/test/slow/object_property/677.php
+++ b/hphp/test/slow/object_property/677.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   public $a = 'apple';
 }
diff --git a/hphp/test/slow/object_property/678.php b/hphp/test/slow/object_property/678.php
index be648a0ca..29cd2a834 100644
--- a/hphp/test/slow/object_property/678.php
+++ b/hphp/test/slow/object_property/678.php
@@ -1,12 +1,12 @@
 <?php
 
-
 class A {
   private $prop = 'test';
 
   function __get($name) {
     return $this->$name;
-  }}
+  }
+}
 
 $obj = new A();
 var_dump($obj->prop);
diff --git a/hphp/test/slow/object_property/679.php b/hphp/test/slow/object_property/679.php
index 471fe74b0..968c054d0 100644
--- a/hphp/test/slow/object_property/679.php
+++ b/hphp/test/slow/object_property/679.php
@@ -1,3 +1,14 @@
 <?php
 
- class A { public $a = 10; public function foo() { $this->a = 20;} } class B extends A { public $a = 'test';} $obj = new B(); $obj->foo(); var_dump($obj->a);
\ No newline at end of file
+class A {
+ public $a = 10;
+ public function foo() {
+ $this->a = 20;
+}
+ }
+ class B extends A {
+ public $a = 'test';
+}
+ $obj = new B();
+ $obj->foo();
+ var_dump($obj->a);
diff --git a/hphp/test/slow/object_property/680.php b/hphp/test/slow/object_property/680.php
index 2e847c5cf..0672488ad 100644
--- a/hphp/test/slow/object_property/680.php
+++ b/hphp/test/slow/object_property/680.php
@@ -1,3 +1,15 @@
 <?php
 
- class A { public $a = null; }class B extends A { public function foo() { var_dump($this->a);} } class C extends B { public $a = 'test';} $obj = new C(); $obj->foo();
\ No newline at end of file
+class A {
+ public $a = null;
+ }
+class B extends A {
+ public function foo() {
+ var_dump($this->a);
+}
+ }
+ class C extends B {
+ public $a = 'test';
+}
+ $obj = new C();
+ $obj->foo();
diff --git a/hphp/test/slow/object_property/681.php b/hphp/test/slow/object_property/681.php
index 9017e47c1..8062c9ed0 100644
--- a/hphp/test/slow/object_property/681.php
+++ b/hphp/test/slow/object_property/681.php
@@ -1,3 +1,46 @@
 <?php
 
- $y = true;define('foo', $y ? 1 : 0);if (false) {  class redecClass {  }} else {  final class redecClass {    const redecConst = foo;    const redecConst2 = 456;    public static $fx = foo;  }}class T {  const c = foo;  const c2 = redecClass::redecConst;  const c3 = redecClass::redecConst2;  public static $q = foo;  public static $n = 123;}class T2 {  const c = foo;  public static $q = foo;}class T3 {  const c = foo;}class normal {  const C = 1;  public static $xx = 123;}function test() {  var_dump(T::c);  var_dump(T::c2);  var_dump(T::c3);  var_dump(T::$q);  var_dump(T::$n);  var_dump(T2::c);  var_dump(T2::$q);  var_dump(T3::c);  var_dump(normal::C);  var_dump(normal::$xx);}test();
\ No newline at end of file
+$y = true;
+define('foo', $y ? 1 : 0);
+if (false) {
+  class redecClass {
+  }
+}
+ else {
+  final class redecClass {
+    const redecConst = foo;
+    const redecConst2 = 456;
+    public static $fx = foo;
+  }
+}
+class T {
+  const c = foo;
+  const c2 = redecClass::redecConst;
+  const c3 = redecClass::redecConst2;
+  public static $q = foo;
+  public static $n = 123;
+}
+class T2 {
+  const c = foo;
+  public static $q = foo;
+}
+class T3 {
+  const c = foo;
+}
+class normal {
+  const C = 1;
+  public static $xx = 123;
+}
+function test() {
+  var_dump(T::c);
+  var_dump(T::c2);
+  var_dump(T::c3);
+  var_dump(T::$q);
+  var_dump(T::$n);
+  var_dump(T2::c);
+  var_dump(T2::$q);
+  var_dump(T3::c);
+  var_dump(normal::C);
+  var_dump(normal::$xx);
+}
+test();
diff --git a/hphp/test/slow/object_property/682.php b/hphp/test/slow/object_property/682.php
index e3f023f6c..ad2cc0c62 100644
--- a/hphp/test/slow/object_property/682.php
+++ b/hphp/test/slow/object_property/682.php
@@ -1,6 +1,45 @@
 <?php
 
- class c {  public $d = 'd';  private $e = 'e';  protected $f = 'f';  function t1($y) {    foreach ($y as $k => $v) {      var_dump($v);    }  }}class d extends c {  public $a = 'a';  private $b = 'b';  protected $c = 'c';  function t2($y) {    foreach ($this as $k => $v) {      var_dump($v);    }    foreach ($y as $k => $v) {      var_dump($v);    }    foreach ($y as $k => $v) {      var_dump($v);    }  }}$x = new d;$x->surprise = 1;$y = new d;$y->shock = 2;echo "t2
-";$x->t2($y);echo "t1
-";$x->t1($y);$z = new c;echo "t12
-";$z->t1($x);foreach ($x as $k => $v) {  var_dump($v);}
\ No newline at end of file
+class c {
+  public $d = 'd';
+  private $e = 'e';
+  protected $f = 'f';
+  function t1($y) {
+    foreach ($y as $k => $v) {
+      var_dump($v);
+    }
+  }
+}
+class d extends c {
+  public $a = 'a';
+  private $b = 'b';
+  protected $c = 'c';
+  function t2($y) {
+    foreach ($this as $k => $v) {
+      var_dump($v);
+    }
+    foreach ($y as $k => $v) {
+      var_dump($v);
+    }
+    foreach ($y as $k => $v) {
+      var_dump($v);
+    }
+  }
+}
+$x = new d;
+$x->surprise = 1;
+$y = new d;
+$y->shock = 2;
+echo "t2
+";
+$x->t2($y);
+echo "t1
+";
+$x->t1($y);
+$z = new c;
+echo "t12
+";
+$z->t1($x);
+foreach ($x as $k => $v) {
+  var_dump($v);
+}
diff --git a/hphp/test/slow/object_property/683.php b/hphp/test/slow/object_property/683.php
index e4198642e..dcc382842 100644
--- a/hphp/test/slow/object_property/683.php
+++ b/hphp/test/slow/object_property/683.php
@@ -1,3 +1,7 @@
 <?php
 
- $one = array('cluster'=> 1, 'version'=>2);var_dump(isset($one->cluster));var_dump(empty($one->cluster));$two = 'hello';var_dump(isset($two->scalar));
\ No newline at end of file
+$one = array('cluster'=> 1, 'version'=>2);
+var_dump(isset($one->cluster));
+var_dump(empty($one->cluster));
+$two = 'hello';
+var_dump(isset($two->scalar));
diff --git a/hphp/test/slow/object_property/684.php b/hphp/test/slow/object_property/684.php
index 13cf86229..eab0ac7b3 100644
--- a/hphp/test/slow/object_property/684.php
+++ b/hphp/test/slow/object_property/684.php
@@ -1,3 +1,29 @@
 <?php
 
- function f() { return false; }if (f()) { class A { } }else { class A { static $a = 100; var $b = 1000; } }class B { var $a = 1; static $b = array(1, 2, 3); }$vars = get_class_vars('A'); asort($vars); var_dump($vars);A::$a = 1;$vars = get_class_vars('A'); asort($vars); var_dump($vars);$vars = get_class_vars('B'); asort($vars); var_dump($vars);
\ No newline at end of file
+function f() {
+ return false;
+ }
+if (f()) {
+ class A {
+ }
+ }
+else {
+ class A {
+ static $a = 100;
+ var $b = 1000;
+ }
+ }
+class B {
+ var $a = 1;
+ static $b = array(1, 2, 3);
+ }
+$vars = get_class_vars('A');
+ asort($vars);
+ var_dump($vars);
+A::$a = 1;
+$vars = get_class_vars('A');
+ asort($vars);
+ var_dump($vars);
+$vars = get_class_vars('B');
+ asort($vars);
+ var_dump($vars);
diff --git a/hphp/test/slow/object_property/685.php b/hphp/test/slow/object_property/685.php
index 271bf4452..dd4a864bb 100644
--- a/hphp/test/slow/object_property/685.php
+++ b/hphp/test/slow/object_property/685.php
@@ -1,3 +1,64 @@
 <?php
 
- if (true) {  class A {    var $a0;    static $a1 = 1;    static $a2 = 2;  }  class X {    var $x0;    static $x1 = 1;    static $x2 = 2;  }} else {  class A {    var $a3;    static $a4 = 4;    static $a5 = 5;  }  class X {    var $y3;    static $y4 = 4;    static $y5 = 5;  }}class B extends A {  var $b0 = 3;  static $b1 = 4;  static $b2 = 5;}class Y extends X {  var $y0 = 3;  static $y1 = 4;  static $y2 = 5;}class C {  var $c0;  static $c1 = 1;  static $c2 = 2;}class Z {  var $z0;  static $z1 = 1;  static $z2 = 2;}$vars = get_class_vars('A'); asort($vars); var_dump($vars);$vars = get_class_vars('B'); asort($vars); var_dump($vars);$vars = get_class_vars('C'); asort($vars); var_dump($vars);$vars = get_class_vars('X'); asort($vars); var_dump($vars);$vars = get_class_vars('Y'); asort($vars); var_dump($vars);$vars = get_class_vars('Z'); asort($vars); var_dump($vars);
\ No newline at end of file
+if (true) {
+  class A {
+    var $a0;
+    static $a1 = 1;
+    static $a2 = 2;
+  }
+  class X {
+    var $x0;
+    static $x1 = 1;
+    static $x2 = 2;
+  }
+}
+ else {
+  class A {
+    var $a3;
+    static $a4 = 4;
+    static $a5 = 5;
+  }
+  class X {
+    var $y3;
+    static $y4 = 4;
+    static $y5 = 5;
+  }
+}
+class B extends A {
+  var $b0 = 3;
+  static $b1 = 4;
+  static $b2 = 5;
+}
+class Y extends X {
+  var $y0 = 3;
+  static $y1 = 4;
+  static $y2 = 5;
+}
+class C {
+  var $c0;
+  static $c1 = 1;
+  static $c2 = 2;
+}
+class Z {
+  var $z0;
+  static $z1 = 1;
+  static $z2 = 2;
+}
+$vars = get_class_vars('A');
+ asort($vars);
+ var_dump($vars);
+$vars = get_class_vars('B');
+ asort($vars);
+ var_dump($vars);
+$vars = get_class_vars('C');
+ asort($vars);
+ var_dump($vars);
+$vars = get_class_vars('X');
+ asort($vars);
+ var_dump($vars);
+$vars = get_class_vars('Y');
+ asort($vars);
+ var_dump($vars);
+$vars = get_class_vars('Z');
+ asort($vars);
+ var_dump($vars);
diff --git a/hphp/test/slow/object_property/686.php b/hphp/test/slow/object_property/686.php
index c4c9a3eb5..0a1e911a1 100644
--- a/hphp/test/slow/object_property/686.php
+++ b/hphp/test/slow/object_property/686.php
@@ -1,3 +1,77 @@
 <?php
 
- class A {  private $pri = 'a-pri';  protected $pro = 'a-pro';  function bar() {    var_dump($this->pri);    $pri = $q ? 'zz' : 'p'.'ri';    var_dump($this->$pri);  }  function bar2() {    var_dump($this->pro);  }}class B extends A {  private $pri = 'b-pri';  function bar() {    parent::bar();    var_dump($this->pri);  }}$obj = new B(); $obj->bar();class C extends B {  public $pri = 'c-pri';  public $pro = 'c-pro';  function bar2() {    parent::bar2();    var_dump($this->pro);  }}$obj = new C; $obj->bar(); $obj->bar2();var_dump(serialize($obj));class Base {  protected $pro = 1;  private $pri = 'base-pri';  function q0() {    var_dump($this->pri);  }}class R extends Base {  public $rpub = 1;  protected $pro = 2;  private $pri = 'r-pri';  function q() {    var_dump($this->pri);  }}class D extends R {  public $dpub = 'd';  protected $pro = 'pro';  private $pri = 'd-pri';  function qq() {    var_dump($this->pri);  }}class DD extends D {  private $pri = 'dd-pri';  function qqq() {    var_dump($this->pri);  }}if (false) {  class R{}}$d = new D;$d->qq();$d->q();$d->q0();$d = new DD;$d->qqq();$d->qq();$d->q();$d->q0();
\ No newline at end of file
+class A {
+  private $pri = 'a-pri';
+  protected $pro = 'a-pro';
+  function bar() {
+    var_dump($this->pri);
+    $pri = $q ? 'zz' : 'p'.'ri';
+    var_dump($this->$pri);
+  }
+  function bar2() {
+    var_dump($this->pro);
+  }
+}
+class B extends A {
+  private $pri = 'b-pri';
+  function bar() {
+    parent::bar();
+    var_dump($this->pri);
+  }
+}
+$obj = new B();
+ $obj->bar();
+class C extends B {
+  public $pri = 'c-pri';
+  public $pro = 'c-pro';
+  function bar2() {
+    parent::bar2();
+    var_dump($this->pro);
+  }
+}
+$obj = new C;
+ $obj->bar();
+ $obj->bar2();
+var_dump(serialize($obj));
+class Base {
+  protected $pro = 1;
+  private $pri = 'base-pri';
+  function q0() {
+    var_dump($this->pri);
+  }
+}
+class R extends Base {
+  public $rpub = 1;
+  protected $pro = 2;
+  private $pri = 'r-pri';
+  function q() {
+    var_dump($this->pri);
+  }
+}
+class D extends R {
+  public $dpub = 'd';
+  protected $pro = 'pro';
+  private $pri = 'd-pri';
+  function qq() {
+    var_dump($this->pri);
+  }
+}
+class DD extends D {
+  private $pri = 'dd-pri';
+  function qqq() {
+    var_dump($this->pri);
+  }
+}
+if (false) {
+  class R{
+}
+}
+$d = new D;
+$d->qq();
+$d->q();
+$d->q0();
+$d = new DD;
+$d->qqq();
+$d->qq();
+$d->q();
+$d->q0();
diff --git a/hphp/test/slow/object_property/687.php b/hphp/test/slow/object_property/687.php
index dcc153744..51c07aece 100644
--- a/hphp/test/slow/object_property/687.php
+++ b/hphp/test/slow/object_property/687.php
@@ -1,7 +1,7 @@
 <?php
 
-
-class A { }
+class A {
+ }
 $a = new A();
 $f = 20;
 $a->$f = 100;
diff --git a/hphp/test/slow/object_property/688.php b/hphp/test/slow/object_property/688.php
index 1015e07d8..93f892ba2 100644
--- a/hphp/test/slow/object_property/688.php
+++ b/hphp/test/slow/object_property/688.php
@@ -1,3 +1,23 @@
 <?php
 
- class X {  public $x = 0;  function y($u,&$a) {    $a++;  }};if (0) { class X{} }function f() {}function test() {  $x = new X;  $x->y(f(),$x->x);  var_dump($x);  $x->y(0,$x->x);  var_dump($x);}test();
\ No newline at end of file
+class X {
+  public $x = 0;
+  function y($u,&$a) {
+    $a++;
+  }
+}
+;
+if (0) {
+ class X{
+}
+ }
+function f() {
+}
+function test() {
+  $x = new X;
+  $x->y(f(),$x->x);
+  var_dump($x);
+  $x->y(0,$x->x);
+  var_dump($x);
+}
+test();
diff --git a/hphp/test/slow/object_property/689.php b/hphp/test/slow/object_property/689.php
index 9a8529fe0..736cd3876 100644
--- a/hphp/test/slow/object_property/689.php
+++ b/hphp/test/slow/object_property/689.php
@@ -1,3 +1,15 @@
 <?php
 
- class A {  private $a = array('apple');  private $b = 'banana';  function foo() {    $b = new A();    unset($b->b);    var_dump($b);    foreach ($b as $prop => $value) {      var_dump($prop);    }  }}A::foo();
\ No newline at end of file
+class A {
+  private $a = array('apple');
+  private $b = 'banana';
+  function foo() {
+    $b = new A();
+    unset($b->b);
+    var_dump($b);
+    foreach ($b as $prop => $value) {
+      var_dump($prop);
+    }
+  }
+}
+A::foo();
diff --git a/hphp/test/slow/object_property/690.php b/hphp/test/slow/object_property/690.php
index 84da558ef..608573300 100644
--- a/hphp/test/slow/object_property/690.php
+++ b/hphp/test/slow/object_property/690.php
@@ -1,3 +1,33 @@
 <?php
 
- class X {  public $pub_var = null;  public $pub_set = array();  private $priv_var = 2;  function __get($name) {    echo 'get: '; var_dump($name); return $name == 'buz' ? 1 : array();  }  function __isset($name) {    echo 'isset: '; var_dump($name);    return $name == 'baz' || $name == 'buz';  }}$x = new X;var_dump(isset($x->foo));var_dump(isset($x->baz));var_dump(isset($x->buz));var_dump(isset($x->pub_var));var_dump(isset($x->pub_set));var_dump(isset($x->priv_var));var_dump(empty($x->foo));var_dump(empty($x->baz));var_dump(empty($x->buz));var_dump(empty($x->pub_var));var_dump(empty($x->pub_set));var_dump(empty($x->priv_var));unset($x->pub_var);var_dump(isset($x->pub_var));var_dump(empty($x->pub_var));
\ No newline at end of file
+class X {
+  public $pub_var = null;
+  public $pub_set = array();
+  private $priv_var = 2;
+  function __get($name) {
+    echo 'get: ';
+ var_dump($name);
+ return $name == 'buz' ? 1 : array();
+  }
+  function __isset($name) {
+    echo 'isset: ';
+ var_dump($name);
+    return $name == 'baz' || $name == 'buz';
+  }
+}
+$x = new X;
+var_dump(isset($x->foo));
+var_dump(isset($x->baz));
+var_dump(isset($x->buz));
+var_dump(isset($x->pub_var));
+var_dump(isset($x->pub_set));
+var_dump(isset($x->priv_var));
+var_dump(empty($x->foo));
+var_dump(empty($x->baz));
+var_dump(empty($x->buz));
+var_dump(empty($x->pub_var));
+var_dump(empty($x->pub_set));
+var_dump(empty($x->priv_var));
+unset($x->pub_var);
+var_dump(isset($x->pub_var));
+var_dump(empty($x->pub_var));
diff --git a/hphp/test/slow/object_property/691.php b/hphp/test/slow/object_property/691.php
index 71da978c6..ee2bece36 100644
--- a/hphp/test/slow/object_property/691.php
+++ b/hphp/test/slow/object_property/691.php
@@ -1,3 +1,12 @@
 <?php
 
- define('FOO', 'foo');class X {  const UNKNOWN = 1;  public $foo = -1;  static public $bar = FOO;  public $baz = self::UNKNOWN;}$vars = get_class_vars('X'); asort($vars); var_dump($vars);
\ No newline at end of file
+define('FOO', 'foo');
+class X {
+  const UNKNOWN = 1;
+  public $foo = -1;
+  static public $bar = FOO;
+  public $baz = self::UNKNOWN;
+}
+$vars = get_class_vars('X');
+ asort($vars);
+ var_dump($vars);
diff --git a/hphp/test/slow/object_property/692.php b/hphp/test/slow/object_property/692.php
index e2fdb8928..820f5f98c 100644
--- a/hphp/test/slow/object_property/692.php
+++ b/hphp/test/slow/object_property/692.php
@@ -1,10 +1,16 @@
 <?php
 
-
-class A { public $a = 1; protected $b = 2; private $c = 3; }
+class A {
+ public $a = 1;
+ protected $b = 2;
+ private $c = 3;
+ }
 class B extends A {
   function f() {
-    foreach ($this as $k => &$v) { var_dump($k); $v = 100; }
+    foreach ($this as $k => &$v) {
+ var_dump($k);
+ $v = 100;
+ }
     var_dump($this);
   }
 }
@@ -12,7 +18,10 @@ $b = new B();
 $b->f();
 function f() {
   $o = new B();
-  foreach ($o as $k => &$v) { var_dump($k); $v = 100; }
+  foreach ($o as $k => &$v) {
+ var_dump($k);
+ $v = 100;
+ }
   var_dump($o);
 }
 f();
diff --git a/hphp/test/slow/object_property/693.php b/hphp/test/slow/object_property/693.php
index 5229b1f7e..2a7ce340a 100644
--- a/hphp/test/slow/object_property/693.php
+++ b/hphp/test/slow/object_property/693.php
@@ -1,7 +1,7 @@
 <?php
 
-
-$a = array(); $a[] = 1;
+$a = array();
+ $a[] = 1;
 $o = (object)$a;
 var_dump($o);
 $s = serialize($o);
diff --git a/hphp/test/slow/object_property/694.php b/hphp/test/slow/object_property/694.php
index 14d59b88b..1c98160fa 100644
--- a/hphp/test/slow/object_property/694.php
+++ b/hphp/test/slow/object_property/694.php
@@ -1,3 +1,11 @@
 <?php
 
- class Test{  protected static $color = array('gray' => 30);  public static function foo($type, $key) {    return isset( self::${$type}[$key] );  }}var_dump(Test::foo('color', 'gray'));
\ No newline at end of file
+class Test{
+  protected static $color = array('gray' => 30);
+  public static function foo($type, $key) {
+    return isset( self::${
+$type}
+[$key] );
+  }
+}
+var_dump(Test::foo('color', 'gray'));
diff --git a/hphp/test/slow/object_property/695.php b/hphp/test/slow/object_property/695.php
index a9b9935cf..6728e5c94 100644
--- a/hphp/test/slow/object_property/695.php
+++ b/hphp/test/slow/object_property/695.php
@@ -1,3 +1,9 @@
 <?php
 
- function foo() {  $x = new stdClass;  $x->v = array(1, 2);  return $x;}foo()->v[0] += 5;var_dump(shuffle(foo()->v));
\ No newline at end of file
+function foo() {
+  $x = new stdClass;
+  $x->v = array(1, 2);
+  return $x;
+}
+foo()->v[0] += 5;
+var_dump(shuffle(foo()->v));
diff --git a/hphp/test/slow/object_property/696.php b/hphp/test/slow/object_property/696.php
index f951f0d1f..5a9250e9c 100644
--- a/hphp/test/slow/object_property/696.php
+++ b/hphp/test/slow/object_property/696.php
@@ -1,3 +1,19 @@
 <?php
 
- class A {}class B {  public $data;  public function setData(A $result = null) {    $this->data = $result;  }}function foo($obj) {  $obj->data = new A;  $a = $obj->data;  var_dump($a);  $obj->setData(null);  $a = $obj->data;  var_dump($a);}foo(new B);
\ No newline at end of file
+class A {
+}
+class B {
+  public $data;
+  public function setData(A $result = null) {
+    $this->data = $result;
+  }
+}
+function foo($obj) {
+  $obj->data = new A;
+  $a = $obj->data;
+  var_dump($a);
+  $obj->setData(null);
+  $a = $obj->data;
+  var_dump($a);
+}
+foo(new B);
diff --git a/hphp/test/slow/object_property/697.php b/hphp/test/slow/object_property/697.php
index a609ccb33..7a6667f0d 100644
--- a/hphp/test/slow/object_property/697.php
+++ b/hphp/test/slow/object_property/697.php
@@ -1,3 +1,52 @@
 <?php
 
- class X {  function __destruct() { var_dump(__METHOD__); }  protected $prot_over_prot = 1;  public $pub_over_pub = 2;  protected $pub_over_prot = 3;}class Y extends X {  function __destruct() { var_dump(__METHOD__,$this); }  protected $prot_over_prot = 4;  public $pub_over_pub = 5;  public $pub_over_prot = 6;  protected $prot_base = 7;  public $pub_base = 8;}class Z extends Y {  function __destruct() { var_dump(__METHOD__); }  public $prot_over_prot = 9;  public $pub_over_pub = 10;  public $pub_over_prot = 11;  public $prot_base = 12;  public $pub_base = 13;}function foo($x) {  $s = serialize($x);  var_dump($s);  $y = unserialize($s);  var_dump($y);  var_dump((array)$y);  if (function_exists('apc_store')) {    apc_store('foo', $y);    $z = apc_fetch('foo');  } else {    $z = clone $y;  }  var_dump($z);  unset($z, $y);  var_dump($x);}$y = new y;foo($y);$z = new z;foo($z);unset($z, $y);
\ No newline at end of file
+class X {
+  function __destruct() {
+ var_dump(__METHOD__);
+ }
+  protected $prot_over_prot = 1;
+  public $pub_over_pub = 2;
+  protected $pub_over_prot = 3;
+}
+class Y extends X {
+  function __destruct() {
+ var_dump(__METHOD__,$this);
+ }
+  protected $prot_over_prot = 4;
+  public $pub_over_pub = 5;
+  public $pub_over_prot = 6;
+  protected $prot_base = 7;
+  public $pub_base = 8;
+}
+class Z extends Y {
+  function __destruct() {
+ var_dump(__METHOD__);
+ }
+  public $prot_over_prot = 9;
+  public $pub_over_pub = 10;
+  public $pub_over_prot = 11;
+  public $prot_base = 12;
+  public $pub_base = 13;
+}
+function foo($x) {
+  $s = serialize($x);
+  var_dump($s);
+  $y = unserialize($s);
+  var_dump($y);
+  var_dump((array)$y);
+  if (function_exists('apc_store')) {
+    apc_store('foo', $y);
+    $z = apc_fetch('foo');
+  }
+ else {
+    $z = clone $y;
+  }
+  var_dump($z);
+  unset($z, $y);
+  var_dump($x);
+}
+$y = new y;
+foo($y);
+$z = new z;
+foo($z);
+unset($z, $y);
diff --git a/hphp/test/slow/object_property/698.php b/hphp/test/slow/object_property/698.php
index e44adbe58..a5f474275 100644
--- a/hphp/test/slow/object_property/698.php
+++ b/hphp/test/slow/object_property/698.php
@@ -1,3 +1,26 @@
 <?php
 
- class X {  private $b = false;  private $i = 0;  private $a = array();  private $s = 'hello';  function set() {    $this->b = true;    $this->i = 5;    $this->a = array(1,2,3);    $this->s = 'goodbye';  }  function foo() {    var_dump($this->b, $this->i, $this->a, $this->s);  }}function test() {  $x = new X;  $x->set();  $s = serialize($x);  $y = unserialize($s);  $y->foo();  var_dump($y);}test();
\ No newline at end of file
+class X {
+  private $b = false;
+  private $i = 0;
+  private $a = array();
+  private $s = 'hello';
+  function set() {
+    $this->b = true;
+    $this->i = 5;
+    $this->a = array(1,2,3);
+    $this->s = 'goodbye';
+  }
+  function foo() {
+    var_dump($this->b, $this->i, $this->a, $this->s);
+  }
+}
+function test() {
+  $x = new X;
+  $x->set();
+  $s = serialize($x);
+  $y = unserialize($s);
+  $y->foo();
+  var_dump($y);
+}
+test();
diff --git a/hphp/test/slow/object_property/699.php b/hphp/test/slow/object_property/699.php
index 8059826da..856910fb1 100644
--- a/hphp/test/slow/object_property/699.php
+++ b/hphp/test/slow/object_property/699.php
@@ -1,3 +1,10 @@
 <?php
 
- define('INIT1', 1000);class d { static public $x = INIT1; }class e extends d {}var_dump(d::$x++);var_dump(e::$x++);
\ No newline at end of file
+define('INIT1', 1000);
+class d {
+ static public $x = INIT1;
+ }
+class e extends d {
+}
+var_dump(d::$x++);
+var_dump(e::$x++);
diff --git a/hphp/test/slow/object_property/700.php b/hphp/test/slow/object_property/700.php
index b800c07af..17a160666 100644
--- a/hphp/test/slow/object_property/700.php
+++ b/hphp/test/slow/object_property/700.php
@@ -1,3 +1,11 @@
 <?php
 
- function test($x, $v) { var_dump(isset($x->$v)); }test(false, "");test(false, "\0foo");test(true, "");test(true, "\0foo");test(new stdclass, "");test(new stdclass, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ var_dump(isset($x->$v));
+ }
+test(false, "");
+test(false, "\0foo");
+test(true, "");
+test(true, "\0foo");
+test(new stdclass, "");
+test(new stdclass, "\0foo");
diff --git a/hphp/test/slow/object_property/701.php b/hphp/test/slow/object_property/701.php
index 4489fe663..d6bafa8ac 100644
--- a/hphp/test/slow/object_property/701.php
+++ b/hphp/test/slow/object_property/701.php
@@ -1,3 +1,10 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v); }test(false, "");test(false, "\0foo");test(true, "");test(true, "\0foo");test(new stdclass, "");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v);
+ }
+test(false, "");
+test(false, "\0foo");
+test(true, "");
+test(true, "\0foo");
+test(new stdclass, "");
diff --git a/hphp/test/slow/object_property/701.php.expectf b/hphp/test/slow/object_property/701.php.expectf
index e10defaac..2c6f05dff 100644
--- a/hphp/test/slow/object_property/701.php.expectf
+++ b/hphp/test/slow/object_property/701.php.expectf
@@ -2,4 +2,4 @@ NULL
 NULL
 NULL
 NULL
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/701.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/701.php on line 4
diff --git a/hphp/test/slow/object_property/702.php b/hphp/test/slow/object_property/702.php
index 50fe7bff7..c39c203f9 100644
--- a/hphp/test/slow/object_property/702.php
+++ b/hphp/test/slow/object_property/702.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v); }test(new stdclass, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v);
+ }
+test(new stdclass, "\0foo");
diff --git a/hphp/test/slow/object_property/702.php.expectf b/hphp/test/slow/object_property/702.php.expectf
index 0fb6157db..80fd0dacb 100644
--- a/hphp/test/slow/object_property/702.php.expectf
+++ b/hphp/test/slow/object_property/702.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/702.php on line 3
+HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/702.php on line 4
diff --git a/hphp/test/slow/object_property/703.php b/hphp/test/slow/object_property/703.php
index e9069beb8..fd9972973 100644
--- a/hphp/test/slow/object_property/703.php
+++ b/hphp/test/slow/object_property/703.php
@@ -1,3 +1,8 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v = 1); }test(true, "");test(true, "\0foo");test(false, "");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v = 1);
+ }
+test(true, "");
+test(true, "\0foo");
+test(false, "");
diff --git a/hphp/test/slow/object_property/703.php.expectf b/hphp/test/slow/object_property/703.php.expectf
index afbdaef6b..e9d19abf4 100644
--- a/hphp/test/slow/object_property/703.php.expectf
+++ b/hphp/test/slow/object_property/703.php.expectf
@@ -1,3 +1,3 @@
 NULL
 NULL
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/703.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/703.php on line 4
diff --git a/hphp/test/slow/object_property/704.php b/hphp/test/slow/object_property/704.php
index 839beee3a..54751340c 100644
--- a/hphp/test/slow/object_property/704.php
+++ b/hphp/test/slow/object_property/704.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v = 1); }test(false, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v = 1);
+ }
+test(false, "\0foo");
diff --git a/hphp/test/slow/object_property/704.php.expectf b/hphp/test/slow/object_property/704.php.expectf
index 6f0a19b6e..792f92605 100644
--- a/hphp/test/slow/object_property/704.php.expectf
+++ b/hphp/test/slow/object_property/704.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/704.php on line 3
+HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/704.php on line 4
diff --git a/hphp/test/slow/object_property/705.php b/hphp/test/slow/object_property/705.php
index 16b335094..e3aabecc1 100644
--- a/hphp/test/slow/object_property/705.php
+++ b/hphp/test/slow/object_property/705.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v = 1); }test(new stdclass, "");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v = 1);
+ }
+test(new stdclass, "");
diff --git a/hphp/test/slow/object_property/705.php.expectf b/hphp/test/slow/object_property/705.php.expectf
index 1b2f41678..066457791 100644
--- a/hphp/test/slow/object_property/705.php.expectf
+++ b/hphp/test/slow/object_property/705.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/705.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/705.php on line 4
diff --git a/hphp/test/slow/object_property/706.php b/hphp/test/slow/object_property/706.php
index e3b6450d8..b46c529ab 100644
--- a/hphp/test/slow/object_property/706.php
+++ b/hphp/test/slow/object_property/706.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v = 1); }test(new stdclass, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v = 1);
+ }
+test(new stdclass, "\0foo");
diff --git a/hphp/test/slow/object_property/706.php.expectf b/hphp/test/slow/object_property/706.php.expectf
index 730cbe37e..2675090ca 100644
--- a/hphp/test/slow/object_property/706.php.expectf
+++ b/hphp/test/slow/object_property/706.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/706.php on line 3
+HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/706.php on line 4
diff --git a/hphp/test/slow/object_property/707.php b/hphp/test/slow/object_property/707.php
index 4f510014f..5d080a69b 100644
--- a/hphp/test/slow/object_property/707.php
+++ b/hphp/test/slow/object_property/707.php
@@ -1,3 +1,8 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v++); }test(true, "");test(true, "\0foo");test(false, "");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v++);
+ }
+test(true, "");
+test(true, "\0foo");
+test(false, "");
diff --git a/hphp/test/slow/object_property/707.php.expectf b/hphp/test/slow/object_property/707.php.expectf
index edb88c23f..6817767ff 100644
--- a/hphp/test/slow/object_property/707.php.expectf
+++ b/hphp/test/slow/object_property/707.php.expectf
@@ -1,3 +1,3 @@
 NULL
 NULL
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/707.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/707.php on line 4
diff --git a/hphp/test/slow/object_property/708.php b/hphp/test/slow/object_property/708.php
index e1ab3f836..5482d8d87 100644
--- a/hphp/test/slow/object_property/708.php
+++ b/hphp/test/slow/object_property/708.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v++); }test(false, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v++);
+ }
+test(false, "\0foo");
diff --git a/hphp/test/slow/object_property/708.php.expectf b/hphp/test/slow/object_property/708.php.expectf
index b763c36d6..6fe00262e 100644
--- a/hphp/test/slow/object_property/708.php.expectf
+++ b/hphp/test/slow/object_property/708.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/708.php on line 3
+HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/708.php on line 4
diff --git a/hphp/test/slow/object_property/709.php b/hphp/test/slow/object_property/709.php
index 9db1b84b9..aacfd7eb3 100644
--- a/hphp/test/slow/object_property/709.php
+++ b/hphp/test/slow/object_property/709.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v++); }test(new stdclass, "");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v++);
+ }
+test(new stdclass, "");
diff --git a/hphp/test/slow/object_property/709.php.expectf b/hphp/test/slow/object_property/709.php.expectf
index 59ebe9283..bd56ae2b6 100644
--- a/hphp/test/slow/object_property/709.php.expectf
+++ b/hphp/test/slow/object_property/709.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/709.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/709.php on line 4
diff --git a/hphp/test/slow/object_property/710.php b/hphp/test/slow/object_property/710.php
index f641d39bc..d46bdc4ec 100644
--- a/hphp/test/slow/object_property/710.php
+++ b/hphp/test/slow/object_property/710.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v++); }test(new stdclass, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v++);
+ }
+test(new stdclass, "\0foo");
diff --git a/hphp/test/slow/object_property/710.php.expectf b/hphp/test/slow/object_property/710.php.expectf
index 5cb266976..bc90aadcf 100644
--- a/hphp/test/slow/object_property/710.php.expectf
+++ b/hphp/test/slow/object_property/710.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/710.php on line 3
+HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/710.php on line 4
diff --git a/hphp/test/slow/object_property/711.php b/hphp/test/slow/object_property/711.php
index 2fe5b9eb2..f3583f45d 100644
--- a/hphp/test/slow/object_property/711.php
+++ b/hphp/test/slow/object_property/711.php
@@ -1,3 +1,8 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v += 1); }test(true, "");test(true, "\0foo");test(false, "");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v += 1);
+ }
+test(true, "");
+test(true, "\0foo");
+test(false, "");
diff --git a/hphp/test/slow/object_property/711.php.expectf b/hphp/test/slow/object_property/711.php.expectf
index ff042c312..95094da74 100644
--- a/hphp/test/slow/object_property/711.php.expectf
+++ b/hphp/test/slow/object_property/711.php.expectf
@@ -1,3 +1,3 @@
 NULL
 NULL
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/711.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/711.php on line 4
diff --git a/hphp/test/slow/object_property/712.php b/hphp/test/slow/object_property/712.php
index 7455895d4..cf8f1889a 100644
--- a/hphp/test/slow/object_property/712.php
+++ b/hphp/test/slow/object_property/712.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v += 1); }test(false, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v += 1);
+ }
+test(false, "\0foo");
diff --git a/hphp/test/slow/object_property/712.php.expectf b/hphp/test/slow/object_property/712.php.expectf
index 169792196..f21c1d805 100644
--- a/hphp/test/slow/object_property/712.php.expectf
+++ b/hphp/test/slow/object_property/712.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/712.php on line 3
+HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/712.php on line 4
diff --git a/hphp/test/slow/object_property/713.php b/hphp/test/slow/object_property/713.php
index c020d10a6..9db9b4605 100644
--- a/hphp/test/slow/object_property/713.php
+++ b/hphp/test/slow/object_property/713.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v += 1); }test(new stdclass, "");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v += 1);
+ }
+test(new stdclass, "");
diff --git a/hphp/test/slow/object_property/713.php.expectf b/hphp/test/slow/object_property/713.php.expectf
index a8adfd7c1..d9208df17 100644
--- a/hphp/test/slow/object_property/713.php.expectf
+++ b/hphp/test/slow/object_property/713.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/713.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/713.php on line 4
diff --git a/hphp/test/slow/object_property/714.php b/hphp/test/slow/object_property/714.php
index 3b059246d..8e2221276 100644
--- a/hphp/test/slow/object_property/714.php
+++ b/hphp/test/slow/object_property/714.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($x, $v) { var_dump($x->$v += 1); }test(new stdclass, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ var_dump($x->$v += 1);
+ }
+test(new stdclass, "\0foo");
diff --git a/hphp/test/slow/object_property/714.php.expectf b/hphp/test/slow/object_property/714.php.expectf
index eb3c927ad..7feb6e360 100644
--- a/hphp/test/slow/object_property/714.php.expectf
+++ b/hphp/test/slow/object_property/714.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/714.php on line 3
+HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/714.php on line 4
diff --git a/hphp/test/slow/object_property/715.php b/hphp/test/slow/object_property/715.php
index e0e468857..a43d78dd8 100644
--- a/hphp/test/slow/object_property/715.php
+++ b/hphp/test/slow/object_property/715.php
@@ -1,3 +1,11 @@
 <?php
 
- function test($x, $v) { unset($x->$v); var_dump($x); }test(false, "");test(false, "\0foo");test(true, "");test(true, "\0foo");test(new stdclass, "");
\ No newline at end of file
+function test($x, $v) {
+ unset($x->$v);
+ var_dump($x);
+ }
+test(false, "");
+test(false, "\0foo");
+test(true, "");
+test(true, "\0foo");
+test(new stdclass, "");
diff --git a/hphp/test/slow/object_property/715.php.expectf b/hphp/test/slow/object_property/715.php.expectf
index 1a898a238..20a2264b7 100644
--- a/hphp/test/slow/object_property/715.php.expectf
+++ b/hphp/test/slow/object_property/715.php.expectf
@@ -2,4 +2,4 @@ bool(false)
 bool(false)
 bool(true)
 bool(true)
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/715.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/715.php on line 4
diff --git a/hphp/test/slow/object_property/716.php b/hphp/test/slow/object_property/716.php
index 127dd819d..78bf8213c 100644
--- a/hphp/test/slow/object_property/716.php
+++ b/hphp/test/slow/object_property/716.php
@@ -1,3 +1,7 @@
 <?php
 
- function test($x, $v) { unset($x->$v); var_dump($x); }test(new stdclass, "\0foo");
\ No newline at end of file
+function test($x, $v) {
+ unset($x->$v);
+ var_dump($x);
+ }
+test(new stdclass, "\0foo");
diff --git a/hphp/test/slow/object_property/716.php.expectf b/hphp/test/slow/object_property/716.php.expectf
index 0ea3b8fc0..2111a89c0 100644
--- a/hphp/test/slow/object_property/716.php.expectf
+++ b/hphp/test/slow/object_property/716.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/716.php on line 3
+HipHop Fatal error: Cannot access property started with '\\0' in %s/hphp/test/slow/object_property/716.php on line 4
diff --git a/hphp/test/slow/object_property/717.php b/hphp/test/slow/object_property/717.php
index a0dcad351..81e007886 100644
--- a/hphp/test/slow/object_property/717.php
+++ b/hphp/test/slow/object_property/717.php
@@ -1,3 +1,4 @@
 <?php
 
- $x = new stdclass;var_dump($z =& $x->$y);
\ No newline at end of file
+$x = new stdclass;
+var_dump($z =& $x->$y);
diff --git a/hphp/test/slow/object_property/717.php.expectf b/hphp/test/slow/object_property/717.php.expectf
index 0d4ab102f..b68d476e5 100644
--- a/hphp/test/slow/object_property/717.php.expectf
+++ b/hphp/test/slow/object_property/717.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/717.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/717.php on line 4
diff --git a/hphp/test/slow/object_property/718.php b/hphp/test/slow/object_property/718.php
index 3717a1e6d..9474ec71a 100644
--- a/hphp/test/slow/object_property/718.php
+++ b/hphp/test/slow/object_property/718.php
@@ -1,3 +1,4 @@
 <?php
 
- $x = new stdclass;var_dump($x->$y =& $z);
\ No newline at end of file
+$x = new stdclass;
+var_dump($x->$y =& $z);
diff --git a/hphp/test/slow/object_property/718.php.expectf b/hphp/test/slow/object_property/718.php.expectf
index 17a923e83..a71e61c8f 100644
--- a/hphp/test/slow/object_property/718.php.expectf
+++ b/hphp/test/slow/object_property/718.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/718.php on line 3
+HipHop Fatal error: Cannot access empty property in %s/hphp/test/slow/object_property/718.php on line 4
diff --git a/hphp/test/slow/object_property/719.php b/hphp/test/slow/object_property/719.php
index 5ab799a03..a05cddb71 100644
--- a/hphp/test/slow/object_property/719.php
+++ b/hphp/test/slow/object_property/719.php
@@ -1,3 +1,39 @@
 <?php
 
- class X {  public $bar = 5;  function &foo() { static $v; if (!$v) $v = $this; return $v; }}function &foo() {  static $v;  if (!$v) $v = new X;  return $v;}function &bar() {  static $v;  return $v;}function test() {  $x = new X;  var_dump($x->foo()->bar);  var_dump($x->foo()->bar);  var_dump($x->foo()->bar);  var_dump(foo()->bar);  foo()->bar = 6;  var_dump(foo()->bar);  foo()->bar = 7;  var_dump(foo()->bar);  foo()->bar = 8;  var_dump(foo()->bar);  bar()->bar = 6;  var_dump(bar()->bar);  bar()->bar = 7;  var_dump(bar()->bar);  bar()->bar = 8;  var_dump(bar()->bar);}test();
\ No newline at end of file
+class X {
+  public $bar = 5;
+  function &foo() {
+ static $v;
+ if (!$v) $v = $this;
+ return $v;
+ }
+}
+function &foo() {
+  static $v;
+  if (!$v) $v = new X;
+  return $v;
+}
+function &bar() {
+  static $v;
+  return $v;
+}
+function test() {
+  $x = new X;
+  var_dump($x->foo()->bar);
+  var_dump($x->foo()->bar);
+  var_dump($x->foo()->bar);
+  var_dump(foo()->bar);
+  foo()->bar = 6;
+  var_dump(foo()->bar);
+  foo()->bar = 7;
+  var_dump(foo()->bar);
+  foo()->bar = 8;
+  var_dump(foo()->bar);
+  bar()->bar = 6;
+  var_dump(bar()->bar);
+  bar()->bar = 7;
+  var_dump(bar()->bar);
+  bar()->bar = 8;
+  var_dump(bar()->bar);
+}
+test();
diff --git a/hphp/test/slow/object_property/720.php b/hphp/test/slow/object_property/720.php
index 4467552ba..a2a6f7569 100644
--- a/hphp/test/slow/object_property/720.php
+++ b/hphp/test/slow/object_property/720.php
@@ -1,7 +1,8 @@
 <?php
 
-
-function error_handler($errno, $errstr) { echo "Error\n"; }
+function error_handler($errno, $errstr) {
+ echo "Error\n";
+ }
 class f {
   public $bar = 'hi there';
 }
diff --git a/hphp/test/slow/object_property_expression/785.php b/hphp/test/slow/object_property_expression/785.php
index 43560fcdf..edb1bdae7 100644
--- a/hphp/test/slow/object_property_expression/785.php
+++ b/hphp/test/slow/object_property_expression/785.php
@@ -1,3 +1,10 @@
 <?php
 
- class test {  function foo() {    $var = $this->blah->prop->foo->bar = "string";    var_dump($this->blah);  }}$t = new test;$t->foo();
\ No newline at end of file
+class test {
+  function foo() {
+    $var = $this->blah->prop->foo->bar = "string";
+    var_dump($this->blah);
+  }
+}
+$t = new test;
+$t->foo();
diff --git a/hphp/test/slow/object_property_expression/786.php b/hphp/test/slow/object_property_expression/786.php
index 347aea0ea..83c5ce966 100644
--- a/hphp/test/slow/object_property_expression/786.php
+++ b/hphp/test/slow/object_property_expression/786.php
@@ -1,5 +1,19 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}$c = new C1();$c->a = 1;$c->a .= 1;print $c->a;
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+$c = new C1();
+$c->a = 1;
+$c->a .= 1;
+print $c->a;
diff --git a/hphp/test/slow/object_property_expression/787.php b/hphp/test/slow/object_property_expression/787.php
index 4e49300fb..2fedf4bdc 100644
--- a/hphp/test/slow/object_property_expression/787.php
+++ b/hphp/test/slow/object_property_expression/787.php
@@ -1,5 +1,23 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C2 {  public $p2;}$c2 = new C2();$c2->p = new C1();$c2->p->a = 1;$c2->p->a .= 1;print $c2->p->a;
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C2 {
+  public $p2;
+}
+$c2 = new C2();
+$c2->p = new C1();
+$c2->p->a = 1;
+$c2->p->a .= 1;
+print $c2->p->a;
diff --git a/hphp/test/slow/object_property_expression/788.php b/hphp/test/slow/object_property_expression/788.php
index 782a124a0..f273a90f7 100644
--- a/hphp/test/slow/object_property_expression/788.php
+++ b/hphp/test/slow/object_property_expression/788.php
@@ -1,5 +1,27 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C2 {  public $p2;}class C3 {  public $p3;}$c3 = new C3();$c3->p3 = new C2();$c3->p3->p2 = new C1();$c3->p3->p2->a = 1;$c3->p3->p2->a .= 1;print $c3->p3->p2->a;
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C2 {
+  public $p2;
+}
+class C3 {
+  public $p3;
+}
+$c3 = new C3();
+$c3->p3 = new C2();
+$c3->p3->p2 = new C1();
+$c3->p3->p2->a = 1;
+$c3->p3->p2->a .= 1;
+print $c3->p3->p2->a;
diff --git a/hphp/test/slow/object_property_expression/789.php b/hphp/test/slow/object_property_expression/789.php
index b6da15c49..a0d7bebd8 100644
--- a/hphp/test/slow/object_property_expression/789.php
+++ b/hphp/test/slow/object_property_expression/789.php
@@ -1,9 +1,47 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get C1
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C1
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C2 {  public function __get( $what ) {    echo "get C2
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C2
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C3 {  public function __get( $what) {    echo "get C3
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C3
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}$c3 = new C3();$c3->p3 = new C2();$c3->p3->p2 = new C1();$c3->p3->p2->a = 1;$c3->p3->p2->a .= 1;print $c3->p3->p2->a;
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get C1
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C1
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C2 {
+  public function __get( $what ) {
+    echo "get C2
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C2
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C3 {
+  public function __get( $what) {
+    echo "get C3
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C3
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+$c3 = new C3();
+$c3->p3 = new C2();
+$c3->p3->p2 = new C1();
+$c3->p3->p2->a = 1;
+$c3->p3->p2->a .= 1;
+print $c3->p3->p2->a;
diff --git a/hphp/test/slow/object_property_expression/790.php b/hphp/test/slow/object_property_expression/790.php
index b6da15c49..a0d7bebd8 100644
--- a/hphp/test/slow/object_property_expression/790.php
+++ b/hphp/test/slow/object_property_expression/790.php
@@ -1,9 +1,47 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get C1
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C1
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C2 {  public function __get( $what ) {    echo "get C2
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C2
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C3 {  public function __get( $what) {    echo "get C3
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C3
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}$c3 = new C3();$c3->p3 = new C2();$c3->p3->p2 = new C1();$c3->p3->p2->a = 1;$c3->p3->p2->a .= 1;print $c3->p3->p2->a;
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get C1
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C1
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C2 {
+  public function __get( $what ) {
+    echo "get C2
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C2
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C3 {
+  public function __get( $what) {
+    echo "get C3
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C3
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+$c3 = new C3();
+$c3->p3 = new C2();
+$c3->p3->p2 = new C1();
+$c3->p3->p2->a = 1;
+$c3->p3->p2->a .= 1;
+print $c3->p3->p2->a;
diff --git a/hphp/test/slow/object_property_expression/791.php b/hphp/test/slow/object_property_expression/791.php
index b6da15c49..a0d7bebd8 100644
--- a/hphp/test/slow/object_property_expression/791.php
+++ b/hphp/test/slow/object_property_expression/791.php
@@ -1,9 +1,47 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get C1
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C1
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C2 {  public function __get( $what ) {    echo "get C2
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C2
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C3 {  public function __get( $what) {    echo "get C3
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C3
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}$c3 = new C3();$c3->p3 = new C2();$c3->p3->p2 = new C1();$c3->p3->p2->a = 1;$c3->p3->p2->a .= 1;print $c3->p3->p2->a;
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get C1
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C1
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C2 {
+  public function __get( $what ) {
+    echo "get C2
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C2
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C3 {
+  public function __get( $what) {
+    echo "get C3
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C3
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+$c3 = new C3();
+$c3->p3 = new C2();
+$c3->p3->p2 = new C1();
+$c3->p3->p2->a = 1;
+$c3->p3->p2->a .= 1;
+print $c3->p3->p2->a;
diff --git a/hphp/test/slow/object_property_expression/792.php b/hphp/test/slow/object_property_expression/792.php
index 2b1ee4bd1..ba5b72f2e 100644
--- a/hphp/test/slow/object_property_expression/792.php
+++ b/hphp/test/slow/object_property_expression/792.php
@@ -1,5 +1,38 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}$c = new C1();$c->a += 1;print $c->a;$c->a += 10;print $c->a;$c->a -= 2;print $c->a;$c->a *= 3;print $c->a;$c->a /= 2;print $c->a;$c->a %= 8;print $c->a;$c->a <<= 3;print $c->a;$c->a >>= 2;print $c->a;$c->a ^= 18;print $c->a;$c->a &= 333;print $c->a;$c->a |= 7;print $c->a;
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+$c = new C1();
+$c->a += 1;
+print $c->a;
+$c->a += 10;
+print $c->a;
+$c->a -= 2;
+print $c->a;
+$c->a *= 3;
+print $c->a;
+$c->a /= 2;
+print $c->a;
+$c->a %= 8;
+print $c->a;
+$c->a <<= 3;
+print $c->a;
+$c->a >>= 2;
+print $c->a;
+$c->a ^= 18;
+print $c->a;
+$c->a &= 333;
+print $c->a;
+$c->a |= 7;
+print $c->a;
diff --git a/hphp/test/slow/object_property_expression/793.php b/hphp/test/slow/object_property_expression/793.php
index 088002320..652ec351c 100644
--- a/hphp/test/slow/object_property_expression/793.php
+++ b/hphp/test/slow/object_property_expression/793.php
@@ -1,7 +1,41 @@
 <?php
 
- class C1 {}class C2 {  public function __get( $what ) {    echo "get C2
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C2
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C3 {  public function __get( $what ) {    echo "get C3
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C3
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}function assign_ref(&$v) {  $v = 22;}$c3 = new C3();$c3->p3 = new C2();$c3->p3->p2 = new C1();$c3->p3->p2->a = 1;$c3->p3->p2->a .= 1;print $c3->p3->p2->a;assign_ref($c3->p3->p2->a);print $c3->p3->p2->a;
\ No newline at end of file
+class C1 {
+}
+class C2 {
+  public function __get( $what ) {
+    echo "get C2
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C2
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C3 {
+  public function __get( $what ) {
+    echo "get C3
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C3
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+function assign_ref(&$v) {
+  $v = 22;
+}
+$c3 = new C3();
+$c3->p3 = new C2();
+$c3->p3->p2 = new C1();
+$c3->p3->p2->a = 1;
+$c3->p3->p2->a .= 1;
+print $c3->p3->p2->a;
+assign_ref($c3->p3->p2->a);
+print $c3->p3->p2->a;
diff --git a/hphp/test/slow/object_property_expression/794.php b/hphp/test/slow/object_property_expression/794.php
index 18d8364b1..394ee6e47 100644
--- a/hphp/test/slow/object_property_expression/794.php
+++ b/hphp/test/slow/object_property_expression/794.php
@@ -1,9 +1,52 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get C1
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C1
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C2 {  public function __get( $what ) {    echo "get C2
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C2
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}class C3 {  public function __get( $what ) {    echo "get C3
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C3
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}function assign_ref(&$v) {  $v = 22;}$c3 = new C3();$c3->p3 = new C2();$c3->p3->p2 = new C1();$c3->p3->p2->a = 1;$c3->p3->p2->a .= 1;print $c3->p3->p2->a;assign_ref($c3->p3->p2->a);print $c3->p3->p2->a;
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get C1
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C1
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C2 {
+  public function __get( $what ) {
+    echo "get C2
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C2
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+class C3 {
+  public function __get( $what ) {
+    echo "get C3
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C3
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+function assign_ref(&$v) {
+  $v = 22;
+}
+$c3 = new C3();
+$c3->p3 = new C2();
+$c3->p3->p2 = new C1();
+$c3->p3->p2->a = 1;
+$c3->p3->p2->a .= 1;
+print $c3->p3->p2->a;
+assign_ref($c3->p3->p2->a);
+print $c3->p3->p2->a;
diff --git a/hphp/test/slow/object_property_expression/795.php b/hphp/test/slow/object_property_expression/795.php
index 79e026926..b07f8f50e 100644
--- a/hphp/test/slow/object_property_expression/795.php
+++ b/hphp/test/slow/object_property_expression/795.php
@@ -1,3 +1,15 @@
 <?php
 
- $b = 10;class C1 {  public function __get( $what ) {    global $b;    return $b;  }}$c1 = new C1();function assign_ref(&$lv) {  $lv = 8;}assign_ref($c1->a);var_dump($b);
\ No newline at end of file
+$b = 10;
+class C1 {
+  public function __get( $what ) {
+    global $b;
+    return $b;
+  }
+}
+$c1 = new C1();
+function assign_ref(&$lv) {
+  $lv = 8;
+}
+assign_ref($c1->a);
+var_dump($b);
diff --git a/hphp/test/slow/object_property_expression/796.php b/hphp/test/slow/object_property_expression/796.php
index b46a8fd11..0b848559e 100644
--- a/hphp/test/slow/object_property_expression/796.php
+++ b/hphp/test/slow/object_property_expression/796.php
@@ -1,5 +1,22 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get C1
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C1
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}$c1 = new C1();$c1->a = new C1();$c1->a->b = new C1();$c1->a->b->c = 10;var_dump($c1->a->b->c);$c1->a->b->c .= 10;var_dump($c1->a->b->c);
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get C1
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C1
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+$c1 = new C1();
+$c1->a = new C1();
+$c1->a->b = new C1();
+$c1->a->b->c = 10;
+var_dump($c1->a->b->c);
+$c1->a->b->c .= 10;
+var_dump($c1->a->b->c);
diff --git a/hphp/test/slow/object_property_expression/797.php b/hphp/test/slow/object_property_expression/797.php
index 615b12ccc..3e2990ab6 100644
--- a/hphp/test/slow/object_property_expression/797.php
+++ b/hphp/test/slow/object_property_expression/797.php
@@ -1,5 +1,24 @@
 <?php
 
- class C1 {  public function __get( $what ) {    echo "get C1
-";    return $this->_p[ $what ];  }  public function __set( $what, $value ) {    echo "set C1
-";    $this->_p[ $what ] = $value;  }  private $_p = array();}$c1 = new C1();$c1->a = new C1();$c1->a->b = new C1();for ($i = 0; $i < 2048; $i++) {  $c1->a->b->c = 10;}var_dump($c1->a->b->c);
\ No newline at end of file
+class C1 {
+  public function __get( $what ) {
+    echo "get C1
+";
+    return $this->_p[ $what ];
+  }
+  public function __set( $what, $value ) {
+    echo "set C1
+";
+    $this->_p[ $what ] = $value;
+  }
+  private $_p = array();
+}
+$c1 = new C1();
+$c1->a = new C1();
+$c1->a->b = new C1();
+for ($i = 0;
+ $i < 2048;
+ $i++) {
+  $c1->a->b->c = 10;
+}
+var_dump($c1->a->b->c);
diff --git a/hphp/test/slow/object_property_expression/798.php b/hphp/test/slow/object_property_expression/798.php
index 6be957371..811c6a26b 100644
--- a/hphp/test/slow/object_property_expression/798.php
+++ b/hphp/test/slow/object_property_expression/798.php
@@ -1,3 +1,34 @@
 <?php
 
- class Y {}class X {  public $a;  function __construct() {    $this->a = array('x' => new Y);  }  function bar() {    var_dump('bar');    $this->qq = new Y;    $this->qq->x = $this->qq->y = 1;    return $this->qq;  }}function foo() { var_dump('foo'); return 'foo'; }function test($x, $a, $s) {  $t = &$s->t;  unset($x->bar()->x);  unset($x->q->r->s->${foo()});  unset($x->y->a->b->c);  unset($x->a['x']->y->a->b->c);  unset($a['a']['y'][foo()]);  unset($a['b']->y->z);  unset($a->c->d);  var_dump($x, $a, $s);}test(new X, array(), false);
\ No newline at end of file
+class Y {
+}
+class X {
+  public $a;
+  function __construct() {
+    $this->a = array('x' => new Y);
+  }
+  function bar() {
+    var_dump('bar');
+    $this->qq = new Y;
+    $this->qq->x = $this->qq->y = 1;
+    return $this->qq;
+  }
+}
+function foo() {
+ var_dump('foo');
+ return 'foo';
+ }
+function test($x, $a, $s) {
+  $t = &$s->t;
+  unset($x->bar()->x);
+  unset($x->q->r->s->${
+foo()}
+);
+  unset($x->y->a->b->c);
+  unset($x->a['x']->y->a->b->c);
+  unset($a['a']['y'][foo()]);
+  unset($a['b']->y->z);
+  unset($a->c->d);
+  var_dump($x, $a, $s);
+}
+test(new X, array(), false);
diff --git a/hphp/test/slow/object_property_expression/799.php b/hphp/test/slow/object_property_expression/799.php
index 66570f5ec..bbf3c99db 100644
--- a/hphp/test/slow/object_property_expression/799.php
+++ b/hphp/test/slow/object_property_expression/799.php
@@ -1,3 +1,12 @@
 <?php
 
- class X {public $a = 3;function foo($t) {$$t = 5;var_dump($this->a);var_dump($this);}}$x = new X;$x->foo('this');
\ No newline at end of file
+class X {
+public $a = 3;
+function foo($t) {
+$$t = 5;
+var_dump($this->a);
+var_dump($this);
+}
+}
+$x = new X;
+$x->foo('this');
diff --git a/hphp/test/slow/object_property_expression/800.php b/hphp/test/slow/object_property_expression/800.php
index 438f47755..78fbbb812 100644
--- a/hphp/test/slow/object_property_expression/800.php
+++ b/hphp/test/slow/object_property_expression/800.php
@@ -1,3 +1,14 @@
 <?php
 
- class X {  public function foo($q) {    $s =& $this;    $s->q = $q;  }}function test() {  $x = new X;  $x->foo('hello');  var_dump($x);}test();
\ No newline at end of file
+class X {
+  public function foo($q) {
+    $s =& $this;
+    $s->q = $q;
+  }
+}
+function test() {
+  $x = new X;
+  $x->foo('hello');
+  var_dump($x);
+}
+test();
diff --git a/hphp/test/slow/object_property_expression/801.php b/hphp/test/slow/object_property_expression/801.php
index 190887650..aa3b6b7de 100644
--- a/hphp/test/slow/object_property_expression/801.php
+++ b/hphp/test/slow/object_property_expression/801.php
@@ -1,3 +1,22 @@
 <?php
 
- class X {  function ref(&$ref) { $ref = 1; }  function bar() {    $this->ref($this->priv);  }};class Y extends X { private $priv; }class Z extends Y {}$z = new Z;$z->bar();var_dump($z);$y = new Y;$y->bar();var_dump($y);
\ No newline at end of file
+class X {
+  function ref(&$ref) {
+ $ref = 1;
+ }
+  function bar() {
+    $this->ref($this->priv);
+  }
+}
+;
+class Y extends X {
+ private $priv;
+ }
+class Z extends Y {
+}
+$z = new Z;
+$z->bar();
+var_dump($z);
+$y = new Y;
+$y->bar();
+var_dump($y);
diff --git a/hphp/test/slow/object_property_expression/801.php.expectf b/hphp/test/slow/object_property_expression/801.php.expectf
index ae1d65fd9..1782029cd 100644
--- a/hphp/test/slow/object_property_expression/801.php.expectf
+++ b/hphp/test/slow/object_property_expression/801.php.expectf
@@ -4,4 +4,4 @@ object(Z)#1 (2) {
   ["priv"]=>
   int(1)
 }
-HipHop Fatal error: Cannot access private property Y::$priv in %s/hphp/test/slow/object_property_expression/801.php on line 3
+HipHop Fatal error: Cannot access private property Y::$priv in %s/hphp/test/slow/object_property_expression/801.php on line 8
diff --git a/hphp/test/slow/operation_types/1432.php b/hphp/test/slow/operation_types/1432.php
index 6ecbc2f10..013fc5757 100644
--- a/hphp/test/slow/operation_types/1432.php
+++ b/hphp/test/slow/operation_types/1432.php
@@ -1,3 +1,776 @@
 <?php
 
- $a = null; var_dump(+$a);$a = null; var_dump(-$a);$a = null; $b = null; var_dump($a + $b);$a = null; $b = true; var_dump($a + $b);$a = null; $b = 0; var_dump($a + $b);$a = null; $b = 1; var_dump($a + $b);$a = null; $b = 1.0; var_dump($a + $b);$a = null; $b = '1.0'; var_dump($a + $b);$a = null; $b = 'foo'; var_dump($a + $b);$a = null; $b = new Exception(); var_dump($a + $b);$a = null; $b = null; $b = 0; var_dump($a + $b);$a = null; $b = null; $b = 1; var_dump($a + $b);$a = null; $b = null; $b = 1.0; var_dump($a + $b);$a = null; $b = null; $b = '1.0'; var_dump($a + $b);$a = null; $b = null; $b = 'foo'; var_dump($a + $b);$a = null; $b = null; $b = new Exception(); var_dump($a + $b);$a = null; $b = null; $a += $b; var_dump($a);$a = null; $b = true; $a += $b; var_dump($a);$a = null; $b = 0; $a += $b; var_dump($a);$a = null; $b = 1; $a += $b; var_dump($a);$a = null; $b = 1.0; $a += $b; var_dump($a);$a = null; $b = '1.0'; $a += $b; var_dump($a);$a = null; $b = 'foo'; $a += $b; var_dump($a);$a = null; $b = new Exception(); $a += $b; var_dump($a);$a = null; $b = null; $b = 0; $a += $b; var_dump($a);$a = null; $b = null; $b = 1; $a += $b; var_dump($a);$a = null; $b = null; $b = 1.0; $a += $b; var_dump($a);$a = null; $b = null; $b = '1.0'; $a += $b; var_dump($a);$a = null; $b = null; $b = 'foo'; $a += $b; var_dump($a);$a = null; $b = null; $b = new Exception(); $a += $b; var_dump($a);$a = null; $b = null; var_dump($a - $b);$a = null; $b = true; var_dump($a - $b);$a = null; $b = 0; var_dump($a - $b);$a = null; $b = 1; var_dump($a - $b);$a = null; $b = 1.0; var_dump($a - $b);$a = null; $b = '1.0'; var_dump($a - $b);$a = null; $b = 'foo'; var_dump($a - $b);$a = null; $b = new Exception(); var_dump($a - $b);$a = null; $b = null; $b = 0; var_dump($a - $b);$a = null; $b = null; $b = 1; var_dump($a - $b);$a = null; $b = null; $b = 1.0; var_dump($a - $b);$a = null; $b = null; $b = '1.0'; var_dump($a - $b);$a = null; $b = null; $b = 'foo'; var_dump($a - $b);$a = null; $b = null; $b = new Exception(); var_dump($a - $b);$a = null; $b = null; $a -= $b; var_dump($a);$a = null; $b = true; $a -= $b; var_dump($a);$a = null; $b = 0; $a -= $b; var_dump($a);$a = null; $b = 1; $a -= $b; var_dump($a);$a = null; $b = 1.0; $a -= $b; var_dump($a);$a = null; $b = '1.0'; $a -= $b; var_dump($a);$a = null; $b = 'foo'; $a -= $b; var_dump($a);$a = null; $b = new Exception(); $a -= $b; var_dump($a);$a = null; $b = null; $b = 0; $a -= $b; var_dump($a);$a = null; $b = null; $b = 1; $a -= $b; var_dump($a);$a = null; $b = null; $b = 1.0; $a -= $b; var_dump($a);$a = null; $b = null; $b = '1.0'; $a -= $b; var_dump($a);$a = null; $b = null; $b = 'foo'; $a -= $b; var_dump($a);$a = null; $b = null; $b = new Exception(); $a -= $b; var_dump($a);$a = null; $b = null; var_dump($a * $b);$a = null; $b = true; var_dump($a * $b);$a = null; $b = 0; var_dump($a * $b);$a = null; $b = 1; var_dump($a * $b);$a = null; $b = 1.0; var_dump($a * $b);$a = null; $b = '1.0'; var_dump($a * $b);$a = null; $b = 'foo'; var_dump($a * $b);$a = null; $b = new Exception(); var_dump($a * $b);$a = null; $b = null; $b = 0; var_dump($a * $b);$a = null; $b = null; $b = 1; var_dump($a * $b);$a = null; $b = null; $b = 1.0; var_dump($a * $b);$a = null; $b = null; $b = '1.0'; var_dump($a * $b);$a = null; $b = null; $b = 'foo'; var_dump($a * $b);$a = null; $b = null; $b = new Exception(); var_dump($a * $b);$a = null; $b = null; $a *= $b; var_dump($a);$a = null; $b = true; $a *= $b; var_dump($a);$a = null; $b = 0; $a *= $b; var_dump($a);$a = null; $b = 1; $a *= $b; var_dump($a);$a = null; $b = 1.0; $a *= $b; var_dump($a);$a = null; $b = '1.0'; $a *= $b; var_dump($a);$a = null; $b = 'foo'; $a *= $b; var_dump($a);$a = null; $b = new Exception(); $a *= $b; var_dump($a);$a = null; $b = null; $b = 0; $a *= $b; var_dump($a);$a = null; $b = null; $b = 1; $a *= $b; var_dump($a);$a = null; $b = null; $b = 1.0; $a *= $b; var_dump($a);$a = null; $b = null; $b = '1.0'; $a *= $b; var_dump($a);$a = null; $b = null; $b = 'foo'; $a *= $b; var_dump($a);$a = null; $b = null; $b = new Exception(); $a *= $b; var_dump($a);$a = null; $b = true; var_dump($a / $b);$a = null; $b = 1; var_dump($a / $b);$a = null; $b = 1.0; var_dump($a / $b);$a = null; $b = '1.0'; var_dump($a / $b);$a = null; $b = null; $b = 1; var_dump($a / $b);$a = null; $b = null; $b = 1.0; var_dump($a / $b);$a = null; $b = null; $b = '1.0'; var_dump($a / $b);$a = null; $b = true; $a /= $b; var_dump($a);$a = null; $b = 1; $a /= $b; var_dump($a);$a = null; $b = 1.0; $a /= $b; var_dump($a);$a = null; $b = '1.0'; $a /= $b; var_dump($a);$a = null; $b = null; $b = 1; $a /= $b; var_dump($a);$a = null; $b = null; $b = 1.0; $a /= $b; var_dump($a);$a = null; $b = null; $b = '1.0'; $a /= $b; var_dump($a);$a = true; $b = null; var_dump($a + $b);$a = true; $b = true; var_dump($a + $b);$a = true; $b = 0; var_dump($a + $b);$a = true; $b = 1; var_dump($a + $b);$a = true; $b = 1.0; var_dump($a + $b);$a = true; $b = '1.0'; var_dump($a + $b);$a = true; $b = 'foo'; var_dump($a + $b);$a = true; $b = new Exception(); var_dump($a + $b);$a = true; $b = null; $b = 0; var_dump($a + $b);$a = true; $b = null; $b = 1; var_dump($a + $b);$a = true; $b = null; $b = 1.0; var_dump($a + $b);$a = true; $b = null; $b = '1.0'; var_dump($a + $b);$a = true; $b = null; $b = 'foo'; var_dump($a + $b);$a = true; $b = null; $b = new Exception(); var_dump($a + $b);$a = true; $b = null; $a += $b; var_dump($a);$a = true; $b = true; $a += $b; var_dump($a);$a = true; $b = 0; $a += $b; var_dump($a);$a = true; $b = 1; $a += $b; var_dump($a);$a = true; $b = 1.0; $a += $b; var_dump($a);$a = true; $b = '1.0'; $a += $b; var_dump($a);$a = true; $b = 'foo'; $a += $b; var_dump($a);$a = true; $b = new Exception(); $a += $b; var_dump($a);$a = true; $b = null; $b = 0; $a += $b; var_dump($a);$a = true; $b = null; $b = 1; $a += $b; var_dump($a);$a = true; $b = null; $b = 1.0; $a += $b; var_dump($a);$a = true; $b = null; $b = '1.0'; $a += $b; var_dump($a);$a = true; $b = null; $b = 'foo'; $a += $b; var_dump($a);$a = true; $b = null; $b = new Exception(); $a += $b; var_dump($a);$a = true; $b = null; var_dump($a - $b);$a = true; $b = true; var_dump($a - $b);$a = true; $b = 0; var_dump($a - $b);$a = true; $b = 1; var_dump($a - $b);$a = true; $b = 1.0; var_dump($a - $b);$a = true; $b = '1.0'; var_dump($a - $b);$a = true; $b = 'foo'; var_dump($a - $b);$a = true; $b = new Exception(); var_dump($a - $b);$a = true; $b = null; $b = 0; var_dump($a - $b);$a = true; $b = null; $b = 1; var_dump($a - $b);$a = true; $b = null; $b = 1.0; var_dump($a - $b);$a = true; $b = null; $b = '1.0'; var_dump($a - $b);$a = true; $b = null; $b = 'foo'; var_dump($a - $b);$a = true; $b = null; $b = new Exception(); var_dump($a - $b);$a = true; $b = null; $a -= $b; var_dump($a);$a = true; $b = true; $a -= $b; var_dump($a);$a = true; $b = 0; $a -= $b; var_dump($a);$a = true; $b = 1; $a -= $b; var_dump($a);$a = true; $b = 1.0; $a -= $b; var_dump($a);$a = true; $b = '1.0'; $a -= $b; var_dump($a);$a = true; $b = 'foo'; $a -= $b; var_dump($a);$a = true; $b = new Exception(); $a -= $b; var_dump($a);$a = true; $b = null; $b = 0; $a -= $b; var_dump($a);$a = true; $b = null; $b = 1; $a -= $b; var_dump($a);$a = true; $b = null; $b = 1.0; $a -= $b; var_dump($a);$a = true; $b = null; $b = '1.0'; $a -= $b; var_dump($a);$a = true; $b = null; $b = 'foo'; $a -= $b; var_dump($a);$a = true; $b = null; $b = new Exception(); $a -= $b; var_dump($a);$a = true; $b = null; var_dump($a * $b);$a = true; $b = true; var_dump($a * $b);$a = true; $b = 0; var_dump($a * $b);$a = true; $b = 1; var_dump($a * $b);$a = true; $b = 1.0; var_dump($a * $b);$a = true; $b = '1.0'; var_dump($a * $b);$a = true; $b = 'foo'; var_dump($a * $b);$a = true; $b = new Exception(); var_dump($a * $b);$a = true; $b = null; $b = 0; var_dump($a * $b);$a = true; $b = null; $b = 1; var_dump($a * $b);$a = true; $b = null; $b = 1.0; var_dump($a * $b);$a = true; $b = null; $b = '1.0'; var_dump($a * $b);$a = true; $b = null; $b = 'foo'; var_dump($a * $b);$a = true; $b = null; $b = new Exception(); var_dump($a * $b);$a = true; $b = null; $a *= $b; var_dump($a);$a = true; $b = true; $a *= $b; var_dump($a);$a = true; $b = 0; $a *= $b; var_dump($a);$a = true; $b = 1; $a *= $b; var_dump($a);$a = true; $b = 1.0; $a *= $b; var_dump($a);$a = true; $b = '1.0'; $a *= $b; var_dump($a);$a = true; $b = 'foo'; $a *= $b; var_dump($a);$a = true; $b = new Exception(); $a *= $b; var_dump($a);$a = true; $b = null; $b = 0; $a *= $b; var_dump($a);$a = true; $b = null; $b = 1; $a *= $b; var_dump($a);$a = true; $b = null; $b = 1.0; $a *= $b; var_dump($a);$a = true; $b = null; $b = '1.0'; $a *= $b; var_dump($a);$a = true; $b = null; $b = 'foo'; $a *= $b; var_dump($a);$a = true; $b = null; $b = new Exception(); $a *= $b; var_dump($a);$a = true; $b = true; var_dump($a / $b);$a = true; $b = 1; var_dump($a / $b);$a = true; $b = 1.0; var_dump($a / $b);$a = true; $b = '1.0'; var_dump($a / $b);$a = true; $b = null; $b = 1; var_dump($a / $b);$a = true; $b = null; $b = 1.0; var_dump($a / $b);$a = true; $b = null; $b = '1.0'; var_dump($a / $b);$a = true; $b = true; $a /= $b; var_dump($a);$a = true; $b = 1; $a /= $b; var_dump($a);$a = true; $b = 1.0; $a /= $b; var_dump($a);$a = true; $b = '1.0'; $a /= $b; var_dump($a);$a = true; $b = null; $b = 1; $a /= $b; var_dump($a);$a = true; $b = null; $b = 1.0; $a /= $b; var_dump($a);$a = true; $b = null; $b = '1.0'; $a /= $b; var_dump($a);
\ No newline at end of file
+$a = null;
+ var_dump(+$a);
+$a = null;
+ var_dump(-$a);
+$a = null;
+ $b = null;
+ var_dump($a + $b);
+$a = null;
+ $b = true;
+ var_dump($a + $b);
+$a = null;
+ $b = 0;
+ var_dump($a + $b);
+$a = null;
+ $b = 1;
+ var_dump($a + $b);
+$a = null;
+ $b = 1.0;
+ var_dump($a + $b);
+$a = null;
+ $b = '1.0';
+ var_dump($a + $b);
+$a = null;
+ $b = 'foo';
+ var_dump($a + $b);
+$a = null;
+ $b = new Exception();
+ var_dump($a + $b);
+$a = null;
+ $b = null;
+ $b = 0;
+ var_dump($a + $b);
+$a = null;
+ $b = null;
+ $b = 1;
+ var_dump($a + $b);
+$a = null;
+ $b = null;
+ $b = 1.0;
+ var_dump($a + $b);
+$a = null;
+ $b = null;
+ $b = '1.0';
+ var_dump($a + $b);
+$a = null;
+ $b = null;
+ $b = 'foo';
+ var_dump($a + $b);
+$a = null;
+ $b = null;
+ $b = new Exception();
+ var_dump($a + $b);
+$a = null;
+ $b = null;
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = true;
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = 0;
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = 1;
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = 1.0;
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = '1.0';
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = 'foo';
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = new Exception();
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 0;
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 1;
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 1.0;
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = '1.0';
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 'foo';
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = new Exception();
+ $a += $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ var_dump($a - $b);
+$a = null;
+ $b = true;
+ var_dump($a - $b);
+$a = null;
+ $b = 0;
+ var_dump($a - $b);
+$a = null;
+ $b = 1;
+ var_dump($a - $b);
+$a = null;
+ $b = 1.0;
+ var_dump($a - $b);
+$a = null;
+ $b = '1.0';
+ var_dump($a - $b);
+$a = null;
+ $b = 'foo';
+ var_dump($a - $b);
+$a = null;
+ $b = new Exception();
+ var_dump($a - $b);
+$a = null;
+ $b = null;
+ $b = 0;
+ var_dump($a - $b);
+$a = null;
+ $b = null;
+ $b = 1;
+ var_dump($a - $b);
+$a = null;
+ $b = null;
+ $b = 1.0;
+ var_dump($a - $b);
+$a = null;
+ $b = null;
+ $b = '1.0';
+ var_dump($a - $b);
+$a = null;
+ $b = null;
+ $b = 'foo';
+ var_dump($a - $b);
+$a = null;
+ $b = null;
+ $b = new Exception();
+ var_dump($a - $b);
+$a = null;
+ $b = null;
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = true;
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = 0;
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = 1;
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = 1.0;
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = '1.0';
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = 'foo';
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = new Exception();
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 0;
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 1;
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 1.0;
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = '1.0';
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 'foo';
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = new Exception();
+ $a -= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ var_dump($a * $b);
+$a = null;
+ $b = true;
+ var_dump($a * $b);
+$a = null;
+ $b = 0;
+ var_dump($a * $b);
+$a = null;
+ $b = 1;
+ var_dump($a * $b);
+$a = null;
+ $b = 1.0;
+ var_dump($a * $b);
+$a = null;
+ $b = '1.0';
+ var_dump($a * $b);
+$a = null;
+ $b = 'foo';
+ var_dump($a * $b);
+$a = null;
+ $b = new Exception();
+ var_dump($a * $b);
+$a = null;
+ $b = null;
+ $b = 0;
+ var_dump($a * $b);
+$a = null;
+ $b = null;
+ $b = 1;
+ var_dump($a * $b);
+$a = null;
+ $b = null;
+ $b = 1.0;
+ var_dump($a * $b);
+$a = null;
+ $b = null;
+ $b = '1.0';
+ var_dump($a * $b);
+$a = null;
+ $b = null;
+ $b = 'foo';
+ var_dump($a * $b);
+$a = null;
+ $b = null;
+ $b = new Exception();
+ var_dump($a * $b);
+$a = null;
+ $b = null;
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = true;
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = 0;
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = 1;
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = 1.0;
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = '1.0';
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = 'foo';
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = new Exception();
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 0;
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 1;
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 1.0;
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = '1.0';
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 'foo';
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = new Exception();
+ $a *= $b;
+ var_dump($a);
+$a = null;
+ $b = true;
+ var_dump($a / $b);
+$a = null;
+ $b = 1;
+ var_dump($a / $b);
+$a = null;
+ $b = 1.0;
+ var_dump($a / $b);
+$a = null;
+ $b = '1.0';
+ var_dump($a / $b);
+$a = null;
+ $b = null;
+ $b = 1;
+ var_dump($a / $b);
+$a = null;
+ $b = null;
+ $b = 1.0;
+ var_dump($a / $b);
+$a = null;
+ $b = null;
+ $b = '1.0';
+ var_dump($a / $b);
+$a = null;
+ $b = true;
+ $a /= $b;
+ var_dump($a);
+$a = null;
+ $b = 1;
+ $a /= $b;
+ var_dump($a);
+$a = null;
+ $b = 1.0;
+ $a /= $b;
+ var_dump($a);
+$a = null;
+ $b = '1.0';
+ $a /= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 1;
+ $a /= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = 1.0;
+ $a /= $b;
+ var_dump($a);
+$a = null;
+ $b = null;
+ $b = '1.0';
+ $a /= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ var_dump($a + $b);
+$a = true;
+ $b = true;
+ var_dump($a + $b);
+$a = true;
+ $b = 0;
+ var_dump($a + $b);
+$a = true;
+ $b = 1;
+ var_dump($a + $b);
+$a = true;
+ $b = 1.0;
+ var_dump($a + $b);
+$a = true;
+ $b = '1.0';
+ var_dump($a + $b);
+$a = true;
+ $b = 'foo';
+ var_dump($a + $b);
+$a = true;
+ $b = new Exception();
+ var_dump($a + $b);
+$a = true;
+ $b = null;
+ $b = 0;
+ var_dump($a + $b);
+$a = true;
+ $b = null;
+ $b = 1;
+ var_dump($a + $b);
+$a = true;
+ $b = null;
+ $b = 1.0;
+ var_dump($a + $b);
+$a = true;
+ $b = null;
+ $b = '1.0';
+ var_dump($a + $b);
+$a = true;
+ $b = null;
+ $b = 'foo';
+ var_dump($a + $b);
+$a = true;
+ $b = null;
+ $b = new Exception();
+ var_dump($a + $b);
+$a = true;
+ $b = null;
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = true;
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = 0;
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = 1;
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = 1.0;
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = '1.0';
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = 'foo';
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = new Exception();
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 0;
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 1;
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 1.0;
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = '1.0';
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 'foo';
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = new Exception();
+ $a += $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ var_dump($a - $b);
+$a = true;
+ $b = true;
+ var_dump($a - $b);
+$a = true;
+ $b = 0;
+ var_dump($a - $b);
+$a = true;
+ $b = 1;
+ var_dump($a - $b);
+$a = true;
+ $b = 1.0;
+ var_dump($a - $b);
+$a = true;
+ $b = '1.0';
+ var_dump($a - $b);
+$a = true;
+ $b = 'foo';
+ var_dump($a - $b);
+$a = true;
+ $b = new Exception();
+ var_dump($a - $b);
+$a = true;
+ $b = null;
+ $b = 0;
+ var_dump($a - $b);
+$a = true;
+ $b = null;
+ $b = 1;
+ var_dump($a - $b);
+$a = true;
+ $b = null;
+ $b = 1.0;
+ var_dump($a - $b);
+$a = true;
+ $b = null;
+ $b = '1.0';
+ var_dump($a - $b);
+$a = true;
+ $b = null;
+ $b = 'foo';
+ var_dump($a - $b);
+$a = true;
+ $b = null;
+ $b = new Exception();
+ var_dump($a - $b);
+$a = true;
+ $b = null;
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = true;
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = 0;
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = 1;
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = 1.0;
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = '1.0';
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = 'foo';
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = new Exception();
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 0;
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 1;
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 1.0;
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = '1.0';
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 'foo';
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = new Exception();
+ $a -= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ var_dump($a * $b);
+$a = true;
+ $b = true;
+ var_dump($a * $b);
+$a = true;
+ $b = 0;
+ var_dump($a * $b);
+$a = true;
+ $b = 1;
+ var_dump($a * $b);
+$a = true;
+ $b = 1.0;
+ var_dump($a * $b);
+$a = true;
+ $b = '1.0';
+ var_dump($a * $b);
+$a = true;
+ $b = 'foo';
+ var_dump($a * $b);
+$a = true;
+ $b = new Exception();
+ var_dump($a * $b);
+$a = true;
+ $b = null;
+ $b = 0;
+ var_dump($a * $b);
+$a = true;
+ $b = null;
+ $b = 1;
+ var_dump($a * $b);
+$a = true;
+ $b = null;
+ $b = 1.0;
+ var_dump($a * $b);
+$a = true;
+ $b = null;
+ $b = '1.0';
+ var_dump($a * $b);
+$a = true;
+ $b = null;
+ $b = 'foo';
+ var_dump($a * $b);
+$a = true;
+ $b = null;
+ $b = new Exception();
+ var_dump($a * $b);
+$a = true;
+ $b = null;
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = true;
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = 0;
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = 1;
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = 1.0;
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = '1.0';
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = 'foo';
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = new Exception();
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 0;
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 1;
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 1.0;
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = '1.0';
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 'foo';
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = new Exception();
+ $a *= $b;
+ var_dump($a);
+$a = true;
+ $b = true;
+ var_dump($a / $b);
+$a = true;
+ $b = 1;
+ var_dump($a / $b);
+$a = true;
+ $b = 1.0;
+ var_dump($a / $b);
+$a = true;
+ $b = '1.0';
+ var_dump($a / $b);
+$a = true;
+ $b = null;
+ $b = 1;
+ var_dump($a / $b);
+$a = true;
+ $b = null;
+ $b = 1.0;
+ var_dump($a / $b);
+$a = true;
+ $b = null;
+ $b = '1.0';
+ var_dump($a / $b);
+$a = true;
+ $b = true;
+ $a /= $b;
+ var_dump($a);
+$a = true;
+ $b = 1;
+ $a /= $b;
+ var_dump($a);
+$a = true;
+ $b = 1.0;
+ $a /= $b;
+ var_dump($a);
+$a = true;
+ $b = '1.0';
+ $a /= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 1;
+ $a /= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = 1.0;
+ $a /= $b;
+ var_dump($a);
+$a = true;
+ $b = null;
+ $b = '1.0';
+ $a /= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/operation_types/1433.php b/hphp/test/slow/operation_types/1433.php
index 3dc8bdbbc..4bc2d4196 100644
--- a/hphp/test/slow/operation_types/1433.php
+++ b/hphp/test/slow/operation_types/1433.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(1 / 1.7976931348623157e+308 || false);
\ No newline at end of file
+var_dump(1 / 1.7976931348623157e+308 || false);
diff --git a/hphp/test/slow/operation_types/1434.php b/hphp/test/slow/operation_types/1434.php
index 6077f6d45..a94d28088 100644
--- a/hphp/test/slow/operation_types/1434.php
+++ b/hphp/test/slow/operation_types/1434.php
@@ -1,3 +1,14 @@
 <?php
 
- function foo() {  return '1';}function bar() {  $a = 1;  $a += foo();  var_dump($a);  $b = 1;  $b -= foo();  var_dump($b);}bar();
\ No newline at end of file
+function foo() {
+  return '1';
+}
+function bar() {
+  $a = 1;
+  $a += foo();
+  var_dump($a);
+  $b = 1;
+  $b -= foo();
+  var_dump($b);
+}
+bar();
diff --git a/hphp/test/slow/operation_types/1435.php b/hphp/test/slow/operation_types/1435.php
index 33bc67c64..72e76ef62 100644
--- a/hphp/test/slow/operation_types/1435.php
+++ b/hphp/test/slow/operation_types/1435.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = null;$a += new Exception();var_dump($a);
\ No newline at end of file
+$a = null;
+$a += new Exception();
+var_dump($a);
diff --git a/hphp/test/slow/parser/1849.php b/hphp/test/slow/parser/1849.php
index 9baf87518..20fc06c2c 100644
--- a/hphp/test/slow/parser/1849.php
+++ b/hphp/test/slow/parser/1849.php
@@ -1,3 +1,6 @@
 <?php
 
- function foo() { return array(1, 2, 3);} var_dump(foo()[2]);
\ No newline at end of file
+function foo() {
+ return array(1, 2, 3);
+}
+ var_dump(foo()[2]);
diff --git a/hphp/test/slow/parser/1850.php b/hphp/test/slow/parser/1850.php
index 6b5fd6765..a35d12f88 100644
--- a/hphp/test/slow/parser/1850.php
+++ b/hphp/test/slow/parser/1850.php
@@ -1,3 +1,8 @@
 <?php
 
- :test::go();class :test {  static function go() {    echo "Everything's cool\n";  }}
\ No newline at end of file
+:test::go();
+class :test {
+  static function go() {
+    echo "Everything's cool\n";
+  }
+}
diff --git a/hphp/test/slow/parser/1851.php b/hphp/test/slow/parser/1851.php
index 794188b43..42a33e8a6 100644
--- a/hphp/test/slow/parser/1851.php
+++ b/hphp/test/slow/parser/1851.php
@@ -1,15 +1,23 @@
 <?php
 
-
 class Foo {
   public $a;
   static public $b;
   static public $c;
 }
 $foo = new Foo;
-$foo->a = function ($x) { echo '!' . $x; };
+$foo->a = function ($x) {
+ echo '!' . $x;
+ }
+;
 ($foo->a)("foo\n");
-Foo::$b = function ($x) { echo '?' . $x; };
+Foo::$b = function ($x) {
+ echo '?' . $x;
+ }
+;
 (Foo::$b)("bar\n");
-Foo::$c[0] = function ($x) { echo '.' . $x; };
+Foo::$c[0] = function ($x) {
+ echo '.' . $x;
+ }
+;
 (Foo::$c[0])("baz\n");
diff --git a/hphp/test/slow/parser/1852.php b/hphp/test/slow/parser/1852.php
index f130f7310..6f7c88a2f 100644
--- a/hphp/test/slow/parser/1852.php
+++ b/hphp/test/slow/parser/1852.php
@@ -1,6 +1,5 @@
 <?php
 
-
 ($a) = 1;
 var_dump($a);
 $b = array();
diff --git a/hphp/test/slow/perfect_virtual/76.php b/hphp/test/slow/perfect_virtual/76.php
index 21ec2a822..2ce520941 100644
--- a/hphp/test/slow/perfect_virtual/76.php
+++ b/hphp/test/slow/perfect_virtual/76.php
@@ -1,3 +1,19 @@
 <?php
 
- class A { function foo() { var_dump(__CLASS__);}} class B extends A { function foo() { var_dump(__CLASS__);}} function bar() {   $obj = new A; $obj->foo();  $obj = new B; $obj->foo();} bar();
\ No newline at end of file
+class A {
+ function foo() {
+ var_dump(__CLASS__);
+}
+}
+ class B extends A {
+ function foo() {
+ var_dump(__CLASS__);
+}
+}
+ function bar() {
+   $obj = new A;
+ $obj->foo();
+  $obj = new B;
+ $obj->foo();
+}
+ bar();
diff --git a/hphp/test/slow/perfect_virtual/77.php b/hphp/test/slow/perfect_virtual/77.php
index c841d3629..b9f6086de 100644
--- a/hphp/test/slow/perfect_virtual/77.php
+++ b/hphp/test/slow/perfect_virtual/77.php
@@ -1,3 +1,19 @@
 <?php
 
- class A { function foo($a = 123) { var_dump(__CLASS__);}} class B extends A { function foo($b = 123) { var_dump(__CLASS__);}} function bar() {   $obj = new A; $obj->foo();  $obj = new B; $obj->foo();} bar();
\ No newline at end of file
+class A {
+ function foo($a = 123) {
+ var_dump(__CLASS__);
+}
+}
+ class B extends A {
+ function foo($b = 123) {
+ var_dump(__CLASS__);
+}
+}
+ function bar() {
+   $obj = new A;
+ $obj->foo();
+  $obj = new B;
+ $obj->foo();
+}
+ bar();
diff --git a/hphp/test/slow/perfect_virtual/78.php b/hphp/test/slow/perfect_virtual/78.php
index 013b647a5..7763e5fa3 100644
--- a/hphp/test/slow/perfect_virtual/78.php
+++ b/hphp/test/slow/perfect_virtual/78.php
@@ -1,3 +1,21 @@
 <?php
 
- class A { function foo() { $args = func_get_args(); var_dump(__CLASS__, $args);}} class B extends A { function foo() { $args = func_get_args(); var_dump(__CLASS__, $args);}} function bar() {   $obj = new A; $obj->foo(123);  $obj = new B; $obj->foo(123, 456);} bar();
\ No newline at end of file
+class A {
+ function foo() {
+ $args = func_get_args();
+ var_dump(__CLASS__, $args);
+}
+}
+ class B extends A {
+ function foo() {
+ $args = func_get_args();
+ var_dump(__CLASS__, $args);
+}
+}
+ function bar() {
+   $obj = new A;
+ $obj->foo(123);
+  $obj = new B;
+ $obj->foo(123, 456);
+}
+ bar();
diff --git a/hphp/test/slow/perfect_virtual/79.php b/hphp/test/slow/perfect_virtual/79.php
index 9b061165e..5f73231c1 100644
--- a/hphp/test/slow/perfect_virtual/79.php
+++ b/hphp/test/slow/perfect_virtual/79.php
@@ -1,3 +1,21 @@
 <?php
 
- class A { const X=1; function foo($a = self::X) { var_dump($a);}} class B extends A { const X=2; function foo($b = self::X) { var_dump($b);}} function bar() {   $obj = new A; $obj->foo();  $obj = new B; $obj->foo();} bar();
\ No newline at end of file
+class A {
+ const X=1;
+ function foo($a = self::X) {
+ var_dump($a);
+}
+}
+ class B extends A {
+ const X=2;
+ function foo($b = self::X) {
+ var_dump($b);
+}
+}
+ function bar() {
+   $obj = new A;
+ $obj->foo();
+  $obj = new B;
+ $obj->foo();
+}
+ bar();
diff --git a/hphp/test/slow/perfect_virtual/80.php b/hphp/test/slow/perfect_virtual/80.php
index 01698e64b..7d16a17ca 100644
--- a/hphp/test/slow/perfect_virtual/80.php
+++ b/hphp/test/slow/perfect_virtual/80.php
@@ -1,3 +1,17 @@
 <?php
 
- class X {  function foo($a) { return $a; }}class Y extends X {  function &foo($a) { return $a; }}function test(X $x) {  $y = $x->foo(5);  return ++$y;}test(new Y);
\ No newline at end of file
+class X {
+  function foo($a) {
+ return $a;
+ }
+}
+class Y extends X {
+  function &foo($a) {
+ return $a;
+ }
+}
+function test(X $x) {
+  $y = $x->foo(5);
+  return ++$y;
+}
+test(new Y);
diff --git a/hphp/test/slow/predefined/68.php b/hphp/test/slow/predefined/68.php
index 40a3def07..dbe78b36d 100644
--- a/hphp/test/slow/predefined/68.php
+++ b/hphp/test/slow/predefined/68.php
@@ -1,6 +1,3 @@
 <?php
 
- 
-
-
-var_dump(/*__FILE__, */__LINE__);
\ No newline at end of file
+var_dump(/*__FILE__, */__LINE__);
diff --git a/hphp/test/slow/predefined/68.php.expect b/hphp/test/slow/predefined/68.php.expect
index 977cefa37..91ccc006f 100644
--- a/hphp/test/slow/predefined/68.php.expect
+++ b/hphp/test/slow/predefined/68.php.expect
@@ -1 +1 @@
-int(6)
+int(3)
diff --git a/hphp/test/slow/predefined/69.php b/hphp/test/slow/predefined/69.php
index 6f9a839b3..f0480d8ba 100644
--- a/hphp/test/slow/predefined/69.php
+++ b/hphp/test/slow/predefined/69.php
@@ -1,3 +1,7 @@
 <?php
 
- function Test() { var_dump(__FUNCTION__);} var_dump(__FUNCTION__); test();
\ No newline at end of file
+function Test() {
+ var_dump(__FUNCTION__);
+}
+ var_dump(__FUNCTION__);
+ test();
diff --git a/hphp/test/slow/predefined/70.php b/hphp/test/slow/predefined/70.php
index c9e111033..ad58df237 100644
--- a/hphp/test/slow/predefined/70.php
+++ b/hphp/test/slow/predefined/70.php
@@ -1,3 +1,17 @@
 <?php
 
- class A { function TestR() { var_dump(__CLASS__, __METHOD__);} static function Testm() { var_dump(__CLASS__, __METHOD__);}} function Testf() { var_dump(__CLASS__, __METHOD__);} testf(); A::testm(); $obj = new A(); $obj->testr();
\ No newline at end of file
+class A {
+ function TestR() {
+ var_dump(__CLASS__, __METHOD__);
+}
+ static function Testm() {
+ var_dump(__CLASS__, __METHOD__);
+}
+}
+ function Testf() {
+ var_dump(__CLASS__, __METHOD__);
+}
+ testf();
+ A::testm();
+ $obj = new A();
+ $obj->testr();
diff --git a/hphp/test/slow/predefined/71.php b/hphp/test/slow/predefined/71.php
index 324178434..da8935807 100644
--- a/hphp/test/slow/predefined/71.php
+++ b/hphp/test/slow/predefined/71.php
@@ -1,3 +1,6 @@
 <?php
 
- class A { const Foo = __METHOD__;} var_dump(A::Foo);
\ No newline at end of file
+class A {
+ const Foo = __METHOD__;
+}
+ var_dump(A::Foo);
diff --git a/hphp/test/slow/print/1441.php b/hphp/test/slow/print/1441.php
index 046692233..6f2fe4315 100644
--- a/hphp/test/slow/print/1441.php
+++ b/hphp/test/slow/print/1441.php
@@ -1,3 +1,287 @@
 <?php
 
- echo(!null);echo(!true);echo(!false);echo(!0);echo(!1);echo(!1.2);echo(!"");echo(!"0");echo(!"1");echo(!"1.2");echo(!'');echo(!'0');echo(!'1');echo(!'1.2');echo(!__LINE__);echo(!__FUNCTION__);echo(!0x10);echo(!010);echo(!"0x10");echo(!"010");echo(+null);echo(+true);echo(+false);echo(+0);echo(+1);echo(+1.2);echo(+"");echo(+"0");echo(+"1");echo(+"1.2");echo(+'');echo(+'0');echo(+'1');echo(+'1.2');echo(+__LINE__);echo(+__FUNCTION__);echo(+0x10);echo(+010);echo(+"0x10");echo(+"010");echo(-null);echo(-true);echo(-false);echo(-0);echo(-1);echo(-1.2);echo(-"");echo(-"0");echo(-"1");echo(-"1.2");echo(-'');echo(-'0');echo(-'1');echo(-'1.2');echo(-__LINE__);echo(-__FUNCTION__);echo(-0x10);echo(-010);echo(-"0x10");echo(-"010");echo(~0);echo(~1);echo(~1.2);echo(~"");echo(~"0");echo(~"1");echo(~"1.2");echo(~'');echo(~'0');echo(~'1');echo(~'1.2');echo(~__LINE__);echo(~__FUNCTION__);echo(~0x10);echo(~010);echo(~"0x10");echo(~"010");echo((null));echo((true));echo((false));echo((0));echo((1));echo((1.2));echo((""));echo(("0"));echo(("1"));echo(("1.2"));echo((''));echo(('0'));echo(('1'));echo(('1.2'));echo((__LINE__));echo((__FUNCTION__));echo((0x10));echo((010));echo(("0x10"));echo(("010"));echo((int)null);echo((int)true);echo((int)false);echo((int)0);echo((int)1);echo((int)1.2);echo((int)"");echo((int)"0");echo((int)"1");echo((int)"1.2");echo((int)'');echo((int)'0');echo((int)'1');echo((int)'1.2');echo((int)__LINE__);echo((int)__FUNCTION__);echo((int)0x10);echo((int)010);echo((int)"0x10");echo((int)"010");echo((integer)null);echo((integer)true);echo((integer)false);echo((integer)0);echo((integer)1);echo((integer)1.2);echo((integer)"");echo((integer)"0");echo((integer)"1");echo((integer)"1.2");echo((integer)'');echo((integer)'0');echo((integer)'1');echo((integer)'1.2');echo((integer)__LINE__);echo((integer)__FUNCTION__);echo((integer)0x10);echo((integer)010);echo((integer)"0x10");echo((integer)"010");echo((bool)null);echo((bool)true);echo((bool)false);echo((bool)0);echo((bool)1);echo((bool)1.2);echo((bool)"");echo((bool)"0");echo((bool)"1");echo((bool)"1.2");echo((bool)'');echo((bool)'0');echo((bool)'1');echo((bool)'1.2');echo((bool)__LINE__);echo((bool)__FUNCTION__);echo((bool)0x10);echo((bool)010);echo((bool)"0x10");echo((bool)"010");echo((boolean)null);echo((boolean)true);echo((boolean)false);echo((boolean)0);echo((boolean)1);echo((boolean)1.2);echo((boolean)"");echo((boolean)"0");echo((boolean)"1");echo((boolean)"1.2");echo((boolean)'');echo((boolean)'0');echo((boolean)'1');echo((boolean)'1.2');echo((boolean)__LINE__);echo((boolean)__FUNCTION__);echo((boolean)0x10);echo((boolean)010);echo((boolean)"0x10");echo((boolean)"010");echo((float)null);echo((float)true);echo((float)false);echo((float)0);echo((float)1);echo((float)1.2);echo((float)"");echo((float)"0");echo((float)"1");echo((float)"1.2");echo((float)'');echo((float)'0');echo((float)'1');echo((float)'1.2');echo((float)__LINE__);echo((float)__FUNCTION__);echo((float)0x10);echo((float)010);echo((float)"0x10");echo((float)"010");echo((double)null);echo((double)true);echo((double)false);echo((double)0);echo((double)1);echo((double)1.2);echo((double)"");echo((double)"0");echo((double)"1");echo((double)"1.2");echo((double)'');echo((double)'0');echo((double)'1');echo((double)'1.2');echo((double)__LINE__);echo((double)__FUNCTION__);echo((double)0x10);echo((double)010);echo((double)"0x10");echo((double)"010");echo((real)null);echo((real)true);echo((real)false);echo((real)0);echo((real)1);echo((real)1.2);echo((real)"");echo((real)"0");echo((real)"1");echo((real)"1.2");echo((real)'');echo((real)'0');echo((real)'1');echo((real)'1.2');echo((real)__LINE__);echo((real)__FUNCTION__);echo((real)0x10);echo((real)010);echo((real)"0x10");echo((real)"010");echo((string)null);echo((string)true);echo((string)false);echo((string)0);echo((string)1);echo((string)1.2);echo((string)"");echo((string)"0");echo((string)"1");echo((string)"1.2");echo((string)'');echo((string)'0');echo((string)'1');echo((string)'1.2');echo((string)__LINE__);echo((string)__FUNCTION__);echo((string)0x10);echo((string)010);echo((string)"0x10");echo((string)"010");echo(1.7e+319);echo(!1.7e+319);echo(+1.7e+319);echo(-1.7e+319);echo(~1.7e+319);echo((1.7e+319));echo((int)1.7e+319);echo((integer)1.7e+319);echo((bool)1.7e+319);echo((boolean)1.7e+319);echo((float)1.7e+319);echo((double)1.7e+319);echo((real)1.7e+319);echo((string)1.7e+319);echo("1.7e+319");echo(!"1.7e+319");echo(+"1.7e+319");echo(-"1.7e+319");echo(~"1.7e+319");echo(("1.7e+319"));echo((int)"1.7e+319");echo((integer)"1.7e+319");echo((bool)"1.7e+319");echo((boolean)"1.7e+319");echo((float)"1.7e+319");echo((double)"1.7e+319");echo((real)"1.7e+319");echo((string)"1.7e+319");
\ No newline at end of file
+echo(!null);
+echo(!true);
+echo(!false);
+echo(!0);
+echo(!1);
+echo(!1.2);
+echo(!"");
+echo(!"0");
+echo(!"1");
+echo(!"1.2");
+echo(!'');
+echo(!'0');
+echo(!'1');
+echo(!'1.2');
+echo(!__LINE__);
+echo(!__FUNCTION__);
+echo(!0x10);
+echo(!010);
+echo(!"0x10");
+echo(!"010");
+echo(+null);
+echo(+true);
+echo(+false);
+echo(+0);
+echo(+1);
+echo(+1.2);
+echo(+"");
+echo(+"0");
+echo(+"1");
+echo(+"1.2");
+echo(+'');
+echo(+'0');
+echo(+'1');
+echo(+'1.2');
+echo(+__LINE__);
+echo(+__FUNCTION__);
+echo(+0x10);
+echo(+010);
+echo(+"0x10");
+echo(+"010");
+echo(-null);
+echo(-true);
+echo(-false);
+echo(-0);
+echo(-1);
+echo(-1.2);
+echo(-"");
+echo(-"0");
+echo(-"1");
+echo(-"1.2");
+echo(-'');
+echo(-'0');
+echo(-'1');
+echo(-'1.2');
+echo(-__LINE__);
+echo(-__FUNCTION__);
+echo(-0x10);
+echo(-010);
+echo(-"0x10");
+echo(-"010");
+echo(~0);
+echo(~1);
+echo(~1.2);
+echo(~"");
+echo(~"0");
+echo(~"1");
+echo(~"1.2");
+echo(~'');
+echo(~'0');
+echo(~'1');
+echo(~'1.2');
+echo(~__LINE__);
+echo(~__FUNCTION__);
+echo(~0x10);
+echo(~010);
+echo(~"0x10");
+echo(~"010");
+echo((null));
+echo((true));
+echo((false));
+echo((0));
+echo((1));
+echo((1.2));
+echo((""));
+echo(("0"));
+echo(("1"));
+echo(("1.2"));
+echo((''));
+echo(('0'));
+echo(('1'));
+echo(('1.2'));
+echo((__LINE__));
+echo((__FUNCTION__));
+echo((0x10));
+echo((010));
+echo(("0x10"));
+echo(("010"));
+echo((int)null);
+echo((int)true);
+echo((int)false);
+echo((int)0);
+echo((int)1);
+echo((int)1.2);
+echo((int)"");
+echo((int)"0");
+echo((int)"1");
+echo((int)"1.2");
+echo((int)'');
+echo((int)'0');
+echo((int)'1');
+echo((int)'1.2');
+echo((int)__LINE__);
+echo((int)__FUNCTION__);
+echo((int)0x10);
+echo((int)010);
+echo((int)"0x10");
+echo((int)"010");
+echo((integer)null);
+echo((integer)true);
+echo((integer)false);
+echo((integer)0);
+echo((integer)1);
+echo((integer)1.2);
+echo((integer)"");
+echo((integer)"0");
+echo((integer)"1");
+echo((integer)"1.2");
+echo((integer)'');
+echo((integer)'0');
+echo((integer)'1');
+echo((integer)'1.2');
+echo((integer)__LINE__);
+echo((integer)__FUNCTION__);
+echo((integer)0x10);
+echo((integer)010);
+echo((integer)"0x10");
+echo((integer)"010");
+echo((bool)null);
+echo((bool)true);
+echo((bool)false);
+echo((bool)0);
+echo((bool)1);
+echo((bool)1.2);
+echo((bool)"");
+echo((bool)"0");
+echo((bool)"1");
+echo((bool)"1.2");
+echo((bool)'');
+echo((bool)'0');
+echo((bool)'1');
+echo((bool)'1.2');
+echo((bool)__LINE__);
+echo((bool)__FUNCTION__);
+echo((bool)0x10);
+echo((bool)010);
+echo((bool)"0x10");
+echo((bool)"010");
+echo((boolean)null);
+echo((boolean)true);
+echo((boolean)false);
+echo((boolean)0);
+echo((boolean)1);
+echo((boolean)1.2);
+echo((boolean)"");
+echo((boolean)"0");
+echo((boolean)"1");
+echo((boolean)"1.2");
+echo((boolean)'');
+echo((boolean)'0');
+echo((boolean)'1');
+echo((boolean)'1.2');
+echo((boolean)__LINE__);
+echo((boolean)__FUNCTION__);
+echo((boolean)0x10);
+echo((boolean)010);
+echo((boolean)"0x10");
+echo((boolean)"010");
+echo((float)null);
+echo((float)true);
+echo((float)false);
+echo((float)0);
+echo((float)1);
+echo((float)1.2);
+echo((float)"");
+echo((float)"0");
+echo((float)"1");
+echo((float)"1.2");
+echo((float)'');
+echo((float)'0');
+echo((float)'1');
+echo((float)'1.2');
+echo((float)__LINE__);
+echo((float)__FUNCTION__);
+echo((float)0x10);
+echo((float)010);
+echo((float)"0x10");
+echo((float)"010");
+echo((double)null);
+echo((double)true);
+echo((double)false);
+echo((double)0);
+echo((double)1);
+echo((double)1.2);
+echo((double)"");
+echo((double)"0");
+echo((double)"1");
+echo((double)"1.2");
+echo((double)'');
+echo((double)'0');
+echo((double)'1');
+echo((double)'1.2');
+echo((double)__LINE__);
+echo((double)__FUNCTION__);
+echo((double)0x10);
+echo((double)010);
+echo((double)"0x10");
+echo((double)"010");
+echo((real)null);
+echo((real)true);
+echo((real)false);
+echo((real)0);
+echo((real)1);
+echo((real)1.2);
+echo((real)"");
+echo((real)"0");
+echo((real)"1");
+echo((real)"1.2");
+echo((real)'');
+echo((real)'0');
+echo((real)'1');
+echo((real)'1.2');
+echo((real)__LINE__);
+echo((real)__FUNCTION__);
+echo((real)0x10);
+echo((real)010);
+echo((real)"0x10");
+echo((real)"010");
+echo((string)null);
+echo((string)true);
+echo((string)false);
+echo((string)0);
+echo((string)1);
+echo((string)1.2);
+echo((string)"");
+echo((string)"0");
+echo((string)"1");
+echo((string)"1.2");
+echo((string)'');
+echo((string)'0');
+echo((string)'1');
+echo((string)'1.2');
+echo((string)__LINE__);
+echo((string)__FUNCTION__);
+echo((string)0x10);
+echo((string)010);
+echo((string)"0x10");
+echo((string)"010");
+echo(1.7e+319);
+echo(!1.7e+319);
+echo(+1.7e+319);
+echo(-1.7e+319);
+echo(~1.7e+319);
+echo((1.7e+319));
+echo((int)1.7e+319);
+echo((integer)1.7e+319);
+echo((bool)1.7e+319);
+echo((boolean)1.7e+319);
+echo((float)1.7e+319);
+echo((double)1.7e+319);
+echo((real)1.7e+319);
+echo((string)1.7e+319);
+echo("1.7e+319");
+echo(!"1.7e+319");
+echo(+"1.7e+319");
+echo(-"1.7e+319");
+echo(~"1.7e+319");
+echo(("1.7e+319"));
+echo((int)"1.7e+319");
+echo((integer)"1.7e+319");
+echo((bool)"1.7e+319");
+echo((boolean)"1.7e+319");
+echo((float)"1.7e+319");
+echo((double)"1.7e+319");
+echo((real)"1.7e+319");
+echo((string)"1.7e+319");
diff --git a/hphp/test/slow/print/1441.php.expect b/hphp/test/slow/print/1441.php.expect
index 320afa142..3d62367d1 100644
--- a/hphp/test/slow/print/1441.php.expect
+++ b/hphp/test/slow/print/1441.php.expect
@@ -1 +1 @@
-11111111010011.20011.20011.23016816100-100-1-1.200-1-1.200-1-1.2-30-16-8-16-10-1-2-2ÏÎÎÑÍÏÎÎÑÍ-4-17-9χÎÏÏÎÏ1011.2011.2011.231680x1001001001100110011301680100100110011001130168010111111111111111111111111010011.20011.20011.230168010010011.20011.20011.230168010010011.20011.20011.2301680101011.2011.2011.231680x10010INFINF-INF-1INF0011INFINFINFINF1.7e+319INF-INFÎÑÈšÔÌÎÆ1.7e+3191111INFINFINF1.7e+319
\ No newline at end of file
+11111111010011.20011.20011.237016816100-100-1-1.200-1-1.200-1-1.2-570-16-8-16-10-1-2-2ÏÎÎÑÍÏÎÎÑÍ-75-17-9χÎÏÏÎÏ1011.2011.2011.2941680x10010010011001100111140168010010011001100111340168010111111111111111111111111010011.20011.20011.21940168010010011.20011.20011.22140168010010011.20011.20011.223401680101011.2011.2011.22541680x10010INFINF-INF-1INF0011INFINFINFINF1.7e+319INF-INFÎÑÈšÔÌÎÆ1.7e+3191111INFINFINF1.7e+319
\ No newline at end of file
diff --git a/hphp/test/slow/print/1442.php b/hphp/test/slow/print/1442.php
index 6954a4888..e11c42aa3 100644
--- a/hphp/test/slow/print/1442.php
+++ b/hphp/test/slow/print/1442.php
@@ -1,3 +1,54 @@
 <?php
 
- echo(array("\0" => 1));echo(array("\0" => "\0"));echo(array("\0" => "\\"));echo(array("\0" => "\'"));echo(array("\\" => 1));echo(array("\\" => "\0"));echo(array("\\" => "\\"));echo(array("\\" => "\'"));echo(array("\'" => 1));echo(array("\'" => "\0"));echo(array("\'" => "\\"));echo(array("\'" => "\'"));echo(array("\a" => "\a"));echo(!array("\0" => "\0"));echo((array("\0" => "\0")));echo((int)array("\0" => "\0"));echo((integer)array("\0" => "\0"));echo((bool)array("\0" => "\0"));echo((boolean)array("\0" => "\0"));echo((float)array("\0" => "\0"));echo((double)array("\0" => "\0"));echo((real)array("\0" => "\0"));echo((string)array("\0" => "\0"));$a = "0x10";echo($a);echo("\0");$a = array("\0" => 1);echo($a);$a = array("\0" => "\0");echo($a);$a = array("\0" => "\\");echo($a);$a = array("\0" => "\'");echo($a);$a = array("\\" => 1);echo($a);$a = array("\\" => "\0");echo($a);$a = array("\\" => "\\");echo($a);$a = array("\\" => "\'");echo($a);$a = array("\'" => 1);echo($a);$a = array("\'" => "\0");echo($a);$a = array("\'" => "\\");echo($a);$a = array("\'" => "\'");echo($a);$a = array("\a" => "\a");echo($a);
\ No newline at end of file
+echo(array("\0" => 1));
+echo(array("\0" => "\0"));
+echo(array("\0" => "\\"));
+echo(array("\0" => "\'"));
+echo(array("\\" => 1));
+echo(array("\\" => "\0"));
+echo(array("\\" => "\\"));
+echo(array("\\" => "\'"));
+echo(array("\'" => 1));
+echo(array("\'" => "\0"));
+echo(array("\'" => "\\"));
+echo(array("\'" => "\'"));
+echo(array("\a" => "\a"));
+echo(!array("\0" => "\0"));
+echo((array("\0" => "\0")));
+echo((int)array("\0" => "\0"));
+echo((integer)array("\0" => "\0"));
+echo((bool)array("\0" => "\0"));
+echo((boolean)array("\0" => "\0"));
+echo((float)array("\0" => "\0"));
+echo((double)array("\0" => "\0"));
+echo((real)array("\0" => "\0"));
+echo((string)array("\0" => "\0"));
+$a = "0x10";
+echo($a);
+echo("\0");
+$a = array("\0" => 1);
+echo($a);
+$a = array("\0" => "\0");
+echo($a);
+$a = array("\0" => "\\");
+echo($a);
+$a = array("\0" => "\'");
+echo($a);
+$a = array("\\" => 1);
+echo($a);
+$a = array("\\" => "\0");
+echo($a);
+$a = array("\\" => "\\");
+echo($a);
+$a = array("\\" => "\'");
+echo($a);
+$a = array("\'" => 1);
+echo($a);
+$a = array("\'" => "\0");
+echo($a);
+$a = array("\'" => "\\");
+echo($a);
+$a = array("\'" => "\'");
+echo($a);
+$a = array("\a" => "\a");
+echo($a);
diff --git a/hphp/test/slow/print/1443.php b/hphp/test/slow/print/1443.php
index 7d01df390..422709c68 100644
--- a/hphp/test/slow/print/1443.php
+++ b/hphp/test/slow/print/1443.php
@@ -1,3 +1,287 @@
 <?php
 
- print(!null);print(!true);print(!false);print(!0);print(!1);print(!1.2);print(!"");print(!"0");print(!"1");print(!"1.2");print(!'');print(!'0');print(!'1');print(!'1.2');print(!__LINE__);print(!__FUNCTION__);print(!0x10);print(!010);print(!"0x10");print(!"010");print(+null);print(+true);print(+false);print(+0);print(+1);print(+1.2);print(+"");print(+"0");print(+"1");print(+"1.2");print(+'');print(+'0');print(+'1');print(+'1.2');print(+__LINE__);print(+__FUNCTION__);print(+0x10);print(+010);print(+"0x10");print(+"010");print(-null);print(-true);print(-false);print(-0);print(-1);print(-1.2);print(-"");print(-"0");print(-"1");print(-"1.2");print(-'');print(-'0');print(-'1');print(-'1.2');print(-__LINE__);print(-__FUNCTION__);print(-0x10);print(-010);print(-"0x10");print(-"010");print(~0);print(~1);print(~1.2);print(~"");print(~"0");print(~"1");print(~"1.2");print(~'');print(~'0');print(~'1');print(~'1.2');print(~__LINE__);print(~__FUNCTION__);print(~0x10);print(~010);print(~"0x10");print(~"010");print((null));print((true));print((false));print((0));print((1));print((1.2));print((""));print(("0"));print(("1"));print(("1.2"));print((''));print(('0'));print(('1'));print(('1.2'));print((__LINE__));print((__FUNCTION__));print((0x10));print((010));print(("0x10"));print(("010"));print((int)null);print((int)true);print((int)false);print((int)0);print((int)1);print((int)1.2);print((int)"");print((int)"0");print((int)"1");print((int)"1.2");print((int)'');print((int)'0');print((int)'1');print((int)'1.2');print((int)__LINE__);print((int)__FUNCTION__);print((int)0x10);print((int)010);print((int)"0x10");print((int)"010");print((integer)null);print((integer)true);print((integer)false);print((integer)0);print((integer)1);print((integer)1.2);print((integer)"");print((integer)"0");print((integer)"1");print((integer)"1.2");print((integer)'');print((integer)'0');print((integer)'1');print((integer)'1.2');print((integer)__LINE__);print((integer)__FUNCTION__);print((integer)0x10);print((integer)010);print((integer)"0x10");print((integer)"010");print((bool)null);print((bool)true);print((bool)false);print((bool)0);print((bool)1);print((bool)1.2);print((bool)"");print((bool)"0");print((bool)"1");print((bool)"1.2");print((bool)'');print((bool)'0');print((bool)'1');print((bool)'1.2');print((bool)__LINE__);print((bool)__FUNCTION__);print((bool)0x10);print((bool)010);print((bool)"0x10");print((bool)"010");print((boolean)null);print((boolean)true);print((boolean)false);print((boolean)0);print((boolean)1);print((boolean)1.2);print((boolean)"");print((boolean)"0");print((boolean)"1");print((boolean)"1.2");print((boolean)'');print((boolean)'0');print((boolean)'1');print((boolean)'1.2');print((boolean)__LINE__);print((boolean)__FUNCTION__);print((boolean)0x10);print((boolean)010);print((boolean)"0x10");print((boolean)"010");print((float)null);print((float)true);print((float)false);print((float)0);print((float)1);print((float)1.2);print((float)"");print((float)"0");print((float)"1");print((float)"1.2");print((float)'');print((float)'0');print((float)'1');print((float)'1.2');print((float)__LINE__);print((float)__FUNCTION__);print((float)0x10);print((float)010);print((float)"0x10");print((float)"010");print((double)null);print((double)true);print((double)false);print((double)0);print((double)1);print((double)1.2);print((double)"");print((double)"0");print((double)"1");print((double)"1.2");print((double)'');print((double)'0');print((double)'1');print((double)'1.2');print((double)__LINE__);print((double)__FUNCTION__);print((double)0x10);print((double)010);print((double)"0x10");print((double)"010");print((real)null);print((real)true);print((real)false);print((real)0);print((real)1);print((real)1.2);print((real)"");print((real)"0");print((real)"1");print((real)"1.2");print((real)'');print((real)'0');print((real)'1');print((real)'1.2');print((real)__LINE__);print((real)__FUNCTION__);print((real)0x10);print((real)010);print((real)"0x10");print((real)"010");print((string)null);print((string)true);print((string)false);print((string)0);print((string)1);print((string)1.2);print((string)"");print((string)"0");print((string)"1");print((string)"1.2");print((string)'');print((string)'0');print((string)'1');print((string)'1.2');print((string)__LINE__);print((string)__FUNCTION__);print((string)0x10);print((string)010);print((string)"0x10");print((string)"010");print(1.7e+319);print(!1.7e+319);print(+1.7e+319);print(-1.7e+319);print(~1.7e+319);print((1.7e+319));print((int)1.7e+319);print((integer)1.7e+319);print((bool)1.7e+319);print((boolean)1.7e+319);print((float)1.7e+319);print((double)1.7e+319);print((real)1.7e+319);print((string)1.7e+319);print("1.7e+319");print(!"1.7e+319");print(+"1.7e+319");print(-"1.7e+319");print(~"1.7e+319");print(("1.7e+319"));print((int)"1.7e+319");print((integer)"1.7e+319");print((bool)"1.7e+319");print((boolean)"1.7e+319");print((float)"1.7e+319");print((double)"1.7e+319");print((real)"1.7e+319");print((string)"1.7e+319");
\ No newline at end of file
+print(!null);
+print(!true);
+print(!false);
+print(!0);
+print(!1);
+print(!1.2);
+print(!"");
+print(!"0");
+print(!"1");
+print(!"1.2");
+print(!'');
+print(!'0');
+print(!'1');
+print(!'1.2');
+print(!__LINE__);
+print(!__FUNCTION__);
+print(!0x10);
+print(!010);
+print(!"0x10");
+print(!"010");
+print(+null);
+print(+true);
+print(+false);
+print(+0);
+print(+1);
+print(+1.2);
+print(+"");
+print(+"0");
+print(+"1");
+print(+"1.2");
+print(+'');
+print(+'0');
+print(+'1');
+print(+'1.2');
+print(+__LINE__);
+print(+__FUNCTION__);
+print(+0x10);
+print(+010);
+print(+"0x10");
+print(+"010");
+print(-null);
+print(-true);
+print(-false);
+print(-0);
+print(-1);
+print(-1.2);
+print(-"");
+print(-"0");
+print(-"1");
+print(-"1.2");
+print(-'');
+print(-'0');
+print(-'1');
+print(-'1.2');
+print(-__LINE__);
+print(-__FUNCTION__);
+print(-0x10);
+print(-010);
+print(-"0x10");
+print(-"010");
+print(~0);
+print(~1);
+print(~1.2);
+print(~"");
+print(~"0");
+print(~"1");
+print(~"1.2");
+print(~'');
+print(~'0');
+print(~'1');
+print(~'1.2');
+print(~__LINE__);
+print(~__FUNCTION__);
+print(~0x10);
+print(~010);
+print(~"0x10");
+print(~"010");
+print((null));
+print((true));
+print((false));
+print((0));
+print((1));
+print((1.2));
+print((""));
+print(("0"));
+print(("1"));
+print(("1.2"));
+print((''));
+print(('0'));
+print(('1'));
+print(('1.2'));
+print((__LINE__));
+print((__FUNCTION__));
+print((0x10));
+print((010));
+print(("0x10"));
+print(("010"));
+print((int)null);
+print((int)true);
+print((int)false);
+print((int)0);
+print((int)1);
+print((int)1.2);
+print((int)"");
+print((int)"0");
+print((int)"1");
+print((int)"1.2");
+print((int)'');
+print((int)'0');
+print((int)'1');
+print((int)'1.2');
+print((int)__LINE__);
+print((int)__FUNCTION__);
+print((int)0x10);
+print((int)010);
+print((int)"0x10");
+print((int)"010");
+print((integer)null);
+print((integer)true);
+print((integer)false);
+print((integer)0);
+print((integer)1);
+print((integer)1.2);
+print((integer)"");
+print((integer)"0");
+print((integer)"1");
+print((integer)"1.2");
+print((integer)'');
+print((integer)'0');
+print((integer)'1');
+print((integer)'1.2');
+print((integer)__LINE__);
+print((integer)__FUNCTION__);
+print((integer)0x10);
+print((integer)010);
+print((integer)"0x10");
+print((integer)"010");
+print((bool)null);
+print((bool)true);
+print((bool)false);
+print((bool)0);
+print((bool)1);
+print((bool)1.2);
+print((bool)"");
+print((bool)"0");
+print((bool)"1");
+print((bool)"1.2");
+print((bool)'');
+print((bool)'0');
+print((bool)'1');
+print((bool)'1.2');
+print((bool)__LINE__);
+print((bool)__FUNCTION__);
+print((bool)0x10);
+print((bool)010);
+print((bool)"0x10");
+print((bool)"010");
+print((boolean)null);
+print((boolean)true);
+print((boolean)false);
+print((boolean)0);
+print((boolean)1);
+print((boolean)1.2);
+print((boolean)"");
+print((boolean)"0");
+print((boolean)"1");
+print((boolean)"1.2");
+print((boolean)'');
+print((boolean)'0');
+print((boolean)'1');
+print((boolean)'1.2');
+print((boolean)__LINE__);
+print((boolean)__FUNCTION__);
+print((boolean)0x10);
+print((boolean)010);
+print((boolean)"0x10");
+print((boolean)"010");
+print((float)null);
+print((float)true);
+print((float)false);
+print((float)0);
+print((float)1);
+print((float)1.2);
+print((float)"");
+print((float)"0");
+print((float)"1");
+print((float)"1.2");
+print((float)'');
+print((float)'0');
+print((float)'1');
+print((float)'1.2');
+print((float)__LINE__);
+print((float)__FUNCTION__);
+print((float)0x10);
+print((float)010);
+print((float)"0x10");
+print((float)"010");
+print((double)null);
+print((double)true);
+print((double)false);
+print((double)0);
+print((double)1);
+print((double)1.2);
+print((double)"");
+print((double)"0");
+print((double)"1");
+print((double)"1.2");
+print((double)'');
+print((double)'0');
+print((double)'1');
+print((double)'1.2');
+print((double)__LINE__);
+print((double)__FUNCTION__);
+print((double)0x10);
+print((double)010);
+print((double)"0x10");
+print((double)"010");
+print((real)null);
+print((real)true);
+print((real)false);
+print((real)0);
+print((real)1);
+print((real)1.2);
+print((real)"");
+print((real)"0");
+print((real)"1");
+print((real)"1.2");
+print((real)'');
+print((real)'0');
+print((real)'1');
+print((real)'1.2');
+print((real)__LINE__);
+print((real)__FUNCTION__);
+print((real)0x10);
+print((real)010);
+print((real)"0x10");
+print((real)"010");
+print((string)null);
+print((string)true);
+print((string)false);
+print((string)0);
+print((string)1);
+print((string)1.2);
+print((string)"");
+print((string)"0");
+print((string)"1");
+print((string)"1.2");
+print((string)'');
+print((string)'0');
+print((string)'1');
+print((string)'1.2');
+print((string)__LINE__);
+print((string)__FUNCTION__);
+print((string)0x10);
+print((string)010);
+print((string)"0x10");
+print((string)"010");
+print(1.7e+319);
+print(!1.7e+319);
+print(+1.7e+319);
+print(-1.7e+319);
+print(~1.7e+319);
+print((1.7e+319));
+print((int)1.7e+319);
+print((integer)1.7e+319);
+print((bool)1.7e+319);
+print((boolean)1.7e+319);
+print((float)1.7e+319);
+print((double)1.7e+319);
+print((real)1.7e+319);
+print((string)1.7e+319);
+print("1.7e+319");
+print(!"1.7e+319");
+print(+"1.7e+319");
+print(-"1.7e+319");
+print(~"1.7e+319");
+print(("1.7e+319"));
+print((int)"1.7e+319");
+print((integer)"1.7e+319");
+print((bool)"1.7e+319");
+print((boolean)"1.7e+319");
+print((float)"1.7e+319");
+print((double)"1.7e+319");
+print((real)"1.7e+319");
+print((string)"1.7e+319");
diff --git a/hphp/test/slow/print/1443.php.expect b/hphp/test/slow/print/1443.php.expect
index 320afa142..3d62367d1 100644
--- a/hphp/test/slow/print/1443.php.expect
+++ b/hphp/test/slow/print/1443.php.expect
@@ -1 +1 @@
-11111111010011.20011.20011.23016816100-100-1-1.200-1-1.200-1-1.2-30-16-8-16-10-1-2-2ÏÎÎÑÍÏÎÎÑÍ-4-17-9χÎÏÏÎÏ1011.2011.2011.231680x1001001001100110011301680100100110011001130168010111111111111111111111111010011.20011.20011.230168010010011.20011.20011.230168010010011.20011.20011.2301680101011.2011.2011.231680x10010INFINF-INF-1INF0011INFINFINFINF1.7e+319INF-INFÎÑÈšÔÌÎÆ1.7e+3191111INFINFINF1.7e+319
\ No newline at end of file
+11111111010011.20011.20011.237016816100-100-1-1.200-1-1.200-1-1.2-570-16-8-16-10-1-2-2ÏÎÎÑÍÏÎÎÑÍ-75-17-9χÎÏÏÎÏ1011.2011.2011.2941680x10010010011001100111140168010010011001100111340168010111111111111111111111111010011.20011.20011.21940168010010011.20011.20011.22140168010010011.20011.20011.223401680101011.2011.2011.22541680x10010INFINF-INF-1INF0011INFINFINFINF1.7e+319INF-INFÎÑÈšÔÌÎÆ1.7e+3191111INFINFINF1.7e+319
\ No newline at end of file
diff --git a/hphp/test/slow/print/1444.php b/hphp/test/slow/print/1444.php
index 075fa44bd..7ec69f57b 100644
--- a/hphp/test/slow/print/1444.php
+++ b/hphp/test/slow/print/1444.php
@@ -1,3 +1,54 @@
 <?php
 
- print(array("\0" => 1));print(array("\0" => "\0"));print(array("\0" => "\\"));print(array("\0" => "\'"));print(array("\\" => 1));print(array("\\" => "\0"));print(array("\\" => "\\"));print(array("\\" => "\'"));print(array("\'" => 1));print(array("\'" => "\0"));print(array("\'" => "\\"));print(array("\'" => "\'"));print(array("\a" => "\a"));print(!array("\0" => "\0"));print((array("\0" => "\0")));print((int)array("\0" => "\0"));print((integer)array("\0" => "\0"));print((bool)array("\0" => "\0"));print((boolean)array("\0" => "\0"));print((float)array("\0" => "\0"));print((double)array("\0" => "\0"));print((real)array("\0" => "\0"));print((string)array("\0" => "\0"));$a = "0x10";print($a);print("\0");$a = array("\0" => 1);print($a);$a = array("\0" => "\0");print($a);$a = array("\0" => "\\");print($a);$a = array("\0" => "\'");print($a);$a = array("\\" => 1);print($a);$a = array("\\" => "\0");print($a);$a = array("\\" => "\\");print($a);$a = array("\\" => "\'");print($a);$a = array("\'" => 1);print($a);$a = array("\'" => "\0");print($a);$a = array("\'" => "\\");print($a);$a = array("\'" => "\'");print($a);$a = array("\a" => "\a");print($a);
\ No newline at end of file
+print(array("\0" => 1));
+print(array("\0" => "\0"));
+print(array("\0" => "\\"));
+print(array("\0" => "\'"));
+print(array("\\" => 1));
+print(array("\\" => "\0"));
+print(array("\\" => "\\"));
+print(array("\\" => "\'"));
+print(array("\'" => 1));
+print(array("\'" => "\0"));
+print(array("\'" => "\\"));
+print(array("\'" => "\'"));
+print(array("\a" => "\a"));
+print(!array("\0" => "\0"));
+print((array("\0" => "\0")));
+print((int)array("\0" => "\0"));
+print((integer)array("\0" => "\0"));
+print((bool)array("\0" => "\0"));
+print((boolean)array("\0" => "\0"));
+print((float)array("\0" => "\0"));
+print((double)array("\0" => "\0"));
+print((real)array("\0" => "\0"));
+print((string)array("\0" => "\0"));
+$a = "0x10";
+print($a);
+print("\0");
+$a = array("\0" => 1);
+print($a);
+$a = array("\0" => "\0");
+print($a);
+$a = array("\0" => "\\");
+print($a);
+$a = array("\0" => "\'");
+print($a);
+$a = array("\\" => 1);
+print($a);
+$a = array("\\" => "\0");
+print($a);
+$a = array("\\" => "\\");
+print($a);
+$a = array("\\" => "\'");
+print($a);
+$a = array("\'" => 1);
+print($a);
+$a = array("\'" => "\0");
+print($a);
+$a = array("\'" => "\\");
+print($a);
+$a = array("\'" => "\'");
+print($a);
+$a = array("\a" => "\a");
+print($a);
diff --git a/hphp/test/slow/print/1445.php b/hphp/test/slow/print/1445.php
index 4a5613f2d..d6e1127c8 100644
--- a/hphp/test/slow/print/1445.php
+++ b/hphp/test/slow/print/1445.php
@@ -1,3 +1,287 @@
 <?php
 
- print_r(!null);print_r(!true);print_r(!false);print_r(!0);print_r(!1);print_r(!1.2);print_r(!"");print_r(!"0");print_r(!"1");print_r(!"1.2");print_r(!'');print_r(!'0');print_r(!'1');print_r(!'1.2');print_r(!__LINE__);print_r(!__FUNCTION__);print_r(!0x10);print_r(!010);print_r(!"0x10");print_r(!"010");print_r(+null);print_r(+true);print_r(+false);print_r(+0);print_r(+1);print_r(+1.2);print_r(+"");print_r(+"0");print_r(+"1");print_r(+"1.2");print_r(+'');print_r(+'0');print_r(+'1');print_r(+'1.2');print_r(+__LINE__);print_r(+__FUNCTION__);print_r(+0x10);print_r(+010);print_r(+"0x10");print_r(+"010");print_r(-null);print_r(-true);print_r(-false);print_r(-0);print_r(-1);print_r(-1.2);print_r(-"");print_r(-"0");print_r(-"1");print_r(-"1.2");print_r(-'');print_r(-'0');print_r(-'1');print_r(-'1.2');print_r(-__LINE__);print_r(-__FUNCTION__);print_r(-0x10);print_r(-010);print_r(-"0x10");print_r(-"010");print_r(~0);print_r(~1);print_r(~1.2);print_r(~"");print_r(~"0");print_r(~"1");print_r(~"1.2");print_r(~'');print_r(~'0');print_r(~'1');print_r(~'1.2');print_r(~__LINE__);print_r(~__FUNCTION__);print_r(~0x10);print_r(~010);print_r(~"0x10");print_r(~"010");print_r((null));print_r((true));print_r((false));print_r((0));print_r((1));print_r((1.2));print_r((""));print_r(("0"));print_r(("1"));print_r(("1.2"));print_r((''));print_r(('0'));print_r(('1'));print_r(('1.2'));print_r((__LINE__));print_r((__FUNCTION__));print_r((0x10));print_r((010));print_r(("0x10"));print_r(("010"));print_r((int)null);print_r((int)true);print_r((int)false);print_r((int)0);print_r((int)1);print_r((int)1.2);print_r((int)"");print_r((int)"0");print_r((int)"1");print_r((int)"1.2");print_r((int)'');print_r((int)'0');print_r((int)'1');print_r((int)'1.2');print_r((int)__LINE__);print_r((int)__FUNCTION__);print_r((int)0x10);print_r((int)010);print_r((int)"0x10");print_r((int)"010");print_r((integer)null);print_r((integer)true);print_r((integer)false);print_r((integer)0);print_r((integer)1);print_r((integer)1.2);print_r((integer)"");print_r((integer)"0");print_r((integer)"1");print_r((integer)"1.2");print_r((integer)'');print_r((integer)'0');print_r((integer)'1');print_r((integer)'1.2');print_r((integer)__LINE__);print_r((integer)__FUNCTION__);print_r((integer)0x10);print_r((integer)010);print_r((integer)"0x10");print_r((integer)"010");print_r((bool)null);print_r((bool)true);print_r((bool)false);print_r((bool)0);print_r((bool)1);print_r((bool)1.2);print_r((bool)"");print_r((bool)"0");print_r((bool)"1");print_r((bool)"1.2");print_r((bool)'');print_r((bool)'0');print_r((bool)'1');print_r((bool)'1.2');print_r((bool)__LINE__);print_r((bool)__FUNCTION__);print_r((bool)0x10);print_r((bool)010);print_r((bool)"0x10");print_r((bool)"010");print_r((boolean)null);print_r((boolean)true);print_r((boolean)false);print_r((boolean)0);print_r((boolean)1);print_r((boolean)1.2);print_r((boolean)"");print_r((boolean)"0");print_r((boolean)"1");print_r((boolean)"1.2");print_r((boolean)'');print_r((boolean)'0');print_r((boolean)'1');print_r((boolean)'1.2');print_r((boolean)__LINE__);print_r((boolean)__FUNCTION__);print_r((boolean)0x10);print_r((boolean)010);print_r((boolean)"0x10");print_r((boolean)"010");print_r((float)null);print_r((float)true);print_r((float)false);print_r((float)0);print_r((float)1);print_r((float)1.2);print_r((float)"");print_r((float)"0");print_r((float)"1");print_r((float)"1.2");print_r((float)'');print_r((float)'0');print_r((float)'1');print_r((float)'1.2');print_r((float)__LINE__);print_r((float)__FUNCTION__);print_r((float)0x10);print_r((float)010);print_r((float)"0x10");print_r((float)"010");print_r((double)null);print_r((double)true);print_r((double)false);print_r((double)0);print_r((double)1);print_r((double)1.2);print_r((double)"");print_r((double)"0");print_r((double)"1");print_r((double)"1.2");print_r((double)'');print_r((double)'0');print_r((double)'1');print_r((double)'1.2');print_r((double)__LINE__);print_r((double)__FUNCTION__);print_r((double)0x10);print_r((double)010);print_r((double)"0x10");print_r((double)"010");print_r((real)null);print_r((real)true);print_r((real)false);print_r((real)0);print_r((real)1);print_r((real)1.2);print_r((real)"");print_r((real)"0");print_r((real)"1");print_r((real)"1.2");print_r((real)'');print_r((real)'0');print_r((real)'1');print_r((real)'1.2');print_r((real)__LINE__);print_r((real)__FUNCTION__);print_r((real)0x10);print_r((real)010);print_r((real)"0x10");print_r((real)"010");print_r((string)null);print_r((string)true);print_r((string)false);print_r((string)0);print_r((string)1);print_r((string)1.2);print_r((string)"");print_r((string)"0");print_r((string)"1");print_r((string)"1.2");print_r((string)'');print_r((string)'0');print_r((string)'1');print_r((string)'1.2');print_r((string)__LINE__);print_r((string)__FUNCTION__);print_r((string)0x10);print_r((string)010);print_r((string)"0x10");print_r((string)"010");print_r(1.7e+319);print_r(!1.7e+319);print_r(+1.7e+319);print_r(-1.7e+319);print_r(~1.7e+319);print_r((1.7e+319));print_r((int)1.7e+319);print_r((integer)1.7e+319);print_r((bool)1.7e+319);print_r((boolean)1.7e+319);print_r((float)1.7e+319);print_r((double)1.7e+319);print_r((real)1.7e+319);print_r((string)1.7e+319);print_r("1.7e+319");print_r(!"1.7e+319");print_r(+"1.7e+319");print_r(-"1.7e+319");print_r(~"1.7e+319");print_r(("1.7e+319"));print_r((int)"1.7e+319");print_r((integer)"1.7e+319");print_r((bool)"1.7e+319");print_r((boolean)"1.7e+319");print_r((float)"1.7e+319");print_r((double)"1.7e+319");print_r((real)"1.7e+319");print_r((string)"1.7e+319");
\ No newline at end of file
+print_r(!null);
+print_r(!true);
+print_r(!false);
+print_r(!0);
+print_r(!1);
+print_r(!1.2);
+print_r(!"");
+print_r(!"0");
+print_r(!"1");
+print_r(!"1.2");
+print_r(!'');
+print_r(!'0');
+print_r(!'1');
+print_r(!'1.2');
+print_r(!__LINE__);
+print_r(!__FUNCTION__);
+print_r(!0x10);
+print_r(!010);
+print_r(!"0x10");
+print_r(!"010");
+print_r(+null);
+print_r(+true);
+print_r(+false);
+print_r(+0);
+print_r(+1);
+print_r(+1.2);
+print_r(+"");
+print_r(+"0");
+print_r(+"1");
+print_r(+"1.2");
+print_r(+'');
+print_r(+'0');
+print_r(+'1');
+print_r(+'1.2');
+print_r(+__LINE__);
+print_r(+__FUNCTION__);
+print_r(+0x10);
+print_r(+010);
+print_r(+"0x10");
+print_r(+"010");
+print_r(-null);
+print_r(-true);
+print_r(-false);
+print_r(-0);
+print_r(-1);
+print_r(-1.2);
+print_r(-"");
+print_r(-"0");
+print_r(-"1");
+print_r(-"1.2");
+print_r(-'');
+print_r(-'0');
+print_r(-'1');
+print_r(-'1.2');
+print_r(-__LINE__);
+print_r(-__FUNCTION__);
+print_r(-0x10);
+print_r(-010);
+print_r(-"0x10");
+print_r(-"010");
+print_r(~0);
+print_r(~1);
+print_r(~1.2);
+print_r(~"");
+print_r(~"0");
+print_r(~"1");
+print_r(~"1.2");
+print_r(~'');
+print_r(~'0');
+print_r(~'1');
+print_r(~'1.2');
+print_r(~__LINE__);
+print_r(~__FUNCTION__);
+print_r(~0x10);
+print_r(~010);
+print_r(~"0x10");
+print_r(~"010");
+print_r((null));
+print_r((true));
+print_r((false));
+print_r((0));
+print_r((1));
+print_r((1.2));
+print_r((""));
+print_r(("0"));
+print_r(("1"));
+print_r(("1.2"));
+print_r((''));
+print_r(('0'));
+print_r(('1'));
+print_r(('1.2'));
+print_r((__LINE__));
+print_r((__FUNCTION__));
+print_r((0x10));
+print_r((010));
+print_r(("0x10"));
+print_r(("010"));
+print_r((int)null);
+print_r((int)true);
+print_r((int)false);
+print_r((int)0);
+print_r((int)1);
+print_r((int)1.2);
+print_r((int)"");
+print_r((int)"0");
+print_r((int)"1");
+print_r((int)"1.2");
+print_r((int)'');
+print_r((int)'0');
+print_r((int)'1');
+print_r((int)'1.2');
+print_r((int)__LINE__);
+print_r((int)__FUNCTION__);
+print_r((int)0x10);
+print_r((int)010);
+print_r((int)"0x10");
+print_r((int)"010");
+print_r((integer)null);
+print_r((integer)true);
+print_r((integer)false);
+print_r((integer)0);
+print_r((integer)1);
+print_r((integer)1.2);
+print_r((integer)"");
+print_r((integer)"0");
+print_r((integer)"1");
+print_r((integer)"1.2");
+print_r((integer)'');
+print_r((integer)'0');
+print_r((integer)'1');
+print_r((integer)'1.2');
+print_r((integer)__LINE__);
+print_r((integer)__FUNCTION__);
+print_r((integer)0x10);
+print_r((integer)010);
+print_r((integer)"0x10");
+print_r((integer)"010");
+print_r((bool)null);
+print_r((bool)true);
+print_r((bool)false);
+print_r((bool)0);
+print_r((bool)1);
+print_r((bool)1.2);
+print_r((bool)"");
+print_r((bool)"0");
+print_r((bool)"1");
+print_r((bool)"1.2");
+print_r((bool)'');
+print_r((bool)'0');
+print_r((bool)'1');
+print_r((bool)'1.2');
+print_r((bool)__LINE__);
+print_r((bool)__FUNCTION__);
+print_r((bool)0x10);
+print_r((bool)010);
+print_r((bool)"0x10");
+print_r((bool)"010");
+print_r((boolean)null);
+print_r((boolean)true);
+print_r((boolean)false);
+print_r((boolean)0);
+print_r((boolean)1);
+print_r((boolean)1.2);
+print_r((boolean)"");
+print_r((boolean)"0");
+print_r((boolean)"1");
+print_r((boolean)"1.2");
+print_r((boolean)'');
+print_r((boolean)'0');
+print_r((boolean)'1');
+print_r((boolean)'1.2');
+print_r((boolean)__LINE__);
+print_r((boolean)__FUNCTION__);
+print_r((boolean)0x10);
+print_r((boolean)010);
+print_r((boolean)"0x10");
+print_r((boolean)"010");
+print_r((float)null);
+print_r((float)true);
+print_r((float)false);
+print_r((float)0);
+print_r((float)1);
+print_r((float)1.2);
+print_r((float)"");
+print_r((float)"0");
+print_r((float)"1");
+print_r((float)"1.2");
+print_r((float)'');
+print_r((float)'0');
+print_r((float)'1');
+print_r((float)'1.2');
+print_r((float)__LINE__);
+print_r((float)__FUNCTION__);
+print_r((float)0x10);
+print_r((float)010);
+print_r((float)"0x10");
+print_r((float)"010");
+print_r((double)null);
+print_r((double)true);
+print_r((double)false);
+print_r((double)0);
+print_r((double)1);
+print_r((double)1.2);
+print_r((double)"");
+print_r((double)"0");
+print_r((double)"1");
+print_r((double)"1.2");
+print_r((double)'');
+print_r((double)'0');
+print_r((double)'1');
+print_r((double)'1.2');
+print_r((double)__LINE__);
+print_r((double)__FUNCTION__);
+print_r((double)0x10);
+print_r((double)010);
+print_r((double)"0x10");
+print_r((double)"010");
+print_r((real)null);
+print_r((real)true);
+print_r((real)false);
+print_r((real)0);
+print_r((real)1);
+print_r((real)1.2);
+print_r((real)"");
+print_r((real)"0");
+print_r((real)"1");
+print_r((real)"1.2");
+print_r((real)'');
+print_r((real)'0');
+print_r((real)'1');
+print_r((real)'1.2');
+print_r((real)__LINE__);
+print_r((real)__FUNCTION__);
+print_r((real)0x10);
+print_r((real)010);
+print_r((real)"0x10");
+print_r((real)"010");
+print_r((string)null);
+print_r((string)true);
+print_r((string)false);
+print_r((string)0);
+print_r((string)1);
+print_r((string)1.2);
+print_r((string)"");
+print_r((string)"0");
+print_r((string)"1");
+print_r((string)"1.2");
+print_r((string)'');
+print_r((string)'0');
+print_r((string)'1');
+print_r((string)'1.2');
+print_r((string)__LINE__);
+print_r((string)__FUNCTION__);
+print_r((string)0x10);
+print_r((string)010);
+print_r((string)"0x10");
+print_r((string)"010");
+print_r(1.7e+319);
+print_r(!1.7e+319);
+print_r(+1.7e+319);
+print_r(-1.7e+319);
+print_r(~1.7e+319);
+print_r((1.7e+319));
+print_r((int)1.7e+319);
+print_r((integer)1.7e+319);
+print_r((bool)1.7e+319);
+print_r((boolean)1.7e+319);
+print_r((float)1.7e+319);
+print_r((double)1.7e+319);
+print_r((real)1.7e+319);
+print_r((string)1.7e+319);
+print_r("1.7e+319");
+print_r(!"1.7e+319");
+print_r(+"1.7e+319");
+print_r(-"1.7e+319");
+print_r(~"1.7e+319");
+print_r(("1.7e+319"));
+print_r((int)"1.7e+319");
+print_r((integer)"1.7e+319");
+print_r((bool)"1.7e+319");
+print_r((boolean)"1.7e+319");
+print_r((float)"1.7e+319");
+print_r((double)"1.7e+319");
+print_r((real)"1.7e+319");
+print_r((string)"1.7e+319");
diff --git a/hphp/test/slow/print/1445.php.expect b/hphp/test/slow/print/1445.php.expect
index 320afa142..3d62367d1 100644
--- a/hphp/test/slow/print/1445.php.expect
+++ b/hphp/test/slow/print/1445.php.expect
@@ -1 +1 @@
-11111111010011.20011.20011.23016816100-100-1-1.200-1-1.200-1-1.2-30-16-8-16-10-1-2-2ÏÎÎÑÍÏÎÎÑÍ-4-17-9χÎÏÏÎÏ1011.2011.2011.231680x1001001001100110011301680100100110011001130168010111111111111111111111111010011.20011.20011.230168010010011.20011.20011.230168010010011.20011.20011.2301680101011.2011.2011.231680x10010INFINF-INF-1INF0011INFINFINFINF1.7e+319INF-INFÎÑÈšÔÌÎÆ1.7e+3191111INFINFINF1.7e+319
\ No newline at end of file
+11111111010011.20011.20011.237016816100-100-1-1.200-1-1.200-1-1.2-570-16-8-16-10-1-2-2ÏÎÎÑÍÏÎÎÑÍ-75-17-9χÎÏÏÎÏ1011.2011.2011.2941680x10010010011001100111140168010010011001100111340168010111111111111111111111111010011.20011.20011.21940168010010011.20011.20011.22140168010010011.20011.20011.223401680101011.2011.2011.22541680x10010INFINF-INF-1INF0011INFINFINFINF1.7e+319INF-INFÎÑÈšÔÌÎÆ1.7e+3191111INFINFINF1.7e+319
\ No newline at end of file
diff --git a/hphp/test/slow/print/1446.php b/hphp/test/slow/print/1446.php
index 7e7fcb18a..9d6e5231c 100644
--- a/hphp/test/slow/print/1446.php
+++ b/hphp/test/slow/print/1446.php
@@ -1,3 +1,54 @@
 <?php
 
- print_r(array("\0" => 1));print_r(array("\0" => "\0"));print_r(array("\0" => "\\"));print_r(array("\0" => "\'"));print_r(array("\\" => 1));print_r(array("\\" => "\0"));print_r(array("\\" => "\\"));print_r(array("\\" => "\'"));print_r(array("\'" => 1));print_r(array("\'" => "\0"));print_r(array("\'" => "\\"));print_r(array("\'" => "\'"));print_r(array("\a" => "\a"));print_r(!array("\0" => "\0"));print_r((array("\0" => "\0")));print_r((int)array("\0" => "\0"));print_r((integer)array("\0" => "\0"));print_r((bool)array("\0" => "\0"));print_r((boolean)array("\0" => "\0"));print_r((float)array("\0" => "\0"));print_r((double)array("\0" => "\0"));print_r((real)array("\0" => "\0"));print_r((string)array("\0" => "\0"));$a = "0x10";print_r($a);print_r("\0");$a = array("\0" => 1);print_r($a);$a = array("\0" => "\0");print_r($a);$a = array("\0" => "\\");print_r($a);$a = array("\0" => "\'");print_r($a);$a = array("\\" => 1);print_r($a);$a = array("\\" => "\0");print_r($a);$a = array("\\" => "\\");print_r($a);$a = array("\\" => "\'");print_r($a);$a = array("\'" => 1);print_r($a);$a = array("\'" => "\0");print_r($a);$a = array("\'" => "\\");print_r($a);$a = array("\'" => "\'");print_r($a);$a = array("\a" => "\a");print_r($a);
\ No newline at end of file
+print_r(array("\0" => 1));
+print_r(array("\0" => "\0"));
+print_r(array("\0" => "\\"));
+print_r(array("\0" => "\'"));
+print_r(array("\\" => 1));
+print_r(array("\\" => "\0"));
+print_r(array("\\" => "\\"));
+print_r(array("\\" => "\'"));
+print_r(array("\'" => 1));
+print_r(array("\'" => "\0"));
+print_r(array("\'" => "\\"));
+print_r(array("\'" => "\'"));
+print_r(array("\a" => "\a"));
+print_r(!array("\0" => "\0"));
+print_r((array("\0" => "\0")));
+print_r((int)array("\0" => "\0"));
+print_r((integer)array("\0" => "\0"));
+print_r((bool)array("\0" => "\0"));
+print_r((boolean)array("\0" => "\0"));
+print_r((float)array("\0" => "\0"));
+print_r((double)array("\0" => "\0"));
+print_r((real)array("\0" => "\0"));
+print_r((string)array("\0" => "\0"));
+$a = "0x10";
+print_r($a);
+print_r("\0");
+$a = array("\0" => 1);
+print_r($a);
+$a = array("\0" => "\0");
+print_r($a);
+$a = array("\0" => "\\");
+print_r($a);
+$a = array("\0" => "\'");
+print_r($a);
+$a = array("\\" => 1);
+print_r($a);
+$a = array("\\" => "\0");
+print_r($a);
+$a = array("\\" => "\\");
+print_r($a);
+$a = array("\\" => "\'");
+print_r($a);
+$a = array("\'" => 1);
+print_r($a);
+$a = array("\'" => "\0");
+print_r($a);
+$a = array("\'" => "\\");
+print_r($a);
+$a = array("\'" => "\'");
+print_r($a);
+$a = array("\a" => "\a");
+print_r($a);
diff --git a/hphp/test/slow/print/1447.php b/hphp/test/slow/print/1447.php
index 712ffaa8a..b3c195d98 100644
--- a/hphp/test/slow/print/1447.php
+++ b/hphp/test/slow/print/1447.php
@@ -1,3 +1,287 @@
 <?php
 
- serialize(!null);serialize(!true);serialize(!false);serialize(!0);serialize(!1);serialize(!1.2);serialize(!"");serialize(!"0");serialize(!"1");serialize(!"1.2");serialize(!'');serialize(!'0');serialize(!'1');serialize(!'1.2');serialize(!__LINE__);serialize(!__FUNCTION__);serialize(!0x10);serialize(!010);serialize(!"0x10");serialize(!"010");serialize(+null);serialize(+true);serialize(+false);serialize(+0);serialize(+1);serialize(+1.2);serialize(+"");serialize(+"0");serialize(+"1");serialize(+"1.2");serialize(+'');serialize(+'0');serialize(+'1');serialize(+'1.2');serialize(+__LINE__);serialize(+__FUNCTION__);serialize(+0x10);serialize(+010);serialize(+"0x10");serialize(+"010");serialize(-null);serialize(-true);serialize(-false);serialize(-0);serialize(-1);serialize(-1.2);serialize(-"");serialize(-"0");serialize(-"1");serialize(-"1.2");serialize(-'');serialize(-'0');serialize(-'1');serialize(-'1.2');serialize(-__LINE__);serialize(-__FUNCTION__);serialize(-0x10);serialize(-010);serialize(-"0x10");serialize(-"010");serialize(~0);serialize(~1);serialize(~1.2);serialize(~"");serialize(~"0");serialize(~"1");serialize(~"1.2");serialize(~'');serialize(~'0');serialize(~'1');serialize(~'1.2');serialize(~__LINE__);serialize(~__FUNCTION__);serialize(~0x10);serialize(~010);serialize(~"0x10");serialize(~"010");serialize((null));serialize((true));serialize((false));serialize((0));serialize((1));serialize((1.2));serialize((""));serialize(("0"));serialize(("1"));serialize(("1.2"));serialize((''));serialize(('0'));serialize(('1'));serialize(('1.2'));serialize((__LINE__));serialize((__FUNCTION__));serialize((0x10));serialize((010));serialize(("0x10"));serialize(("010"));serialize((int)null);serialize((int)true);serialize((int)false);serialize((int)0);serialize((int)1);serialize((int)1.2);serialize((int)"");serialize((int)"0");serialize((int)"1");serialize((int)"1.2");serialize((int)'');serialize((int)'0');serialize((int)'1');serialize((int)'1.2');serialize((int)__LINE__);serialize((int)__FUNCTION__);serialize((int)0x10);serialize((int)010);serialize((int)"0x10");serialize((int)"010");serialize((integer)null);serialize((integer)true);serialize((integer)false);serialize((integer)0);serialize((integer)1);serialize((integer)1.2);serialize((integer)"");serialize((integer)"0");serialize((integer)"1");serialize((integer)"1.2");serialize((integer)'');serialize((integer)'0');serialize((integer)'1');serialize((integer)'1.2');serialize((integer)__LINE__);serialize((integer)__FUNCTION__);serialize((integer)0x10);serialize((integer)010);serialize((integer)"0x10");serialize((integer)"010");serialize((bool)null);serialize((bool)true);serialize((bool)false);serialize((bool)0);serialize((bool)1);serialize((bool)1.2);serialize((bool)"");serialize((bool)"0");serialize((bool)"1");serialize((bool)"1.2");serialize((bool)'');serialize((bool)'0');serialize((bool)'1');serialize((bool)'1.2');serialize((bool)__LINE__);serialize((bool)__FUNCTION__);serialize((bool)0x10);serialize((bool)010);serialize((bool)"0x10");serialize((bool)"010");serialize((boolean)null);serialize((boolean)true);serialize((boolean)false);serialize((boolean)0);serialize((boolean)1);serialize((boolean)1.2);serialize((boolean)"");serialize((boolean)"0");serialize((boolean)"1");serialize((boolean)"1.2");serialize((boolean)'');serialize((boolean)'0');serialize((boolean)'1');serialize((boolean)'1.2');serialize((boolean)__LINE__);serialize((boolean)__FUNCTION__);serialize((boolean)0x10);serialize((boolean)010);serialize((boolean)"0x10");serialize((boolean)"010");serialize((float)null);serialize((float)true);serialize((float)false);serialize((float)0);serialize((float)1);serialize((float)1.2);serialize((float)"");serialize((float)"0");serialize((float)"1");serialize((float)"1.2");serialize((float)'');serialize((float)'0');serialize((float)'1');serialize((float)'1.2');serialize((float)__LINE__);serialize((float)__FUNCTION__);serialize((float)0x10);serialize((float)010);serialize((float)"0x10");serialize((float)"010");serialize((double)null);serialize((double)true);serialize((double)false);serialize((double)0);serialize((double)1);serialize((double)1.2);serialize((double)"");serialize((double)"0");serialize((double)"1");serialize((double)"1.2");serialize((double)'');serialize((double)'0');serialize((double)'1');serialize((double)'1.2');serialize((double)__LINE__);serialize((double)__FUNCTION__);serialize((double)0x10);serialize((double)010);serialize((double)"0x10");serialize((double)"010");serialize((real)null);serialize((real)true);serialize((real)false);serialize((real)0);serialize((real)1);serialize((real)1.2);serialize((real)"");serialize((real)"0");serialize((real)"1");serialize((real)"1.2");serialize((real)'');serialize((real)'0');serialize((real)'1');serialize((real)'1.2');serialize((real)__LINE__);serialize((real)__FUNCTION__);serialize((real)0x10);serialize((real)010);serialize((real)"0x10");serialize((real)"010");serialize((string)null);serialize((string)true);serialize((string)false);serialize((string)0);serialize((string)1);serialize((string)1.2);serialize((string)"");serialize((string)"0");serialize((string)"1");serialize((string)"1.2");serialize((string)'');serialize((string)'0');serialize((string)'1');serialize((string)'1.2');serialize((string)__LINE__);serialize((string)__FUNCTION__);serialize((string)0x10);serialize((string)010);serialize((string)"0x10");serialize((string)"010");serialize(1.7e+319);serialize(!1.7e+319);serialize(+1.7e+319);serialize(-1.7e+319);serialize(~1.7e+319);serialize((1.7e+319));serialize((int)1.7e+319);serialize((integer)1.7e+319);serialize((bool)1.7e+319);serialize((boolean)1.7e+319);serialize((float)1.7e+319);serialize((double)1.7e+319);serialize((real)1.7e+319);serialize((string)1.7e+319);serialize("1.7e+319");serialize(!"1.7e+319");serialize(+"1.7e+319");serialize(-"1.7e+319");serialize(~"1.7e+319");serialize(("1.7e+319"));serialize((int)"1.7e+319");serialize((integer)"1.7e+319");serialize((bool)"1.7e+319");serialize((boolean)"1.7e+319");serialize((float)"1.7e+319");serialize((double)"1.7e+319");serialize((real)"1.7e+319");serialize((string)"1.7e+319");
\ No newline at end of file
+serialize(!null);
+serialize(!true);
+serialize(!false);
+serialize(!0);
+serialize(!1);
+serialize(!1.2);
+serialize(!"");
+serialize(!"0");
+serialize(!"1");
+serialize(!"1.2");
+serialize(!'');
+serialize(!'0');
+serialize(!'1');
+serialize(!'1.2');
+serialize(!__LINE__);
+serialize(!__FUNCTION__);
+serialize(!0x10);
+serialize(!010);
+serialize(!"0x10");
+serialize(!"010");
+serialize(+null);
+serialize(+true);
+serialize(+false);
+serialize(+0);
+serialize(+1);
+serialize(+1.2);
+serialize(+"");
+serialize(+"0");
+serialize(+"1");
+serialize(+"1.2");
+serialize(+'');
+serialize(+'0');
+serialize(+'1');
+serialize(+'1.2');
+serialize(+__LINE__);
+serialize(+__FUNCTION__);
+serialize(+0x10);
+serialize(+010);
+serialize(+"0x10");
+serialize(+"010");
+serialize(-null);
+serialize(-true);
+serialize(-false);
+serialize(-0);
+serialize(-1);
+serialize(-1.2);
+serialize(-"");
+serialize(-"0");
+serialize(-"1");
+serialize(-"1.2");
+serialize(-'');
+serialize(-'0');
+serialize(-'1');
+serialize(-'1.2');
+serialize(-__LINE__);
+serialize(-__FUNCTION__);
+serialize(-0x10);
+serialize(-010);
+serialize(-"0x10");
+serialize(-"010");
+serialize(~0);
+serialize(~1);
+serialize(~1.2);
+serialize(~"");
+serialize(~"0");
+serialize(~"1");
+serialize(~"1.2");
+serialize(~'');
+serialize(~'0');
+serialize(~'1');
+serialize(~'1.2');
+serialize(~__LINE__);
+serialize(~__FUNCTION__);
+serialize(~0x10);
+serialize(~010);
+serialize(~"0x10");
+serialize(~"010");
+serialize((null));
+serialize((true));
+serialize((false));
+serialize((0));
+serialize((1));
+serialize((1.2));
+serialize((""));
+serialize(("0"));
+serialize(("1"));
+serialize(("1.2"));
+serialize((''));
+serialize(('0'));
+serialize(('1'));
+serialize(('1.2'));
+serialize((__LINE__));
+serialize((__FUNCTION__));
+serialize((0x10));
+serialize((010));
+serialize(("0x10"));
+serialize(("010"));
+serialize((int)null);
+serialize((int)true);
+serialize((int)false);
+serialize((int)0);
+serialize((int)1);
+serialize((int)1.2);
+serialize((int)"");
+serialize((int)"0");
+serialize((int)"1");
+serialize((int)"1.2");
+serialize((int)'');
+serialize((int)'0');
+serialize((int)'1');
+serialize((int)'1.2');
+serialize((int)__LINE__);
+serialize((int)__FUNCTION__);
+serialize((int)0x10);
+serialize((int)010);
+serialize((int)"0x10");
+serialize((int)"010");
+serialize((integer)null);
+serialize((integer)true);
+serialize((integer)false);
+serialize((integer)0);
+serialize((integer)1);
+serialize((integer)1.2);
+serialize((integer)"");
+serialize((integer)"0");
+serialize((integer)"1");
+serialize((integer)"1.2");
+serialize((integer)'');
+serialize((integer)'0');
+serialize((integer)'1');
+serialize((integer)'1.2');
+serialize((integer)__LINE__);
+serialize((integer)__FUNCTION__);
+serialize((integer)0x10);
+serialize((integer)010);
+serialize((integer)"0x10");
+serialize((integer)"010");
+serialize((bool)null);
+serialize((bool)true);
+serialize((bool)false);
+serialize((bool)0);
+serialize((bool)1);
+serialize((bool)1.2);
+serialize((bool)"");
+serialize((bool)"0");
+serialize((bool)"1");
+serialize((bool)"1.2");
+serialize((bool)'');
+serialize((bool)'0');
+serialize((bool)'1');
+serialize((bool)'1.2');
+serialize((bool)__LINE__);
+serialize((bool)__FUNCTION__);
+serialize((bool)0x10);
+serialize((bool)010);
+serialize((bool)"0x10");
+serialize((bool)"010");
+serialize((boolean)null);
+serialize((boolean)true);
+serialize((boolean)false);
+serialize((boolean)0);
+serialize((boolean)1);
+serialize((boolean)1.2);
+serialize((boolean)"");
+serialize((boolean)"0");
+serialize((boolean)"1");
+serialize((boolean)"1.2");
+serialize((boolean)'');
+serialize((boolean)'0');
+serialize((boolean)'1');
+serialize((boolean)'1.2');
+serialize((boolean)__LINE__);
+serialize((boolean)__FUNCTION__);
+serialize((boolean)0x10);
+serialize((boolean)010);
+serialize((boolean)"0x10");
+serialize((boolean)"010");
+serialize((float)null);
+serialize((float)true);
+serialize((float)false);
+serialize((float)0);
+serialize((float)1);
+serialize((float)1.2);
+serialize((float)"");
+serialize((float)"0");
+serialize((float)"1");
+serialize((float)"1.2");
+serialize((float)'');
+serialize((float)'0');
+serialize((float)'1');
+serialize((float)'1.2');
+serialize((float)__LINE__);
+serialize((float)__FUNCTION__);
+serialize((float)0x10);
+serialize((float)010);
+serialize((float)"0x10");
+serialize((float)"010");
+serialize((double)null);
+serialize((double)true);
+serialize((double)false);
+serialize((double)0);
+serialize((double)1);
+serialize((double)1.2);
+serialize((double)"");
+serialize((double)"0");
+serialize((double)"1");
+serialize((double)"1.2");
+serialize((double)'');
+serialize((double)'0');
+serialize((double)'1');
+serialize((double)'1.2');
+serialize((double)__LINE__);
+serialize((double)__FUNCTION__);
+serialize((double)0x10);
+serialize((double)010);
+serialize((double)"0x10");
+serialize((double)"010");
+serialize((real)null);
+serialize((real)true);
+serialize((real)false);
+serialize((real)0);
+serialize((real)1);
+serialize((real)1.2);
+serialize((real)"");
+serialize((real)"0");
+serialize((real)"1");
+serialize((real)"1.2");
+serialize((real)'');
+serialize((real)'0');
+serialize((real)'1');
+serialize((real)'1.2');
+serialize((real)__LINE__);
+serialize((real)__FUNCTION__);
+serialize((real)0x10);
+serialize((real)010);
+serialize((real)"0x10");
+serialize((real)"010");
+serialize((string)null);
+serialize((string)true);
+serialize((string)false);
+serialize((string)0);
+serialize((string)1);
+serialize((string)1.2);
+serialize((string)"");
+serialize((string)"0");
+serialize((string)"1");
+serialize((string)"1.2");
+serialize((string)'');
+serialize((string)'0');
+serialize((string)'1');
+serialize((string)'1.2');
+serialize((string)__LINE__);
+serialize((string)__FUNCTION__);
+serialize((string)0x10);
+serialize((string)010);
+serialize((string)"0x10");
+serialize((string)"010");
+serialize(1.7e+319);
+serialize(!1.7e+319);
+serialize(+1.7e+319);
+serialize(-1.7e+319);
+serialize(~1.7e+319);
+serialize((1.7e+319));
+serialize((int)1.7e+319);
+serialize((integer)1.7e+319);
+serialize((bool)1.7e+319);
+serialize((boolean)1.7e+319);
+serialize((float)1.7e+319);
+serialize((double)1.7e+319);
+serialize((real)1.7e+319);
+serialize((string)1.7e+319);
+serialize("1.7e+319");
+serialize(!"1.7e+319");
+serialize(+"1.7e+319");
+serialize(-"1.7e+319");
+serialize(~"1.7e+319");
+serialize(("1.7e+319"));
+serialize((int)"1.7e+319");
+serialize((integer)"1.7e+319");
+serialize((bool)"1.7e+319");
+serialize((boolean)"1.7e+319");
+serialize((float)"1.7e+319");
+serialize((double)"1.7e+319");
+serialize((real)"1.7e+319");
+serialize((string)"1.7e+319");
diff --git a/hphp/test/slow/print/1448.php b/hphp/test/slow/print/1448.php
index 4813a4994..947fca1a6 100644
--- a/hphp/test/slow/print/1448.php
+++ b/hphp/test/slow/print/1448.php
@@ -1,3 +1,54 @@
 <?php
 
- serialize(array("\0" => 1));serialize(array("\0" => "\0"));serialize(array("\0" => "\\"));serialize(array("\0" => "\'"));serialize(array("\\" => 1));serialize(array("\\" => "\0"));serialize(array("\\" => "\\"));serialize(array("\\" => "\'"));serialize(array("\'" => 1));serialize(array("\'" => "\0"));serialize(array("\'" => "\\"));serialize(array("\'" => "\'"));serialize(array("\a" => "\a"));serialize(!array("\0" => "\0"));serialize((array("\0" => "\0")));serialize((int)array("\0" => "\0"));serialize((integer)array("\0" => "\0"));serialize((bool)array("\0" => "\0"));serialize((boolean)array("\0" => "\0"));serialize((float)array("\0" => "\0"));serialize((double)array("\0" => "\0"));serialize((real)array("\0" => "\0"));serialize((string)array("\0" => "\0"));$a = "0x10";serialize($a);serialize("\0");$a = array("\0" => 1);serialize($a);$a = array("\0" => "\0");serialize($a);$a = array("\0" => "\\");serialize($a);$a = array("\0" => "\'");serialize($a);$a = array("\\" => 1);serialize($a);$a = array("\\" => "\0");serialize($a);$a = array("\\" => "\\");serialize($a);$a = array("\\" => "\'");serialize($a);$a = array("\'" => 1);serialize($a);$a = array("\'" => "\0");serialize($a);$a = array("\'" => "\\");serialize($a);$a = array("\'" => "\'");serialize($a);$a = array("\a" => "\a");serialize($a);
\ No newline at end of file
+serialize(array("\0" => 1));
+serialize(array("\0" => "\0"));
+serialize(array("\0" => "\\"));
+serialize(array("\0" => "\'"));
+serialize(array("\\" => 1));
+serialize(array("\\" => "\0"));
+serialize(array("\\" => "\\"));
+serialize(array("\\" => "\'"));
+serialize(array("\'" => 1));
+serialize(array("\'" => "\0"));
+serialize(array("\'" => "\\"));
+serialize(array("\'" => "\'"));
+serialize(array("\a" => "\a"));
+serialize(!array("\0" => "\0"));
+serialize((array("\0" => "\0")));
+serialize((int)array("\0" => "\0"));
+serialize((integer)array("\0" => "\0"));
+serialize((bool)array("\0" => "\0"));
+serialize((boolean)array("\0" => "\0"));
+serialize((float)array("\0" => "\0"));
+serialize((double)array("\0" => "\0"));
+serialize((real)array("\0" => "\0"));
+serialize((string)array("\0" => "\0"));
+$a = "0x10";
+serialize($a);
+serialize("\0");
+$a = array("\0" => 1);
+serialize($a);
+$a = array("\0" => "\0");
+serialize($a);
+$a = array("\0" => "\\");
+serialize($a);
+$a = array("\0" => "\'");
+serialize($a);
+$a = array("\\" => 1);
+serialize($a);
+$a = array("\\" => "\0");
+serialize($a);
+$a = array("\\" => "\\");
+serialize($a);
+$a = array("\\" => "\'");
+serialize($a);
+$a = array("\'" => 1);
+serialize($a);
+$a = array("\'" => "\0");
+serialize($a);
+$a = array("\'" => "\\");
+serialize($a);
+$a = array("\'" => "\'");
+serialize($a);
+$a = array("\a" => "\a");
+serialize($a);
diff --git a/hphp/test/slow/program_functions/1235.php b/hphp/test/slow/program_functions/1235.php
index 8a115dffe..f97bc98f0 100644
--- a/hphp/test/slow/program_functions/1235.php
+++ b/hphp/test/slow/program_functions/1235.php
@@ -1,3 +1,4 @@
 <?php
+
 var_dump($argc, count($argv));
 var_dump($_SERVER['argc'], count($_SERVER['argv']));
diff --git a/hphp/test/slow/program_functions/1236.php b/hphp/test/slow/program_functions/1236.php
index 541097b53..6a6c67af2 100644
--- a/hphp/test/slow/program_functions/1236.php
+++ b/hphp/test/slow/program_functions/1236.php
@@ -1,3 +1,6 @@
 <?php
 
- function p($a) { print $a;} register_shutdown_function('p', 'shutdown');
\ No newline at end of file
+function p($a) {
+ print $a;
+}
+ register_shutdown_function('p', 'shutdown');
diff --git a/hphp/test/slow/program_functions/repo_contention.php b/hphp/test/slow/program_functions/repo_contention.php
index 9b98fdd73..e55c165dc 100755
--- a/hphp/test/slow/program_functions/repo_contention.php
+++ b/hphp/test/slow/program_functions/repo_contention.php
@@ -10,7 +10,9 @@ function main($num) {
   $start = microtime(true);
 
   echo "Starting $num procs\n";
-  for ($i = 0; $i < $num; $i++) {
+  for ($i = 0;
+ $i < $num;
+ $i++) {
     $handles[] = proc_open($cmd." $i", array(), $pipes);
   }
   while ($handles) {
@@ -27,7 +29,8 @@ function main($num) {
 }
 if (count($argv) > 1) {
   foobar($argv[1]);
-} else {
+}
+ else {
   $x10 = main(10);
   $x200 = main(200);
   echo $x10 * 20 < $x200 ? "Failed" : "Passed", "\n";
diff --git a/hphp/test/slow/range/548.php b/hphp/test/slow/range/548.php
index e6957e62e..d15a7895f 100644
--- a/hphp/test/slow/range/548.php
+++ b/hphp/test/slow/range/548.php
@@ -1,5 +1,22 @@
 <?php
 
- foreach (range("0 xxx", "12 yyy") as $number) {  echo $number . "
-";}foreach (range("0", "12") as $number) {  echo $number . "
-";}foreach (range('a', 'i') as $letter) {  echo $letter;}foreach (range('c', 'a') as $letter) {  echo $letter;}foreach (range('a xxx', 'i yyy') as $letter) {  echo $letter;}foreach (range('c xxx', 'a yyy') as $letter) {  echo $letter;}
\ No newline at end of file
+foreach (range("0 xxx", "12 yyy") as $number) {
+  echo $number . "
+";
+}
+foreach (range("0", "12") as $number) {
+  echo $number . "
+";
+}
+foreach (range('a', 'i') as $letter) {
+  echo $letter;
+}
+foreach (range('c', 'a') as $letter) {
+  echo $letter;
+}
+foreach (range('a xxx', 'i yyy') as $letter) {
+  echo $letter;
+}
+foreach (range('c xxx', 'a yyy') as $letter) {
+  echo $letter;
+}
diff --git a/hphp/test/slow/reassign_this/1490.php b/hphp/test/slow/reassign_this/1490.php
index 4ab4bdc6c..0cba785a3 100644
--- a/hphp/test/slow/reassign_this/1490.php
+++ b/hphp/test/slow/reassign_this/1490.php
@@ -1,3 +1,10 @@
 <?php
 
- class Foo {  function Bar() {    $__this = $this;    $this = null;    debug_backtrace();    $this = $__this;  } }
\ No newline at end of file
+class Foo {
+  function Bar() {
+    $__this = $this;
+    $this = null;
+    debug_backtrace();
+    $this = $__this;
+  }
+ }
diff --git a/hphp/test/slow/reassign_this/1490.php.expectf b/hphp/test/slow/reassign_this/1490.php.expectf
index dfe5e9816..50bc3cb58 100644
--- a/hphp/test/slow/reassign_this/1490.php.expectf
+++ b/hphp/test/slow/reassign_this/1490.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1490.php on line 3
+HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1490.php on line 6
diff --git a/hphp/test/slow/reassign_this/1491.php b/hphp/test/slow/reassign_this/1491.php
index 3cc3781b7..89c54dc49 100644
--- a/hphp/test/slow/reassign_this/1491.php
+++ b/hphp/test/slow/reassign_this/1491.php
@@ -1,3 +1,7 @@
 <?php
 
- function foo() {  $this = 2;  echo "You should not see this"; } foo();
\ No newline at end of file
+function foo() {
+  $this = 2;
+  echo "You should not see this";
+ }
+ foo();
diff --git a/hphp/test/slow/reassign_this/1491.php.expectf b/hphp/test/slow/reassign_this/1491.php.expectf
index 70d1a917b..5e75eeaeb 100644
--- a/hphp/test/slow/reassign_this/1491.php.expectf
+++ b/hphp/test/slow/reassign_this/1491.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1491.php on line 3
+HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1491.php on line 4
diff --git a/hphp/test/slow/reassign_this/1492.php b/hphp/test/slow/reassign_this/1492.php
index c06092d98..57a8319a5 100644
--- a/hphp/test/slow/reassign_this/1492.php
+++ b/hphp/test/slow/reassign_this/1492.php
@@ -1,3 +1,5 @@
 <?php
 
- $x = 5; $this =& $x; echo "You should not see this";
\ No newline at end of file
+$x = 5;
+ $this =& $x;
+ echo "You should not see this";
diff --git a/hphp/test/slow/reassign_this/1492.php.expectf b/hphp/test/slow/reassign_this/1492.php.expectf
index b95e35542..b079ccc03 100644
--- a/hphp/test/slow/reassign_this/1492.php.expectf
+++ b/hphp/test/slow/reassign_this/1492.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1492.php on line 3
+HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1492.php on line 4
diff --git a/hphp/test/slow/reassign_this/1493.php b/hphp/test/slow/reassign_this/1493.php
index 356d32c9e..985fa4c85 100644
--- a/hphp/test/slow/reassign_this/1493.php
+++ b/hphp/test/slow/reassign_this/1493.php
@@ -1,3 +1,7 @@
 <?php
 
- class Foo {  public $x; } $this = new Foo(); echo "You should not see this";
\ No newline at end of file
+class Foo {
+  public $x;
+ }
+ $this = new Foo();
+ echo "You should not see this";
diff --git a/hphp/test/slow/reassign_this/1493.php.expectf b/hphp/test/slow/reassign_this/1493.php.expectf
index 65591b643..4eb463d56 100644
--- a/hphp/test/slow/reassign_this/1493.php.expectf
+++ b/hphp/test/slow/reassign_this/1493.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1493.php on line 3
+HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1493.php on line 6
diff --git a/hphp/test/slow/reassign_this/1494.php b/hphp/test/slow/reassign_this/1494.php
index 6393b6ea4..389f91792 100644
--- a/hphp/test/slow/reassign_this/1494.php
+++ b/hphp/test/slow/reassign_this/1494.php
@@ -1,3 +1,7 @@
 <?php
 
- class Foo {  public $x; } $this =& new Foo(); echo "You should not see this";
\ No newline at end of file
+class Foo {
+  public $x;
+ }
+ $this =& new Foo();
+ echo "You should not see this";
diff --git a/hphp/test/slow/reassign_this/1494.php.expectf b/hphp/test/slow/reassign_this/1494.php.expectf
index 62ad56dc3..50ea8df2d 100644
--- a/hphp/test/slow/reassign_this/1494.php.expectf
+++ b/hphp/test/slow/reassign_this/1494.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1494.php on line 3
+HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1494.php on line 6
diff --git a/hphp/test/slow/reassign_this/1495.php b/hphp/test/slow/reassign_this/1495.php
index 77475b3de..7e2d4a9f0 100644
--- a/hphp/test/slow/reassign_this/1495.php
+++ b/hphp/test/slow/reassign_this/1495.php
@@ -1,3 +1,6 @@
 <?php
 
- $myarray = array(1 => 2, 2 => 3); foreach ($myarray as $this => $wat) {  echo "You should not see this"; }
\ No newline at end of file
+$myarray = array(1 => 2, 2 => 3);
+ foreach ($myarray as $this => $wat) {
+  echo "You should not see this";
+ }
diff --git a/hphp/test/slow/reassign_this/1495.php.expectf b/hphp/test/slow/reassign_this/1495.php.expectf
index a9341bef7..1c3ab0c18 100644
--- a/hphp/test/slow/reassign_this/1495.php.expectf
+++ b/hphp/test/slow/reassign_this/1495.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1495.php on line 3
+HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1495.php on line 6
diff --git a/hphp/test/slow/reassign_this/1496.php b/hphp/test/slow/reassign_this/1496.php
index ae7b4c779..2884e64b1 100644
--- a/hphp/test/slow/reassign_this/1496.php
+++ b/hphp/test/slow/reassign_this/1496.php
@@ -1,3 +1,6 @@
 <?php
 
- $myarray = array(1 => 2, 2 => 3); foreach ($myarray as $a => $this) {  echo "You should not see this"; }
\ No newline at end of file
+$myarray = array(1 => 2, 2 => 3);
+ foreach ($myarray as $a => $this) {
+  echo "You should not see this";
+ }
diff --git a/hphp/test/slow/reassign_this/1496.php.expectf b/hphp/test/slow/reassign_this/1496.php.expectf
index 1f0a461d1..35e1ec604 100644
--- a/hphp/test/slow/reassign_this/1496.php.expectf
+++ b/hphp/test/slow/reassign_this/1496.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1496.php on line 3
+HipHop Fatal error: Cannot re-assign $this in %s/hphp/test/slow/reassign_this/1496.php on line 6
diff --git a/hphp/test/slow/redeclared_classes/1461.php b/hphp/test/slow/redeclared_classes/1461.php
index f39f7cf82..12ffcbfb0 100644
--- a/hphp/test/slow/redeclared_classes/1461.php
+++ b/hphp/test/slow/redeclared_classes/1461.php
@@ -1,19 +1,23 @@
 <?php
 
-
 $b = 123;
 if ($b) {
-  class Exception1 extends Exception {}
-} else {
-  class Exception1 extends Exception {}
+  class Exception1 extends Exception {
+}
+}
+ else {
+  class Exception1 extends Exception {
+}
+}
+class Exception2 extends Exception1 {
 }
-class Exception2 extends Exception1 {}
 
 function foo() {
   $e = new Exception();
   try {
     throw new Exception2();
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     var_dump($e->getCode());
   }
 }
diff --git a/hphp/test/slow/redeclared_classes/1462.php b/hphp/test/slow/redeclared_classes/1462.php
index 73bef7348..ae189ac9e 100644
--- a/hphp/test/slow/redeclared_classes/1462.php
+++ b/hphp/test/slow/redeclared_classes/1462.php
@@ -1,5 +1,54 @@
 <?php
 
- class base1 {}class base2 {}if (true) {  class a extends base1 {    const aconst = "firstA";    const a1const = 0;    static $astat = 1;    static $a1stat = 1;    function __construct() { echo "first def made
-"; }    static function foo() { return 1;}  }} else {  class a extends base2 {    const aconst = "secondA";    const a2const = 0;    static $astat = 2;    static $a2stat = 2;    function __construct() { echo "second def made
-"; }    static function foo() { return 2;}  }}$foo = "foo";$y = new a;var_dump(a::foo());var_dump(a::$foo());var_dump(call_user_func(array('a','foo')));var_dump(a::$astat);var_dump(a::$a1stat);var_dump(a::aconst);var_dump(a::a1const);var_dump(method_exists('a',"foo"));var_dump(method_exists($y,"foo"));var_dump(property_exists("a","astat"));var_dump(property_exists("a","a1stat"));var_dump(property_exists("a","a2stat"));var_dump(get_parent_class($y));var_dump(is_subclass_of("a", "base1"));var_dump(is_subclass_of("a", "base2"));var_dump(get_object_vars($y));
\ No newline at end of file
+class base1 {
+}
+class base2 {
+}
+if (true) {
+  class a extends base1 {
+    const aconst = "firstA";
+    const a1const = 0;
+    static $astat = 1;
+    static $a1stat = 1;
+    function __construct() {
+ echo "first def made
+";
+ }
+    static function foo() {
+ return 1;
+}
+  }
+}
+ else {
+  class a extends base2 {
+    const aconst = "secondA";
+    const a2const = 0;
+    static $astat = 2;
+    static $a2stat = 2;
+    function __construct() {
+ echo "second def made
+";
+ }
+    static function foo() {
+ return 2;
+}
+  }
+}
+$foo = "foo";
+$y = new a;
+var_dump(a::foo());
+var_dump(a::$foo());
+var_dump(call_user_func(array('a','foo')));
+var_dump(a::$astat);
+var_dump(a::$a1stat);
+var_dump(a::aconst);
+var_dump(a::a1const);
+var_dump(method_exists('a',"foo"));
+var_dump(method_exists($y,"foo"));
+var_dump(property_exists("a","astat"));
+var_dump(property_exists("a","a1stat"));
+var_dump(property_exists("a","a2stat"));
+var_dump(get_parent_class($y));
+var_dump(is_subclass_of("a", "base1"));
+var_dump(is_subclass_of("a", "base2"));
+var_dump(get_object_vars($y));
diff --git a/hphp/test/slow/redeclared_classes/1463.php b/hphp/test/slow/redeclared_classes/1463.php
index cee71fa06..163df831c 100644
--- a/hphp/test/slow/redeclared_classes/1463.php
+++ b/hphp/test/slow/redeclared_classes/1463.php
@@ -1,3 +1,144 @@
 <?php
 
- if (true) {  class base {    public $baseVal =  'base';    static $baseStatic = 'baseStat';    function childProp() { return $this->childProp; }    function testChildMeth() { return $this->childMeth(); }    static function baseStatMeth() {      return 'Base static method';    }    function childMeth() { return 'I am base'; }  }} else {  class base {  }}class child1 extends base {  public $child1Val = 'child1';  public $childProp = 'IamChild1';  static $child1Static = 'child1Stat';  function childMeth() {    return 'I am child1';  }  static function child1StatMeth() {    return 'Child 1 static method';  }  function parentChildMeth() {    return parent::childMeth();  }}class child2 extends child1 {  public $child2Val = 'child2';  public $childProp = 'IamChild2';  static $child2Static = 'child2Stat';  static function child2StatMeth() {    return 'Child 2 static method';  }  function childMeth() {    return 'I am child2';  }  function parentChildMeth() {    return parent::childMeth();  }  function testChildMeth2() { return $this->childMeth(); }}if (true) {  class child3 extends child2 {    public $child3Val = 'child3';    public $childProp = 'IamChild3';    static $child3Static = 'child3Stat';    function childMeth() {      return 'I am child3';    }    static function child3StatMeth() {      return 'Child 3 static method';    }    function parentChildMeth() {      return parent::childMeth();    }  }} else {  class child3 {}}function test($val, $exp, $feature) {  if ($val !== $exp) {    echo $feature . " failed. Got:\n";    var_dump($val);    echo "But expected:\n";    var_dump($exp);  } else {    echo $feature . " passed\n";  }}function run() {  $base = new base;  test($base->baseVal, 'base', 'Base object member');  test(base::$baseStatic, 'baseStat', 'Base static member');  test(base::baseStatMeth(), 'Base static method', 'Base static method');  test($base->baseStatMeth(), 'Base static method', 'Base static method obj syntax');  $child1 = new child1;  test($child1->baseVal, 'base', 'dRedec inherited property');  test($child1->child1Val, 'child1', 'dRedec property');  test($child1->testChildMeth(), 'I am child1', 'dRedec parent->virtual method');  test($child1->childProp(), 'IamChild1', 'dRedec parent->child prop method');  test(child1::child1StatMeth(), 'Child 1 static method', 'dRedec static method');  test(child1::baseStatMeth(), 'Base static method', 'dRedec parent static method');  test($child1->child1StatMeth(), 'Child 1 static method', 'dRedec static method obj syntax');  test($child1->baseStatMeth(), 'Base static method', 'dRedec parent static method obj syntax');  test(child1::$baseStatic, 'baseStat', 'dRedec parent static prop');  test(child1::$child1Static, 'child1Stat', 'dRedec static prop');  test($child1->parentChildMeth(), 'I am base', 'dRedec parent method');  $child2 = new child2;  test($child2->baseVal, 'base', 'ddRedec grandparent property');  test($child2->child1Val, 'child1', 'ddRedec parent property');  test($child2->child2Val, 'child2', 'ddRedec property');  test($child2->testChildMeth(), 'I am child2', 'ddRedec grandparent->virtual method');  test($child2->testChildMeth2(), 'I am child2', 'ddRedec parent->virtual method');  test($child2->childProp(), 'IamChild2', 'ddRedec grandparent->child prop method');  test(child2::baseStatMeth(), 'Base static method', 'ddRedec grandparent static method');  test(child2::child1StatMeth(), 'Child 1 static method', 'ddRedec parent static method');  test(child2::child2StatMeth(), 'Child 2 static method', 'ddRedec static method');  test($child2->baseStatMeth(), 'Base static method', 'ddRedec grandparent static method obj syntax');  test($child2->child1StatMeth(), 'Child 1 static method', 'ddRedec parent static method obj syntax');  test($child2->child2StatMeth(), 'Child 2 static method', 'ddRedec static method obj syntax');  test(child2::$baseStatic, 'baseStat', 'ddRedec grandparent static prop');  test(child2::$child1Static, 'child1Stat', 'ddRedec parent static prop');  test(child2::$child2Static, 'child2Stat', 'ddRedec static prop');  test($child2->parentChildMeth(), 'I am child1', 'ddRedec parent method');  $child3 = new child3;  test($child3->baseVal, 'base', 'RddRedec greatgrandparent property');  test($child3->child1Val, 'child1', 'RddRedec grandparent property');  test($child3->child2Val, 'child2', 'RddRedec parent property');  test($child3->child3Val, 'child3', 'RddRedec property');  test($child3->testChildMeth(), 'I am child3', 'RddRedec greatgrandparent->virtual method');  test($child3->testChildMeth2(), 'I am child3', 'RddRedec grandparent->virtual method');  test($child3->childProp(), 'IamChild3', 'RddRedec greatgrandparent->child prop method');  test(child3::baseStatMeth(), 'Base static method', 'RddRedec greatgrandparent static method');  test(child3::child1StatMeth(), 'Child 1 static method', 'RddRedec grandparent static method');  test(child3::child2StatMeth(), 'Child 2 static method', 'RddRedec parent static method');  test(child3::child3StatMeth(), 'Child 3 static method', 'RddRedec static method');  test($child3->baseStatMeth(), 'Base static method', 'RddRedec greatgrandparent static method obj syntax');  test($child3->child1StatMeth(), 'Child 1 static method', 'RddRedec grandparent static method obj syntax');  test($child3->child2StatMeth(), 'Child 2 static method', 'RddRedec parent static method obj syntax');  test($child3->child3StatMeth(), 'Child 3 static method', 'RddRedec static method obj syntax');  test(child3::$baseStatic, 'baseStat', 'RddRedec greatgrandparent static prop');  test(child3::$child1Static, 'child1Stat', 'RddRedec grandparent static prop');  test(child3::$child2Static, 'child2Stat', 'RddRedec parent static prop');  test(child3::$child3Static, 'child3Stat', 'RddRedec static prop');  test($child3->parentChildMeth(), 'I am child2', 'RddRedec parent method');}run();
\ No newline at end of file
+if (true) {
+  class base {
+    public $baseVal =  'base';
+    static $baseStatic = 'baseStat';
+    function childProp() {
+ return $this->childProp;
+ }
+    function testChildMeth() {
+ return $this->childMeth();
+ }
+    static function baseStatMeth() {
+      return 'Base static method';
+    }
+    function childMeth() {
+ return 'I am base';
+ }
+  }
+}
+ else {
+  class base {
+  }
+}
+class child1 extends base {
+  public $child1Val = 'child1';
+  public $childProp = 'IamChild1';
+  static $child1Static = 'child1Stat';
+  function childMeth() {
+    return 'I am child1';
+  }
+  static function child1StatMeth() {
+    return 'Child 1 static method';
+  }
+  function parentChildMeth() {
+    return parent::childMeth();
+  }
+}
+class child2 extends child1 {
+  public $child2Val = 'child2';
+  public $childProp = 'IamChild2';
+  static $child2Static = 'child2Stat';
+  static function child2StatMeth() {
+    return 'Child 2 static method';
+  }
+  function childMeth() {
+    return 'I am child2';
+  }
+  function parentChildMeth() {
+    return parent::childMeth();
+  }
+  function testChildMeth2() {
+ return $this->childMeth();
+ }
+}
+if (true) {
+  class child3 extends child2 {
+    public $child3Val = 'child3';
+    public $childProp = 'IamChild3';
+    static $child3Static = 'child3Stat';
+    function childMeth() {
+      return 'I am child3';
+    }
+    static function child3StatMeth() {
+      return 'Child 3 static method';
+    }
+    function parentChildMeth() {
+      return parent::childMeth();
+    }
+  }
+}
+ else {
+  class child3 {
+}
+}
+function test($val, $exp, $feature) {
+  if ($val !== $exp) {
+    echo $feature . " failed. Got:\n";
+    var_dump($val);
+    echo "But expected:\n";
+    var_dump($exp);
+  }
+ else {
+    echo $feature . " passed\n";
+  }
+}
+function run() {
+  $base = new base;
+  test($base->baseVal, 'base', 'Base object member');
+  test(base::$baseStatic, 'baseStat', 'Base static member');
+  test(base::baseStatMeth(), 'Base static method', 'Base static method');
+  test($base->baseStatMeth(), 'Base static method', 'Base static method obj syntax');
+  $child1 = new child1;
+  test($child1->baseVal, 'base', 'dRedec inherited property');
+  test($child1->child1Val, 'child1', 'dRedec property');
+  test($child1->testChildMeth(), 'I am child1', 'dRedec parent->virtual method');
+  test($child1->childProp(), 'IamChild1', 'dRedec parent->child prop method');
+  test(child1::child1StatMeth(), 'Child 1 static method', 'dRedec static method');
+  test(child1::baseStatMeth(), 'Base static method', 'dRedec parent static method');
+  test($child1->child1StatMeth(), 'Child 1 static method', 'dRedec static method obj syntax');
+  test($child1->baseStatMeth(), 'Base static method', 'dRedec parent static method obj syntax');
+  test(child1::$baseStatic, 'baseStat', 'dRedec parent static prop');
+  test(child1::$child1Static, 'child1Stat', 'dRedec static prop');
+  test($child1->parentChildMeth(), 'I am base', 'dRedec parent method');
+  $child2 = new child2;
+  test($child2->baseVal, 'base', 'ddRedec grandparent property');
+  test($child2->child1Val, 'child1', 'ddRedec parent property');
+  test($child2->child2Val, 'child2', 'ddRedec property');
+  test($child2->testChildMeth(), 'I am child2', 'ddRedec grandparent->virtual method');
+  test($child2->testChildMeth2(), 'I am child2', 'ddRedec parent->virtual method');
+  test($child2->childProp(), 'IamChild2', 'ddRedec grandparent->child prop method');
+  test(child2::baseStatMeth(), 'Base static method', 'ddRedec grandparent static method');
+  test(child2::child1StatMeth(), 'Child 1 static method', 'ddRedec parent static method');
+  test(child2::child2StatMeth(), 'Child 2 static method', 'ddRedec static method');
+  test($child2->baseStatMeth(), 'Base static method', 'ddRedec grandparent static method obj syntax');
+  test($child2->child1StatMeth(), 'Child 1 static method', 'ddRedec parent static method obj syntax');
+  test($child2->child2StatMeth(), 'Child 2 static method', 'ddRedec static method obj syntax');
+  test(child2::$baseStatic, 'baseStat', 'ddRedec grandparent static prop');
+  test(child2::$child1Static, 'child1Stat', 'ddRedec parent static prop');
+  test(child2::$child2Static, 'child2Stat', 'ddRedec static prop');
+  test($child2->parentChildMeth(), 'I am child1', 'ddRedec parent method');
+  $child3 = new child3;
+  test($child3->baseVal, 'base', 'RddRedec greatgrandparent property');
+  test($child3->child1Val, 'child1', 'RddRedec grandparent property');
+  test($child3->child2Val, 'child2', 'RddRedec parent property');
+  test($child3->child3Val, 'child3', 'RddRedec property');
+  test($child3->testChildMeth(), 'I am child3', 'RddRedec greatgrandparent->virtual method');
+  test($child3->testChildMeth2(), 'I am child3', 'RddRedec grandparent->virtual method');
+  test($child3->childProp(), 'IamChild3', 'RddRedec greatgrandparent->child prop method');
+  test(child3::baseStatMeth(), 'Base static method', 'RddRedec greatgrandparent static method');
+  test(child3::child1StatMeth(), 'Child 1 static method', 'RddRedec grandparent static method');
+  test(child3::child2StatMeth(), 'Child 2 static method', 'RddRedec parent static method');
+  test(child3::child3StatMeth(), 'Child 3 static method', 'RddRedec static method');
+  test($child3->baseStatMeth(), 'Base static method', 'RddRedec greatgrandparent static method obj syntax');
+  test($child3->child1StatMeth(), 'Child 1 static method', 'RddRedec grandparent static method obj syntax');
+  test($child3->child2StatMeth(), 'Child 2 static method', 'RddRedec parent static method obj syntax');
+  test($child3->child3StatMeth(), 'Child 3 static method', 'RddRedec static method obj syntax');
+  test(child3::$baseStatic, 'baseStat', 'RddRedec greatgrandparent static prop');
+  test(child3::$child1Static, 'child1Stat', 'RddRedec grandparent static prop');
+  test(child3::$child2Static, 'child2Stat', 'RddRedec parent static prop');
+  test(child3::$child3Static, 'child3Stat', 'RddRedec static prop');
+  test($child3->parentChildMeth(), 'I am child2', 'RddRedec parent method');
+}
+run();
diff --git a/hphp/test/slow/redeclared_classes/1464.php b/hphp/test/slow/redeclared_classes/1464.php
index d0a763110..07ab37a2b 100644
--- a/hphp/test/slow/redeclared_classes/1464.php
+++ b/hphp/test/slow/redeclared_classes/1464.php
@@ -1,3 +1,26 @@
 <?php
 
- $i = 1;if ($i == 1) {  class foo {    function foo() {      echo "foo 1";    }    function bar() {      echo "bar 1";    }  }} else {  class foo {    function foo() {      echo "foo 2";    }    function bar() {      echo "bar 2";    }  }}$t = new foo();$t->foo();$t->bar();
\ No newline at end of file
+$i = 1;
+if ($i == 1) {
+  class foo {
+    function foo() {
+      echo "foo 1";
+    }
+    function bar() {
+      echo "bar 1";
+    }
+  }
+}
+ else {
+  class foo {
+    function foo() {
+      echo "foo 2";
+    }
+    function bar() {
+      echo "bar 2";
+    }
+  }
+}
+$t = new foo();
+$t->foo();
+$t->bar();
diff --git a/hphp/test/slow/redeclared_classes/1465.php b/hphp/test/slow/redeclared_classes/1465.php
index 1636d28a4..3b2f8eb8e 100644
--- a/hphp/test/slow/redeclared_classes/1465.php
+++ b/hphp/test/slow/redeclared_classes/1465.php
@@ -1,3 +1,26 @@
 <?php
 
- $i = 2;if ($i == 1) {  class foo {    function foo() {      echo "foo 1";    }    function bar() {      echo "bar 1";    }  }} else {  class foo {    function foo() {      echo "foo 2";    }    function bar() {      echo "bar 2";    }  }}$t = new foo();$t->foo();$t->bar();
\ No newline at end of file
+$i = 2;
+if ($i == 1) {
+  class foo {
+    function foo() {
+      echo "foo 1";
+    }
+    function bar() {
+      echo "bar 1";
+    }
+  }
+}
+ else {
+  class foo {
+    function foo() {
+      echo "foo 2";
+    }
+    function bar() {
+      echo "bar 2";
+    }
+  }
+}
+$t = new foo();
+$t->foo();
+$t->bar();
diff --git a/hphp/test/slow/redeclared_classes/1466.php b/hphp/test/slow/redeclared_classes/1466.php
index f9908e9a1..489a3848c 100644
--- a/hphp/test/slow/redeclared_classes/1466.php
+++ b/hphp/test/slow/redeclared_classes/1466.php
@@ -1,3 +1,17 @@
 <?php
 
- class a {  public static function x() {    echo 'x';  }}if (0) {  class b {  }}class b extends a{  public static function z() {    self::x();  }}b::x();
\ No newline at end of file
+class a {
+  public static function x() {
+    echo 'x';
+  }
+}
+if (0) {
+  class b {
+  }
+}
+class b extends a{
+  public static function z() {
+    self::x();
+  }
+}
+b::x();
diff --git a/hphp/test/slow/redeclared_classes/1467.php b/hphp/test/slow/redeclared_classes/1467.php
index c109c0b4a..c067455aa 100644
--- a/hphp/test/slow/redeclared_classes/1467.php
+++ b/hphp/test/slow/redeclared_classes/1467.php
@@ -1,3 +1,42 @@
 <?php
 
- function f($i) {  $j = 1;  var_dump($j);  if ($i == 1) {    class p {      public $data1;    }    class c extends p {    }    function r() { echo "r1\n"; }  } else {    class p {      public $data2;    }    class c extends p {    }    function r() { echo "r2\n"; }  }}if ($i == 1) {  class p {    public $data1;  }  class c extends p {  }  function r() { echo "r3\n"; }}f(1);$obj = new p();var_dump($obj);$obj = new c();var_dump($obj);r();
\ No newline at end of file
+function f($i) {
+  $j = 1;
+  var_dump($j);
+  if ($i == 1) {
+    class p {
+      public $data1;
+    }
+    class c extends p {
+    }
+    function r() {
+ echo "r1\n";
+ }
+  }
+ else {
+    class p {
+      public $data2;
+    }
+    class c extends p {
+    }
+    function r() {
+ echo "r2\n";
+ }
+  }
+}
+if ($i == 1) {
+  class p {
+    public $data1;
+  }
+  class c extends p {
+  }
+  function r() {
+ echo "r3\n";
+ }
+}
+f(1);
+$obj = new p();
+var_dump($obj);
+$obj = new c();
+var_dump($obj);
+r();
diff --git a/hphp/test/slow/redeclared_classes/1468.php b/hphp/test/slow/redeclared_classes/1468.php
index d69bfdbe5..6f7fce33e 100644
--- a/hphp/test/slow/redeclared_classes/1468.php
+++ b/hphp/test/slow/redeclared_classes/1468.php
@@ -1,3 +1,19 @@
 <?php
 
- class A {  protected static function foo() {}}if (false) {  class A{    protected static function foo() {}  }}class B extends A{}class C extends B {  function x() {    self::FOO();  }}
\ No newline at end of file
+class A {
+  protected static function foo() {
+}
+}
+if (false) {
+  class A{
+    protected static function foo() {
+}
+  }
+}
+class B extends A{
+}
+class C extends B {
+  function x() {
+    self::FOO();
+  }
+}
diff --git a/hphp/test/slow/redeclared_classes/1469.php b/hphp/test/slow/redeclared_classes/1469.php
index 4580897c8..dc2a41763 100644
--- a/hphp/test/slow/redeclared_classes/1469.php
+++ b/hphp/test/slow/redeclared_classes/1469.php
@@ -1,3 +1,20 @@
 <?php
 
- class A {  static function foo() {    static $z = 0;    $z++;    var_dump($z);  }}if (false) {  class A{}}class B extends A{}class C extends B {}A::foo();B::foo();C::foo();
\ No newline at end of file
+class A {
+  static function foo() {
+    static $z = 0;
+    $z++;
+    var_dump($z);
+  }
+}
+if (false) {
+  class A{
+}
+}
+class B extends A{
+}
+class C extends B {
+}
+A::foo();
+B::foo();
+C::foo();
diff --git a/hphp/test/slow/redeclared_classes/1470.php b/hphp/test/slow/redeclared_classes/1470.php
index 0b7ac7554..0ac1b92fb 100644
--- a/hphp/test/slow/redeclared_classes/1470.php
+++ b/hphp/test/slow/redeclared_classes/1470.php
@@ -1,3 +1,21 @@
 <?php
 
- $a = 1;if ($a) {interface A {}} else {interface A {}}if ($a) {interface B extends A {}} else {interface B extends A {}}class Z implements B {}
\ No newline at end of file
+$a = 1;
+if ($a) {
+interface A {
+}
+}
+ else {
+interface A {
+}
+}
+if ($a) {
+interface B extends A {
+}
+}
+ else {
+interface B extends A {
+}
+}
+class Z implements B {
+}
diff --git a/hphp/test/slow/redeclared_classes/1471.php b/hphp/test/slow/redeclared_classes/1471.php
index ee439a9fb..2b878eaf9 100644
--- a/hphp/test/slow/redeclared_classes/1471.php
+++ b/hphp/test/slow/redeclared_classes/1471.php
@@ -1,3 +1,15 @@
 <?php
 
- $ok = 1;if ($ok) {class A {const FOO = 'test';public $a = A::FOO;}} else {class A {const FOO = 'test';public $a = A::FOO;}}
\ No newline at end of file
+$ok = 1;
+if ($ok) {
+class A {
+const FOO = 'test';
+public $a = A::FOO;
+}
+}
+ else {
+class A {
+const FOO = 'test';
+public $a = A::FOO;
+}
+}
diff --git a/hphp/test/slow/redeclared_classes/1472.php b/hphp/test/slow/redeclared_classes/1472.php
index c40da36d4..ae9092493 100644
--- a/hphp/test/slow/redeclared_classes/1472.php
+++ b/hphp/test/slow/redeclared_classes/1472.php
@@ -1,4 +1,18 @@
 <?php
 
- class B {};if (0) {  class B {}}class A extends B {  function __call($name,$args) { echo 'A::$name
-'; }};$a = new A;call_user_func_array(array($a, 'foo'), array());
\ No newline at end of file
+class B {
+}
+;
+if (0) {
+  class B {
+}
+}
+class A extends B {
+  function __call($name,$args) {
+ echo 'A::$name
+';
+ }
+}
+;
+$a = new A;
+call_user_func_array(array($a, 'foo'), array());
diff --git a/hphp/test/slow/redeclared_classes/1473.php b/hphp/test/slow/redeclared_classes/1473.php
index 8a284071d..69339eb70 100644
--- a/hphp/test/slow/redeclared_classes/1473.php
+++ b/hphp/test/slow/redeclared_classes/1473.php
@@ -1,4 +1,20 @@
 <?php
 
- class A extends Exception { public $a = 1; }if (0) {  class A { public $a = 2; }}function test() {try {  throw new A;} catch (A $e) {  echo $e->a, '
-';}} test();
\ No newline at end of file
+class A extends Exception {
+ public $a = 1;
+ }
+if (0) {
+  class A {
+ public $a = 2;
+ }
+}
+function test() {
+try {
+  throw new A;
+}
+ catch (A $e) {
+  echo $e->a, '
+';
+}
+}
+ test();
diff --git a/hphp/test/slow/redeclared_classes/1474.php b/hphp/test/slow/redeclared_classes/1474.php
index cbd4aceb5..b4f0a9541 100644
--- a/hphp/test/slow/redeclared_classes/1474.php
+++ b/hphp/test/slow/redeclared_classes/1474.php
@@ -1,6 +1,8 @@
 <?php
 
-function nop($en,$es){};
+function nop($en,$es){
+}
+;
 set_error_handler('nop');
 class X {
   function bar() {
@@ -8,12 +10,16 @@ class X {
   }
 }
 if (1) {
-  class U {  }
-} else {
-  class U extends X {  }
+  class U {
+  }
+}
+ else {
+  class U extends X {
+  }
 }
 
-class V extends U {}
+class V extends U {
+}
 
 function test() {
   $x = new X;
diff --git a/hphp/test/slow/redeclared_classes/1475.php b/hphp/test/slow/redeclared_classes/1475.php
index 79ded90d5..44645f380 100644
--- a/hphp/test/slow/redeclared_classes/1475.php
+++ b/hphp/test/slow/redeclared_classes/1475.php
@@ -1,5 +1,16 @@
 <?php
 
- if (true) { class base extends Exception {} } else { class base {} }class child1 extends base {}$obj = new child1;echo ($obj instanceof Exception) ? "Passed
+if (true) {
+ class base extends Exception {
+}
+ }
+ else {
+ class base {
+}
+ }
+class child1 extends base {
+}
+$obj = new child1;
+echo ($obj instanceof Exception) ? "Passed
 " : "Failed
-";
\ No newline at end of file
+";
diff --git a/hphp/test/slow/redeclared_classes/1476.php b/hphp/test/slow/redeclared_classes/1476.php
index 1a29abb7e..11806b521 100644
--- a/hphp/test/slow/redeclared_classes/1476.php
+++ b/hphp/test/slow/redeclared_classes/1476.php
@@ -1,3 +1,29 @@
 <?php
 
- class PEAR {  static function f() { PEAR::g(); }  function g() { echo 'This is g()'; }}if ($x) {  class PEAR {}}class D1 extends PEAR {  public $foo;  private $bar;  function bar() { return $this->foo + $this->bar; }}class D2 extends D1 {  public $foo;  private $bar;  function bar() { return $this->foo + $this->bar; }}PEAR::f();
\ No newline at end of file
+class PEAR {
+  static function f() {
+ PEAR::g();
+ }
+  function g() {
+ echo 'This is g()';
+ }
+}
+if ($x) {
+  class PEAR {
+}
+}
+class D1 extends PEAR {
+  public $foo;
+  private $bar;
+  function bar() {
+ return $this->foo + $this->bar;
+ }
+}
+class D2 extends D1 {
+  public $foo;
+  private $bar;
+  function bar() {
+ return $this->foo + $this->bar;
+ }
+}
+PEAR::f();
diff --git a/hphp/test/slow/redeclared_classes/1477.php b/hphp/test/slow/redeclared_classes/1477.php
index 9a264f358..9fb0ffd8d 100644
--- a/hphp/test/slow/redeclared_classes/1477.php
+++ b/hphp/test/slow/redeclared_classes/1477.php
@@ -1,16 +1,26 @@
 <?php
 
-
-function __autoload($c) { var_dump($c); }
-function f() { return false; }
+function __autoload($c) {
+ var_dump($c);
+ }
+function f() {
+ return false;
+ }
 if (f()) {
-  interface A { }
-  class B { }
-  interface C { }
-} else {
-  class A { }
-  interface B { }
-  interface C { }
+  interface A {
+ }
+  class B {
+ }
+  interface C {
+ }
+}
+ else {
+  class A {
+ }
+  interface B {
+ }
+  interface C {
+ }
 }
 function test($c) {
   var_dump(class_exists('A'));
diff --git a/hphp/test/slow/redeclared_classes/1478.php b/hphp/test/slow/redeclared_classes/1478.php
index e661cf280..915ba1ccc 100644
--- a/hphp/test/slow/redeclared_classes/1478.php
+++ b/hphp/test/slow/redeclared_classes/1478.php
@@ -1,3 +1,28 @@
 <?php
 
- class A {  static function bar(&$a) {    $a = 'ok';  }}$a = 'failed';A::bar($a);var_dump($a);if (false) {  class A{}  class A2{}}class C {  static function bar() {  }}class A2 extends C {  static function bar(&$a) {    $a = 'ok';  }}$a = 'failed';A2::bar($a);var_dump($a);
\ No newline at end of file
+class A {
+  static function bar(&$a) {
+    $a = 'ok';
+  }
+}
+$a = 'failed';
+A::bar($a);
+var_dump($a);
+if (false) {
+  class A{
+}
+  class A2{
+}
+}
+class C {
+  static function bar() {
+  }
+}
+class A2 extends C {
+  static function bar(&$a) {
+    $a = 'ok';
+  }
+}
+$a = 'failed';
+A2::bar($a);
+var_dump($a);
diff --git a/hphp/test/slow/redeclared_classes/1479.php b/hphp/test/slow/redeclared_classes/1479.php
index 288c195e2..3ddb73ed0 100644
--- a/hphp/test/slow/redeclared_classes/1479.php
+++ b/hphp/test/slow/redeclared_classes/1479.php
@@ -1,3 +1,16 @@
 <?php
 
- if (!isset($g2)) {  class test {}} else {  class test {    static $foo = 27;  }  var_dump(test::$foo);}$x = new test();$x->bar = 1;$x->foo = 2;var_dump($x);
\ No newline at end of file
+if (!isset($g2)) {
+  class test {
+}
+}
+ else {
+  class test {
+    static $foo = 27;
+  }
+  var_dump(test::$foo);
+}
+$x = new test();
+$x->bar = 1;
+$x->foo = 2;
+var_dump($x);
diff --git a/hphp/test/slow/redeclared_classes/1480.php b/hphp/test/slow/redeclared_classes/1480.php
index 237e03fdd..c5aca0cf9 100644
--- a/hphp/test/slow/redeclared_classes/1480.php
+++ b/hphp/test/slow/redeclared_classes/1480.php
@@ -1,3 +1,25 @@
 <?php
 
- class A { function fun() { return 'A'; } }if (true) { class B {}} else { class B {} }class C extends B {  public function foo() { $this->out(A::fun()); }  public function out($arg) { var_dump($arg); }}$c = new C();$c->foo();
\ No newline at end of file
+class A {
+ function fun() {
+ return 'A';
+ }
+ }
+if (true) {
+ class B {
+}
+}
+ else {
+ class B {
+}
+ }
+class C extends B {
+  public function foo() {
+ $this->out(A::fun());
+ }
+  public function out($arg) {
+ var_dump($arg);
+ }
+}
+$c = new C();
+$c->foo();
diff --git a/hphp/test/slow/redeclared_classes/1481.php b/hphp/test/slow/redeclared_classes/1481.php
index 8c243fd6f..1f3dd5055 100644
--- a/hphp/test/slow/redeclared_classes/1481.php
+++ b/hphp/test/slow/redeclared_classes/1481.php
@@ -1,3 +1,23 @@
 <?php
 
- class b {  function z() {    $this->x();  }  function y() {    echo 'y';  }}class c extends b {  function x() {    $this->y();  }}if (false) {  class b{}  class c{}}$x = new c();$x->z();
\ No newline at end of file
+class b {
+  function z() {
+    $this->x();
+  }
+  function y() {
+    echo 'y';
+  }
+}
+class c extends b {
+  function x() {
+    $this->y();
+  }
+}
+if (false) {
+  class b{
+}
+  class c{
+}
+}
+$x = new c();
+$x->z();
diff --git a/hphp/test/slow/redeclared_classes/1482.php b/hphp/test/slow/redeclared_classes/1482.php
index 7405e0958..af8f8393c 100644
--- a/hphp/test/slow/redeclared_classes/1482.php
+++ b/hphp/test/slow/redeclared_classes/1482.php
@@ -1,4 +1,28 @@
 <?php
 
- class A {}class B extends A {  function meh() {    return $this;  }}class C extends B {  function work() {    echo "WORK
-";  }}if (false) {  class A {}  class B {}  class C {}}function test() {  $x = new C;  $x->meh()->work();}test();
\ No newline at end of file
+class A {
+}
+class B extends A {
+  function meh() {
+    return $this;
+  }
+}
+class C extends B {
+  function work() {
+    echo "WORK
+";
+  }
+}
+if (false) {
+  class A {
+}
+  class B {
+}
+  class C {
+}
+}
+function test() {
+  $x = new C;
+  $x->meh()->work();
+}
+test();
diff --git a/hphp/test/slow/redeclared_classes/1483.php b/hphp/test/slow/redeclared_classes/1483.php
index 19bbf17ab..09af9b4e0 100644
--- a/hphp/test/slow/redeclared_classes/1483.php
+++ b/hphp/test/slow/redeclared_classes/1483.php
@@ -1,3 +1,15 @@
 <?php
 
- if (isset($g)) {  class X {}} else {  class X {    static function foo() {}    function bar() {      X::foo(1,2,3);    }  }}
\ No newline at end of file
+if (isset($g)) {
+  class X {
+}
+}
+ else {
+  class X {
+    static function foo() {
+}
+    function bar() {
+      X::foo(1,2,3);
+    }
+  }
+}
diff --git a/hphp/test/slow/redeclared_classes/1484.php b/hphp/test/slow/redeclared_classes/1484.php
index a8eb0ccb9..c8bc33b10 100644
--- a/hphp/test/slow/redeclared_classes/1484.php
+++ b/hphp/test/slow/redeclared_classes/1484.php
@@ -1,3 +1,25 @@
 <?php
 
- if (isset($g)) {  class X {}} else {  class X {    public $a = 1;    function __destruct() { var_dump(__METHOD__); }  }}class X1 extends X {  public $t = 1;}function test() {  $x = new X1;  $x->t = 5;  $x->a = 3;  $y = clone $x;  var_dump($y->a,$y->t);}test();
\ No newline at end of file
+if (isset($g)) {
+  class X {
+}
+}
+ else {
+  class X {
+    public $a = 1;
+    function __destruct() {
+ var_dump(__METHOD__);
+ }
+  }
+}
+class X1 extends X {
+  public $t = 1;
+}
+function test() {
+  $x = new X1;
+  $x->t = 5;
+  $x->a = 3;
+  $y = clone $x;
+  var_dump($y->a,$y->t);
+}
+test();
diff --git a/hphp/test/slow/redeclared_classes/1485.php b/hphp/test/slow/redeclared_classes/1485.php
index f6764194c..cc65eb9e1 100644
--- a/hphp/test/slow/redeclared_classes/1485.php
+++ b/hphp/test/slow/redeclared_classes/1485.php
@@ -1,3 +1,27 @@
 <?php
 
- if (true) {  class A {    private $a = 1;  }  class B extends A {    public $a;    function f() { $this->a = 2; }  }} else {  class A {    protected $a = 1;  }  class B extends A {    public $a;    function f() { $this->a = 2; }  }}$obj = new B;$obj->f();var_dump($obj);
\ No newline at end of file
+if (true) {
+  class A {
+    private $a = 1;
+  }
+  class B extends A {
+    public $a;
+    function f() {
+ $this->a = 2;
+ }
+  }
+}
+ else {
+  class A {
+    protected $a = 1;
+  }
+  class B extends A {
+    public $a;
+    function f() {
+ $this->a = 2;
+ }
+  }
+}
+$obj = new B;
+$obj->f();
+var_dump($obj);
diff --git a/hphp/test/slow/redeclared_classes/1486.php b/hphp/test/slow/redeclared_classes/1486.php
index 7680566ab..e54833285 100644
--- a/hphp/test/slow/redeclared_classes/1486.php
+++ b/hphp/test/slow/redeclared_classes/1486.php
@@ -1,3 +1,20 @@
 <?php
 
- if (isset($g)) { class c{} } else { class c{} }class d extends c {  private $b = 'b';  function t2() {    foreach ($this as $k => $v) {      var_dump($v);    }  }}$x = new d;$x->t2();
\ No newline at end of file
+if (isset($g)) {
+ class c{
+}
+ }
+ else {
+ class c{
+}
+ }
+class d extends c {
+  private $b = 'b';
+  function t2() {
+    foreach ($this as $k => $v) {
+      var_dump($v);
+    }
+  }
+}
+$x = new d;
+$x->t2();
diff --git a/hphp/test/slow/redeclared_classes/1487.php b/hphp/test/slow/redeclared_classes/1487.php
index e41b9d6d2..479fb1add 100644
--- a/hphp/test/slow/redeclared_classes/1487.php
+++ b/hphp/test/slow/redeclared_classes/1487.php
@@ -1,3 +1,34 @@
 <?php
 
- if (!isset($h)) {  if (isset($g)) {    interface A { function foo(); }  } else {    interface A { function foo(); }  }} else {  if (isset($g)) {    interface X { function foo(); }  } else {    interface X { function foo(); }  }}abstract class B implements A { function bar() {} }var_dump(get_class_methods('A'));var_dump(get_class_methods('B'));var_dump(get_class_methods('X'));var_dump(get_class_methods('Y'));
\ No newline at end of file
+if (!isset($h)) {
+  if (isset($g)) {
+    interface A {
+ function foo();
+ }
+  }
+ else {
+    interface A {
+ function foo();
+ }
+  }
+}
+ else {
+  if (isset($g)) {
+    interface X {
+ function foo();
+ }
+  }
+ else {
+    interface X {
+ function foo();
+ }
+  }
+}
+abstract class B implements A {
+ function bar() {
+}
+ }
+var_dump(get_class_methods('A'));
+var_dump(get_class_methods('B'));
+var_dump(get_class_methods('X'));
+var_dump(get_class_methods('Y'));
diff --git a/hphp/test/slow/redeclared_classes/1488.php b/hphp/test/slow/redeclared_classes/1488.php
index 8824570c5..070341bbc 100644
--- a/hphp/test/slow/redeclared_classes/1488.php
+++ b/hphp/test/slow/redeclared_classes/1488.php
@@ -1,3 +1,29 @@
 <?php
 
- if (isset($g)) {  class X { function foo() { var_dump(__METHOD__); } }  class Y extends X {}} else {  class X { function foo() { var_dump(__METHOD__); } }  class Y {}}class Z extends Y {  function foo() { var_dump(__METHOD__); }  function bar() { X::foo(); }}Z::bar();
\ No newline at end of file
+if (isset($g)) {
+  class X {
+ function foo() {
+ var_dump(__METHOD__);
+ }
+ }
+  class Y extends X {
+}
+}
+ else {
+  class X {
+ function foo() {
+ var_dump(__METHOD__);
+ }
+ }
+  class Y {
+}
+}
+class Z extends Y {
+  function foo() {
+ var_dump(__METHOD__);
+ }
+  function bar() {
+ X::foo();
+ }
+}
+Z::bar();
diff --git a/hphp/test/slow/redeclared_classes/1489.php b/hphp/test/slow/redeclared_classes/1489.php
index 895c111a8..3eaef34bf 100644
--- a/hphp/test/slow/redeclared_classes/1489.php
+++ b/hphp/test/slow/redeclared_classes/1489.php
@@ -1,3 +1,58 @@
 <?php
 
- if (isset($g)) {  class X {}} else {  class X {    function __destruct() { var_dump(__METHOD__); }    protected $prot_over_prot = 1;    public $pub_over_pub = 2;    protected $pub_over_prot = 3;  }}class Y extends X {  function __destruct() { var_dump(__METHOD__,$this); }  protected $prot_over_prot = 4;  public $pub_over_pub = 5;  public $pub_over_prot = 6;  protected $prot_base = 7;  public $pub_base = 8;}class Z extends Y {  function __destruct() { var_dump(__METHOD__); }  public $prot_over_prot = 9;  public $pub_over_pub = 10;  public $pub_over_prot = 11;  public $prot_base = 12;  public $pub_base = 13;}function foo($x) {  $s = serialize($x);  var_dump($s);  $y = unserialize($s);  var_dump($y);  var_dump((array)$y);  if (function_exists('apc_store')) {    apc_store('foo', $y);    $z = apc_fetch('foo');  } else {    $z = clone $y;  }  var_dump($z);  unset($z, $y);  var_dump($x);}$y = new y;foo($y);$z = new z;foo($z);unset($z, $y);
\ No newline at end of file
+if (isset($g)) {
+  class X {
+}
+}
+ else {
+  class X {
+    function __destruct() {
+ var_dump(__METHOD__);
+ }
+    protected $prot_over_prot = 1;
+    public $pub_over_pub = 2;
+    protected $pub_over_prot = 3;
+  }
+}
+class Y extends X {
+  function __destruct() {
+ var_dump(__METHOD__,$this);
+ }
+  protected $prot_over_prot = 4;
+  public $pub_over_pub = 5;
+  public $pub_over_prot = 6;
+  protected $prot_base = 7;
+  public $pub_base = 8;
+}
+class Z extends Y {
+  function __destruct() {
+ var_dump(__METHOD__);
+ }
+  public $prot_over_prot = 9;
+  public $pub_over_pub = 10;
+  public $pub_over_prot = 11;
+  public $prot_base = 12;
+  public $pub_base = 13;
+}
+function foo($x) {
+  $s = serialize($x);
+  var_dump($s);
+  $y = unserialize($s);
+  var_dump($y);
+  var_dump((array)$y);
+  if (function_exists('apc_store')) {
+    apc_store('foo', $y);
+    $z = apc_fetch('foo');
+  }
+ else {
+    $z = clone $y;
+  }
+  var_dump($z);
+  unset($z, $y);
+  var_dump($x);
+}
+$y = new y;
+foo($y);
+$z = new z;
+foo($z);
+unset($z, $y);
diff --git a/hphp/test/slow/redeclared_functions/1459.php b/hphp/test/slow/redeclared_functions/1459.php
index 722a77c7c..9a11f6ffe 100644
--- a/hphp/test/slow/redeclared_functions/1459.php
+++ b/hphp/test/slow/redeclared_functions/1459.php
@@ -1,3 +1,13 @@
 <?php
 
- if (true) {  function test() {    echo('a');  }} else {  function test() {    echo('b');  }}test();
\ No newline at end of file
+if (true) {
+  function test() {
+    echo('a');
+  }
+}
+ else {
+  function test() {
+    echo('b');
+  }
+}
+test();
diff --git a/hphp/test/slow/redeclared_functions/1460.php b/hphp/test/slow/redeclared_functions/1460.php
index 1e43be90f..79553ac2a 100644
--- a/hphp/test/slow/redeclared_functions/1460.php
+++ b/hphp/test/slow/redeclared_functions/1460.php
@@ -1,3 +1,10 @@
 <?php
 
- function test($a, $b, $c, $d, $e, $f, $g = 0) {  return $a;}if (0) { function test($a) {} }test(1,2,3,4,5,6);
\ No newline at end of file
+function test($a, $b, $c, $d, $e, $f, $g = 0) {
+  return $a;
+}
+if (0) {
+ function test($a) {
+}
+ }
+test(1,2,3,4,5,6);
diff --git a/hphp/test/slow/reference/1056.php b/hphp/test/slow/reference/1056.php
index 77d15fb2f..462813bea 100644
--- a/hphp/test/slow/reference/1056.php
+++ b/hphp/test/slow/reference/1056.php
@@ -1,3 +1,4 @@
 <?php
 
- $idxa = array('a' => 1240430476);$idxa = &$idxa['a'];
\ No newline at end of file
+$idxa = array('a' => 1240430476);
+$idxa = &$idxa['a'];
diff --git a/hphp/test/slow/reference/1057.php b/hphp/test/slow/reference/1057.php
index 64baabbb8..516833bd7 100644
--- a/hphp/test/slow/reference/1057.php
+++ b/hphp/test/slow/reference/1057.php
@@ -1,3 +1,8 @@
 <?php
 
- $a = array(1, 'a'); $b = $a; foreach ($b as $k => &$v) { $v = 'ok';} var_dump($a, $b);
\ No newline at end of file
+$a = array(1, 'a');
+ $b = $a;
+ foreach ($b as $k => &$v) {
+ $v = 'ok';
+}
+ var_dump($a, $b);
diff --git a/hphp/test/slow/reference/1058.php b/hphp/test/slow/reference/1058.php
index a23723d8b..316eea495 100644
--- a/hphp/test/slow/reference/1058.php
+++ b/hphp/test/slow/reference/1058.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array(1, 'test'); $b = $a; $c = &$b[0]; $c = 10; var_dump($a, $b);
\ No newline at end of file
+$a = array(1, 'test');
+ $b = $a;
+ $c = &$b[0];
+ $c = 10;
+ var_dump($a, $b);
diff --git a/hphp/test/slow/reference/1059.php b/hphp/test/slow/reference/1059.php
index 1cbc27380..eef1beb85 100644
--- a/hphp/test/slow/reference/1059.php
+++ b/hphp/test/slow/reference/1059.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = &$b; $a = 10; var_dump($b);
\ No newline at end of file
+$a = &$b;
+ $a = 10;
+ var_dump($b);
diff --git a/hphp/test/slow/reference/1060.php b/hphp/test/slow/reference/1060.php
index 1623a9543..c32597f31 100644
--- a/hphp/test/slow/reference/1060.php
+++ b/hphp/test/slow/reference/1060.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 1; $b = $a;  $a = 2; var_dump($b);
\ No newline at end of file
+$a = 1;
+ $b = $a;
+  $a = 2;
+ var_dump($b);
diff --git a/hphp/test/slow/reference/1061.php b/hphp/test/slow/reference/1061.php
index 32f326921..59d523c73 100644
--- a/hphp/test/slow/reference/1061.php
+++ b/hphp/test/slow/reference/1061.php
@@ -1,3 +1,8 @@
 <?php
 
- $a = 1; $b = &$a; $c = $b; $a = 2; var_dump($b); var_dump($c);
\ No newline at end of file
+$a = 1;
+ $b = &$a;
+ $c = $b;
+ $a = 2;
+ var_dump($b);
+ var_dump($c);
diff --git a/hphp/test/slow/reference/1062.php b/hphp/test/slow/reference/1062.php
index 479f52745..97d8980c5 100644
--- a/hphp/test/slow/reference/1062.php
+++ b/hphp/test/slow/reference/1062.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 1; $b = &$a; $b = 2; var_dump($a);
\ No newline at end of file
+$a = 1;
+ $b = &$a;
+ $b = 2;
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1063.php b/hphp/test/slow/reference/1063.php
index 7d4865b8f..985dc1442 100644
--- a/hphp/test/slow/reference/1063.php
+++ b/hphp/test/slow/reference/1063.php
@@ -1,3 +1,8 @@
 <?php
 
- $a = 1; $b = &$a; $c = $b; $b = 2; var_dump($a); var_dump($c);
\ No newline at end of file
+$a = 1;
+ $b = &$a;
+ $c = $b;
+ $b = 2;
+ var_dump($a);
+ var_dump($c);
diff --git a/hphp/test/slow/reference/1064.php b/hphp/test/slow/reference/1064.php
index f9a0326b8..16e3f1b71 100644
--- a/hphp/test/slow/reference/1064.php
+++ b/hphp/test/slow/reference/1064.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 1; $c = $b = &$a; $b = 2; var_dump($a); var_dump($c);
\ No newline at end of file
+$a = 1;
+ $c = $b = &$a;
+ $b = 2;
+ var_dump($a);
+ var_dump($c);
diff --git a/hphp/test/slow/reference/1065.php b/hphp/test/slow/reference/1065.php
index e675ad101..8b1d38830 100644
--- a/hphp/test/slow/reference/1065.php
+++ b/hphp/test/slow/reference/1065.php
@@ -1,3 +1,10 @@
 <?php
 
- $a = 1; $b = &$a; $c = 2; $b = $c; $c = 5; var_dump($a); var_dump($b); var_dump($c);
\ No newline at end of file
+$a = 1;
+ $b = &$a;
+ $c = 2;
+ $b = $c;
+ $c = 5;
+ var_dump($a);
+ var_dump($b);
+ var_dump($c);
diff --git a/hphp/test/slow/reference/1066.php b/hphp/test/slow/reference/1066.php
index ddc69eeca..f2afbcbfb 100644
--- a/hphp/test/slow/reference/1066.php
+++ b/hphp/test/slow/reference/1066.php
@@ -1,3 +1,11 @@
 <?php
 
- $a = 1; $b = &$a; $c = 2; $d = &$c; $b = $d; var_dump($a); var_dump($b); var_dump($c); var_dump($d);
\ No newline at end of file
+$a = 1;
+ $b = &$a;
+ $c = 2;
+ $d = &$c;
+ $b = $d;
+ var_dump($a);
+ var_dump($b);
+ var_dump($c);
+ var_dump($d);
diff --git a/hphp/test/slow/reference/1067.php b/hphp/test/slow/reference/1067.php
index 96c92c7be..0ffa4eb82 100644
--- a/hphp/test/slow/reference/1067.php
+++ b/hphp/test/slow/reference/1067.php
@@ -1,3 +1,11 @@
 <?php
 
- $a = 1; $b = &$a; $c = 2; $d = &$c; $b = &$d; var_dump($a); var_dump($b); var_dump($c); var_dump($d);
\ No newline at end of file
+$a = 1;
+ $b = &$a;
+ $c = 2;
+ $d = &$c;
+ $b = &$d;
+ var_dump($a);
+ var_dump($b);
+ var_dump($c);
+ var_dump($d);
diff --git a/hphp/test/slow/reference/1068.php b/hphp/test/slow/reference/1068.php
index bc4ca2887..5cc309d07 100644
--- a/hphp/test/slow/reference/1068.php
+++ b/hphp/test/slow/reference/1068.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 10; $b = array(&$a); var_dump($b); $a = 20; var_dump($b);
\ No newline at end of file
+$a = 10;
+ $b = array(&$a);
+ var_dump($b);
+ $a = 20;
+ var_dump($b);
diff --git a/hphp/test/slow/reference/1069.php b/hphp/test/slow/reference/1069.php
index b2a53bc14..62dd870ed 100644
--- a/hphp/test/slow/reference/1069.php
+++ b/hphp/test/slow/reference/1069.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array(); $b = 10; $a[] = &$b; $b = 20; var_dump($a);
\ No newline at end of file
+$a = array();
+ $b = 10;
+ $a[] = &$b;
+ $b = 20;
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1070.php b/hphp/test/slow/reference/1070.php
index 6eaa83621..3bf8a5c1c 100644
--- a/hphp/test/slow/reference/1070.php
+++ b/hphp/test/slow/reference/1070.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 10; $b = array('test' => &$a); var_dump($b); $a = 20; var_dump($b);
\ No newline at end of file
+$a = 10;
+ $b = array('test' => &$a);
+ var_dump($b);
+ $a = 20;
+ var_dump($b);
diff --git a/hphp/test/slow/reference/1071.php b/hphp/test/slow/reference/1071.php
index 6d0fbea21..531561eec 100644
--- a/hphp/test/slow/reference/1071.php
+++ b/hphp/test/slow/reference/1071.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array(); $b = 1; $a['t'] = &$b; $b = 2; var_dump($a);
\ No newline at end of file
+$a = array();
+ $b = 1;
+ $a['t'] = &$b;
+ $b = 2;
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1072.php b/hphp/test/slow/reference/1072.php
index 9090783a6..7906d8a8f 100644
--- a/hphp/test/slow/reference/1072.php
+++ b/hphp/test/slow/reference/1072.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array(1, 2); foreach ($a as $b) { $b++;} var_dump($a);
\ No newline at end of file
+$a = array(1, 2);
+ foreach ($a as $b) {
+ $b++;
+}
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1073.php b/hphp/test/slow/reference/1073.php
index 29b59f8d4..d356c0c1e 100644
--- a/hphp/test/slow/reference/1073.php
+++ b/hphp/test/slow/reference/1073.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array(1, 2); foreach ($a as &$b) { $b++;} var_dump($a);
\ No newline at end of file
+$a = array(1, 2);
+ foreach ($a as &$b) {
+ $b++;
+}
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1074.php b/hphp/test/slow/reference/1074.php
index 98394248b..0f14a3f25 100644
--- a/hphp/test/slow/reference/1074.php
+++ b/hphp/test/slow/reference/1074.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = array(1, array(2,3)); foreach ($a[1] as &$b) { $b++;} var_dump($a);
\ No newline at end of file
+$a = array(1, array(2,3));
+ foreach ($a[1] as &$b) {
+ $b++;
+}
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1075.php b/hphp/test/slow/reference/1075.php
index 7e2c33dfb..d71646988 100644
--- a/hphp/test/slow/reference/1075.php
+++ b/hphp/test/slow/reference/1075.php
@@ -1,3 +1,8 @@
 <?php
 
- function f(&$a) { $a = 'ok';} $a = 10; f($a); var_dump($a);
\ No newline at end of file
+function f(&$a) {
+ $a = 'ok';
+}
+ $a = 10;
+ f($a);
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1076.php b/hphp/test/slow/reference/1076.php
index 9b2b0c917..7ff113388 100644
--- a/hphp/test/slow/reference/1076.php
+++ b/hphp/test/slow/reference/1076.php
@@ -1,3 +1,9 @@
 <?php
 
- function f(&$a) { $a = 'ok';} $a = array(); $c = &$a['b']; $c = 'ok'; var_dump($a);
\ No newline at end of file
+function f(&$a) {
+ $a = 'ok';
+}
+ $a = array();
+ $c = &$a['b'];
+ $c = 'ok';
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1077.php b/hphp/test/slow/reference/1077.php
index 8fcb213d4..f447446bd 100644
--- a/hphp/test/slow/reference/1077.php
+++ b/hphp/test/slow/reference/1077.php
@@ -1,3 +1,9 @@
 <?php
 
- function f(&$a) { $a = 'ok';} $a = array(); $c = &$a['b']; f($c); var_dump($a);
\ No newline at end of file
+function f(&$a) {
+ $a = 'ok';
+}
+ $a = array();
+ $c = &$a['b'];
+ f($c);
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1078.php b/hphp/test/slow/reference/1078.php
index 46fe04925..8e8740c77 100644
--- a/hphp/test/slow/reference/1078.php
+++ b/hphp/test/slow/reference/1078.php
@@ -1,3 +1,8 @@
 <?php
 
- function f(&$a) { $a = 'ok';} $a = array(); f($a['b']); var_dump($a);
\ No newline at end of file
+function f(&$a) {
+ $a = 'ok';
+}
+ $a = array();
+ f($a['b']);
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1079.php b/hphp/test/slow/reference/1079.php
index 5afe6156c..00702ab25 100644
--- a/hphp/test/slow/reference/1079.php
+++ b/hphp/test/slow/reference/1079.php
@@ -1,3 +1,12 @@
 <?php
 
- function f(&$a) { $a = 'ok';} class T { public $b = 10;} $a = new T(); $a->b = 10; f($a->b); var_dump($a);
\ No newline at end of file
+function f(&$a) {
+ $a = 'ok';
+}
+ class T {
+ public $b = 10;
+}
+ $a = new T();
+ $a->b = 10;
+ f($a->b);
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1080.php b/hphp/test/slow/reference/1080.php
index b22c54c10..cd3440b05 100644
--- a/hphp/test/slow/reference/1080.php
+++ b/hphp/test/slow/reference/1080.php
@@ -1,3 +1,11 @@
 <?php
 
- function f(&$a) { $a = 'ok';} class T {} $a = new T(); $a->b = 10; f($a->b); var_dump($a);
\ No newline at end of file
+function f(&$a) {
+ $a = 'ok';
+}
+ class T {
+}
+ $a = new T();
+ $a->b = 10;
+ f($a->b);
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1081.php b/hphp/test/slow/reference/1081.php
index 42dc163dc..0652b912f 100644
--- a/hphp/test/slow/reference/1081.php
+++ b/hphp/test/slow/reference/1081.php
@@ -1,3 +1,7 @@
 <?php
 
- function f(&$a) {} $a = array(); f($a['b']); var_dump($a);
\ No newline at end of file
+function f(&$a) {
+}
+ $a = array();
+ f($a['b']);
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1082.php b/hphp/test/slow/reference/1082.php
index b6d10c30b..617edf47a 100644
--- a/hphp/test/slow/reference/1082.php
+++ b/hphp/test/slow/reference/1082.php
@@ -1,3 +1,10 @@
 <?php
 
- function f(&$a) {} class T {} $a = new T(); $a->b = 10; f($a->b); var_dump($a);
\ No newline at end of file
+function f(&$a) {
+}
+ class T {
+}
+ $a = new T();
+ $a->b = 10;
+ f($a->b);
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1083.php b/hphp/test/slow/reference/1083.php
index 0ed078384..aede02d2f 100644
--- a/hphp/test/slow/reference/1083.php
+++ b/hphp/test/slow/reference/1083.php
@@ -1,3 +1,10 @@
 <?php
 
- $a = 10; function &f() { global $a; return $a;} $b = &f(); $b = 20; var_dump($a);
\ No newline at end of file
+$a = 10;
+ function &f() {
+ global $a;
+ return $a;
+}
+ $b = &f();
+ $b = 20;
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1084.php b/hphp/test/slow/reference/1084.php
index 40f2510bb..6a19bfa0b 100644
--- a/hphp/test/slow/reference/1084.php
+++ b/hphp/test/slow/reference/1084.php
@@ -1,3 +1,9 @@
 <?php
 
- function &f() { $a = 10; return $a;} $b = &f(); $b = 20; var_dump($b);
\ No newline at end of file
+function &f() {
+ $a = 10;
+ return $a;
+}
+ $b = &f();
+ $b = 20;
+ var_dump($b);
diff --git a/hphp/test/slow/reference/1085.php b/hphp/test/slow/reference/1085.php
index 08d513132..73ac1079e 100644
--- a/hphp/test/slow/reference/1085.php
+++ b/hphp/test/slow/reference/1085.php
@@ -1,3 +1,10 @@
 <?php
 
- $a = array(); function &f() { global $a; return $a['b'];} $b = &f(); $b = 20; var_dump($a);
\ No newline at end of file
+$a = array();
+ function &f() {
+ global $a;
+ return $a['b'];
+}
+ $b = &f();
+ $b = 20;
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1086.php b/hphp/test/slow/reference/1086.php
index e2e34cfe9..16c8e71b5 100644
--- a/hphp/test/slow/reference/1086.php
+++ b/hphp/test/slow/reference/1086.php
@@ -1,3 +1,9 @@
 <?php
 
- function &f() { $a = array(); return $a['b'];} $b = &f(); $b = 20; var_dump($b);
\ No newline at end of file
+function &f() {
+ $a = array();
+ return $a['b'];
+}
+ $b = &f();
+ $b = 20;
+ var_dump($b);
diff --git a/hphp/test/slow/reference/1087.php b/hphp/test/slow/reference/1087.php
index 05792805b..44141b569 100644
--- a/hphp/test/slow/reference/1087.php
+++ b/hphp/test/slow/reference/1087.php
@@ -1,6 +1,7 @@
 <?php
 
-
-$a1 = array(&$a1, 1); $a2 = $a1; unset($a1);
+$a1 = array(&$a1, 1);
+ $a2 = $a1;
+ unset($a1);
 $a2[0][] = 2;
 var_dump($a2[0][0][0][2]);
diff --git a/hphp/test/slow/reference/1088.php b/hphp/test/slow/reference/1088.php
index 6dfb2b013..5c71836c0 100644
--- a/hphp/test/slow/reference/1088.php
+++ b/hphp/test/slow/reference/1088.php
@@ -1,3 +1,11 @@
 <?php
 
- function test($a) { $a[1] = 10; $a['r'] = 20;} $b = 5; $a = array('r' => &$b); $a['r'] = 6; test($a); var_dump($a);
\ No newline at end of file
+function test($a) {
+ $a[1] = 10;
+ $a['r'] = 20;
+}
+ $b = 5;
+ $a = array('r' => &$b);
+ $a['r'] = 6;
+ test($a);
+ var_dump($a);
diff --git a/hphp/test/slow/reference/1089.php b/hphp/test/slow/reference/1089.php
index c6d2872dd..e0a28f4c7 100644
--- a/hphp/test/slow/reference/1089.php
+++ b/hphp/test/slow/reference/1089.php
@@ -1,3 +1,16 @@
 <?php
 
- $a = array('a'=>0);$ref = &$a['a'];var_dump($a);$b = $a;var_dump($a,$b);$b['a'] = 1;var_dump($a,$b);$a = array(0);$ref = &$a[0];var_dump($a);$b = $a;var_dump($a,$b);$b[0] = 1;var_dump($a,$b);
\ No newline at end of file
+$a = array('a'=>0);
+$ref = &$a['a'];
+var_dump($a);
+$b = $a;
+var_dump($a,$b);
+$b['a'] = 1;
+var_dump($a,$b);
+$a = array(0);
+$ref = &$a[0];
+var_dump($a);
+$b = $a;
+var_dump($a,$b);
+$b[0] = 1;
+var_dump($a,$b);
diff --git a/hphp/test/slow/reference/1090.php b/hphp/test/slow/reference/1090.php
index 6ec2aba39..7960764f5 100644
--- a/hphp/test/slow/reference/1090.php
+++ b/hphp/test/slow/reference/1090.php
@@ -1,3 +1,33 @@
 <?php
 
- class A {  function t($a, $arr) {  }}class B extends A {  function t($a, $arr) {    var_dump($a);    $arr['hello'] = $a;    var_dump($a);  }}function f() {  return new B();}function test() {  $v = 100;  $arr['hello'] = $v;  $a = new B();  $a->t($arr['hello'], $arr);}test();$arr = array('hello' => 1);$x = &$arr['hello'];$arr['hello'] = $x;var_dump($arr);function test2(&$a, $b) {  $a = $b;}$v = 10;test2($v, $v);var_dump($v);
\ No newline at end of file
+class A {
+  function t($a, $arr) {
+  }
+}
+class B extends A {
+  function t($a, $arr) {
+    var_dump($a);
+    $arr['hello'] = $a;
+    var_dump($a);
+  }
+}
+function f() {
+  return new B();
+}
+function test() {
+  $v = 100;
+  $arr['hello'] = $v;
+  $a = new B();
+  $a->t($arr['hello'], $arr);
+}
+test();
+$arr = array('hello' => 1);
+$x = &$arr['hello'];
+$arr['hello'] = $x;
+var_dump($arr);
+function test2(&$a, $b) {
+  $a = $b;
+}
+$v = 10;
+test2($v, $v);
+var_dump($v);
diff --git a/hphp/test/slow/reference/1091.php b/hphp/test/slow/reference/1091.php
index c49178133..4b5d69bd7 100644
--- a/hphp/test/slow/reference/1091.php
+++ b/hphp/test/slow/reference/1091.php
@@ -1,3 +1,30 @@
 <?php
 
- function test(&$some_ref) {  $some_ref = 42;}test($some_ref = 1);var_dump($some_ref);$var = null;test($var);var_dump($var);$var = null;test($some_ref = $var);var_dump($some_ref, $var);$var = null;test($some_ref = &$var);var_dump($some_ref, $var);function test2($some_ref) {  $some_ref = 42;}test2($some_ref = 1);var_dump($some_ref);$var = null;test2($var);var_dump($var);$var = null;test2($some_ref = $var);var_dump($some_ref, $var);$var = null;test2($some_ref = &$var);var_dump($some_ref, $var);
\ No newline at end of file
+function test(&$some_ref) {
+  $some_ref = 42;
+}
+test($some_ref = 1);
+var_dump($some_ref);
+$var = null;
+test($var);
+var_dump($var);
+$var = null;
+test($some_ref = $var);
+var_dump($some_ref, $var);
+$var = null;
+test($some_ref = &$var);
+var_dump($some_ref, $var);
+function test2($some_ref) {
+  $some_ref = 42;
+}
+test2($some_ref = 1);
+var_dump($some_ref);
+$var = null;
+test2($var);
+var_dump($var);
+$var = null;
+test2($some_ref = $var);
+var_dump($some_ref, $var);
+$var = null;
+test2($some_ref = &$var);
+var_dump($some_ref, $var);
diff --git a/hphp/test/slow/reference/1092.php b/hphp/test/slow/reference/1092.php
index 1cb163105..103e999b7 100644
--- a/hphp/test/slow/reference/1092.php
+++ b/hphp/test/slow/reference/1092.php
@@ -1,3 +1,21 @@
 <?php
 
- $foo = 123;function &baz() {  global $foo;  return $foo;}function bar() {  $baz = 'baz';  return $baz();}function buz() {  global $foo;  return ($foo);}$a = &bar();$a = 456;var_dump($a, $foo);$a = &buz();$a = 789;var_dump($a, $foo);
\ No newline at end of file
+$foo = 123;
+function &baz() {
+  global $foo;
+  return $foo;
+}
+function bar() {
+  $baz = 'baz';
+  return $baz();
+}
+function buz() {
+  global $foo;
+  return ($foo);
+}
+$a = &bar();
+$a = 456;
+var_dump($a, $foo);
+$a = &buz();
+$a = 789;
+var_dump($a, $foo);
diff --git a/hphp/test/slow/reference/1093.php b/hphp/test/slow/reference/1093.php
index 47fa78083..ed11d3324 100644
--- a/hphp/test/slow/reference/1093.php
+++ b/hphp/test/slow/reference/1093.php
@@ -1,3 +1,10 @@
 <?php
 
- function &test(&$x) {  $x = 1;  return $x;}$x = 0;$y = &test($x);$y++;var_dump($x, $y);
\ No newline at end of file
+function &test(&$x) {
+  $x = 1;
+  return $x;
+}
+$x = 0;
+$y = &test($x);
+$y++;
+var_dump($x, $y);
diff --git a/hphp/test/slow/reference/1094.php b/hphp/test/slow/reference/1094.php
index a574e00ec..54b6e8867 100644
--- a/hphp/test/slow/reference/1094.php
+++ b/hphp/test/slow/reference/1094.php
@@ -1,3 +1,25 @@
 <?php
 
- function foo(&$a) { var_dump($a++); }function test() {  foo($a = 6);  $a = null;  foo($b += 5);  $b = null;  foo($c -= 5);  $c = null;  $e = 0;  foo(++$e);  $e = 5;  $g = 0;  foo(--$g);  $g = 7;  $h = null;  foo($h += 5);  $h = null;  foo($h -= 5);  $h = null;}test();
\ No newline at end of file
+function foo(&$a) {
+ var_dump($a++);
+ }
+function test() {
+  foo($a = 6);
+  $a = null;
+  foo($b += 5);
+  $b = null;
+  foo($c -= 5);
+  $c = null;
+  $e = 0;
+  foo(++$e);
+  $e = 5;
+  $g = 0;
+  foo(--$g);
+  $g = 7;
+  $h = null;
+  foo($h += 5);
+  $h = null;
+  foo($h -= 5);
+  $h = null;
+}
+test();
diff --git a/hphp/test/slow/reference/1095.php b/hphp/test/slow/reference/1095.php
index d2fa1729b..8c7716c1f 100644
--- a/hphp/test/slow/reference/1095.php
+++ b/hphp/test/slow/reference/1095.php
@@ -1,3 +1,10 @@
 <?php
 
- function foo() {  $perms = array('x' => 1);  $t = &$perms;  $t = $t['x'];  unset($t);  return $perms;}var_dump(foo());
\ No newline at end of file
+function foo() {
+  $perms = array('x' => 1);
+  $t = &$perms;
+  $t = $t['x'];
+  unset($t);
+  return $perms;
+}
+var_dump(foo());
diff --git a/hphp/test/slow/reference/1096.php b/hphp/test/slow/reference/1096.php
index 62e9acb46..b03a3f297 100644
--- a/hphp/test/slow/reference/1096.php
+++ b/hphp/test/slow/reference/1096.php
@@ -1,3 +1,9 @@
 <?php
 
- $a = array();$a[0][0] = $a;var_dump($a);$b[0][0] = $b;var_dump($b);$c[0] = $c;var_dump($c);
\ No newline at end of file
+$a = array();
+$a[0][0] = $a;
+var_dump($a);
+$b[0][0] = $b;
+var_dump($b);
+$c[0] = $c;
+var_dump($c);
diff --git a/hphp/test/slow/reference/1097.php b/hphp/test/slow/reference/1097.php
index 036263f58..7ce8ba33c 100644
--- a/hphp/test/slow/reference/1097.php
+++ b/hphp/test/slow/reference/1097.php
@@ -1,3 +1,22 @@
 <?php
 
- function foo($x) {  var_dump($x[0]->foo['a']['b']);  $x[0]->foo['a']['b'] = 5;  var_dump($x);}foo(false);function baz(&$x) {}foreach ($x->foo[1]->prop as &$y) {}var_dump($x);baz($q->foo[1]->prop);var_dump($q);$y = &$z->foo[1]->prop;var_dump($z);function &fiz(&$x) {  return $x->foo[1]->prop;}fiz($w);var_dump($w);
\ No newline at end of file
+function foo($x) {
+  var_dump($x[0]->foo['a']['b']);
+  $x[0]->foo['a']['b'] = 5;
+  var_dump($x);
+}
+foo(false);
+function baz(&$x) {
+}
+foreach ($x->foo[1]->prop as &$y) {
+}
+var_dump($x);
+baz($q->foo[1]->prop);
+var_dump($q);
+$y = &$z->foo[1]->prop;
+var_dump($z);
+function &fiz(&$x) {
+  return $x->foo[1]->prop;
+}
+fiz($w);
+var_dump($w);
diff --git a/hphp/test/slow/reference/1098.php b/hphp/test/slow/reference/1098.php
index ca725ef05..bc696eb00 100644
--- a/hphp/test/slow/reference/1098.php
+++ b/hphp/test/slow/reference/1098.php
@@ -1,9 +1,13 @@
 <?php
 
- $x = 0;
+$x = 0;
 $foo0 = isset($g) ? "ref" : "val";
 $foo1 = isset($g) ? "val" : "ref";
-function ref(&$a, $b) { echo "$a $b"; }
-function val($a, $b)  { echo "$a $b"; }
+function ref(&$a, $b) {
+ echo "$a $b";
+ }
+function val($a, $b)  {
+ echo "$a $b";
+ }
 $foo0($x, $x = 5);
 $foo1($x, $x = 5);
diff --git a/hphp/test/slow/reference/1099.php b/hphp/test/slow/reference/1099.php
index 3c270871a..5e27aabfb 100644
--- a/hphp/test/slow/reference/1099.php
+++ b/hphp/test/slow/reference/1099.php
@@ -1,8 +1,11 @@
 <?php
 
-
-function f($arg0, $arg1) { var_dump($arg0, $arg1); }
-function g(&$arg0, $arg1) { var_dump($arg0, $arg1); }
+function f($arg0, $arg1) {
+ var_dump($arg0, $arg1);
+ }
+function g(&$arg0, $arg1) {
+ var_dump($arg0, $arg1);
+ }
 class A {
   function f($f, $var) {
     $f($this, $$var = 5);
diff --git a/hphp/test/slow/reference/1100.php b/hphp/test/slow/reference/1100.php
index c98410c90..0565597f5 100644
--- a/hphp/test/slow/reference/1100.php
+++ b/hphp/test/slow/reference/1100.php
@@ -1,3 +1,20 @@
 <?php
 
- function foo($a, &$b, $c) {  $a+=1;  $b+=2;  $c+=3;  var_dump($a,$b,$c);}function bar(&$a, &$b, &$c) {  $a+=1;  $b+=2;  $c+=3;  var_dump($a,$b,$c);}function test($fn, $arg) {  $fn($arg, $arg, $arg);  var_dump($arg);}test('foo', 1);test('bar', 1);
\ No newline at end of file
+function foo($a, &$b, $c) {
+  $a+=1;
+  $b+=2;
+  $c+=3;
+  var_dump($a,$b,$c);
+}
+function bar(&$a, &$b, &$c) {
+  $a+=1;
+  $b+=2;
+  $c+=3;
+  var_dump($a,$b,$c);
+}
+function test($fn, $arg) {
+  $fn($arg, $arg, $arg);
+  var_dump($arg);
+}
+test('foo', 1);
+test('bar', 1);
diff --git a/hphp/test/slow/reference/1101.php b/hphp/test/slow/reference/1101.php
index 1dea99179..8de700dec 100644
--- a/hphp/test/slow/reference/1101.php
+++ b/hphp/test/slow/reference/1101.php
@@ -1,3 +1,18 @@
 <?php
 
- class X {  public $x = 10;  function __destruct() {    var_dump('destruct');    $this->x = 0;  }}function test(&$a, $b) {  var_dump($a, $b);}function f($x) {  unset($GLOBALS['a']);  return 1;}$a = array(new X);test($a[0], f(1));
\ No newline at end of file
+class X {
+  public $x = 10;
+  function __destruct() {
+    var_dump('destruct');
+    $this->x = 0;
+  }
+}
+function test(&$a, $b) {
+  var_dump($a, $b);
+}
+function f($x) {
+  unset($GLOBALS['a']);
+  return 1;
+}
+$a = array(new X);
+test($a[0], f(1));
diff --git a/hphp/test/slow/reference/1102.php b/hphp/test/slow/reference/1102.php
index de7f0c334..ba900ddaf 100644
--- a/hphp/test/slow/reference/1102.php
+++ b/hphp/test/slow/reference/1102.php
@@ -1,3 +1,13 @@
 <?php
 
- function test(&$some_ref) { $some_ref = 42; }function bar() { return 'test'; }$p = bar();$p($some_ref = 1);var_dump($some_ref);$p($some_ref = &$q);var_dump($some_ref,$q);
\ No newline at end of file
+function test(&$some_ref) {
+ $some_ref = 42;
+ }
+function bar() {
+ return 'test';
+ }
+$p = bar();
+$p($some_ref = 1);
+var_dump($some_ref);
+$p($some_ref = &$q);
+var_dump($some_ref,$q);
diff --git a/hphp/test/slow/reference/1103.php b/hphp/test/slow/reference/1103.php
index 79efe6b8b..2ad08af60 100644
--- a/hphp/test/slow/reference/1103.php
+++ b/hphp/test/slow/reference/1103.php
@@ -1,3 +1,14 @@
 <?php
 
- function foo(&$x, $y) { $x++; var_dump($x); }function bar(&$x, $y, $f) {  $f($x, $x = &$y);  foo($x, $x = &$y);  foo($y, $y = 2);}$x = 0;bar($x, $x, 'foo');var_dump($x);
\ No newline at end of file
+function foo(&$x, $y) {
+ $x++;
+ var_dump($x);
+ }
+function bar(&$x, $y, $f) {
+  $f($x, $x = &$y);
+  foo($x, $x = &$y);
+  foo($y, $y = 2);
+}
+$x = 0;
+bar($x, $x, 'foo');
+var_dump($x);
diff --git a/hphp/test/slow/reference/1104.php b/hphp/test/slow/reference/1104.php
index b46ab5b9d..5b14dd65c 100644
--- a/hphp/test/slow/reference/1104.php
+++ b/hphp/test/slow/reference/1104.php
@@ -1,3 +1,25 @@
 <?php
 
- function f($x) {  global $u;  if (isset($u)) return null;  return $x;}function test($a) {  $a++;  return $a;}function &foo() {  return $GLOBALS['x'];}$x = 1;test(foo());var_dump($x);$f = f('foo');$x = 1;test($f());var_dump($x);$t = f('test');$x = 1;$t(foo());var_dump($x);
\ No newline at end of file
+function f($x) {
+  global $u;
+  if (isset($u)) return null;
+  return $x;
+}
+function test($a) {
+  $a++;
+  return $a;
+}
+function &foo() {
+  return $GLOBALS['x'];
+}
+$x = 1;
+test(foo());
+var_dump($x);
+$f = f('foo');
+$x = 1;
+test($f());
+var_dump($x);
+$t = f('test');
+$x = 1;
+$t(foo());
+var_dump($x);
diff --git a/hphp/test/slow/reference/1105.php b/hphp/test/slow/reference/1105.php
index c97c26384..0f6a9bfae 100644
--- a/hphp/test/slow/reference/1105.php
+++ b/hphp/test/slow/reference/1105.php
@@ -1,3 +1,9 @@
 <?php
 
- function test() {  $x =& $y;  $x = false;  $y .= 'hello';  echo $x;}test();
\ No newline at end of file
+function test() {
+  $x =& $y;
+  $x = false;
+  $y .= 'hello';
+  echo $x;
+}
+test();
diff --git a/hphp/test/slow/reflection/1328.php b/hphp/test/slow/reflection/1328.php
index 349fed3b1..fb5a506cc 100644
--- a/hphp/test/slow/reflection/1328.php
+++ b/hphp/test/slow/reflection/1328.php
@@ -1,6 +1,8 @@
 <?php
 
-
-class A { public function foo() {}}
+class A {
+ public function foo() {
+}
+}
 $x = new ReflectionMethod('A::foo');
 var_dump($x->name, $x->class);
diff --git a/hphp/test/slow/reflection/1329.php b/hphp/test/slow/reflection/1329.php
index 0b2709a34..5a1677193 100644
--- a/hphp/test/slow/reflection/1329.php
+++ b/hphp/test/slow/reflection/1329.php
@@ -1,3 +1,9 @@
 <?php
 
- class A { public static function test() { print 'ok';}}var_dump(is_callable('A::test'));var_dump(function_exists('A::test'));
\ No newline at end of file
+class A {
+ public static function test() {
+ print 'ok';
+}
+}
+var_dump(is_callable('A::test'));
+var_dump(function_exists('A::test'));
diff --git a/hphp/test/slow/reflection/1330.php b/hphp/test/slow/reflection/1330.php
index 166341baa..42836cec8 100644
--- a/hphp/test/slow/reflection/1330.php
+++ b/hphp/test/slow/reflection/1330.php
@@ -1,3 +1,10 @@
 <?php
 
- function test($a) { return 'ok'.$a;}var_dump(function_exists('TEst')); var_dump(is_callable('teSt'));var_dump(call_user_func('teST', 'blah')); var_dump(call_user_func_array('teST', array('blah'))); 
\ No newline at end of file
+function test($a) {
+ return 'ok'.$a;
+}
+var_dump(function_exists('TEst'));
+ var_dump(is_callable('teSt'));
+var_dump(call_user_func('teST', 'blah'));
+ var_dump(call_user_func_array('teST', array('blah')));
+
diff --git a/hphp/test/slow/reflection/1331.php b/hphp/test/slow/reflection/1331.php
index aa61622ef..773587c7e 100644
--- a/hphp/test/slow/reflection/1331.php
+++ b/hphp/test/slow/reflection/1331.php
@@ -1,3 +1,22 @@
 <?php
 
- class B { public function f($a) { return 'ok'.$a;}} class A extends B { public $p = 'g';} $obj = new A(); var_dump(get_class($obj)); var_dump(get_parent_class($obj)); var_dump(is_a($obj, 'b')); var_dump(is_subclass_of($obj, 'b'));var_dump(method_exists($obj, 'f'));var_dump(method_exists('A', 'f'));var_dump(is_callable(array($obj, 'f')));var_dump(is_callable(array('A', 'f')));var_dump(get_object_vars($obj));var_dump(call_user_method('f', $obj, 'blah'));var_dump(call_user_method_array('f', $obj, array('blah')));
\ No newline at end of file
+class B {
+ public function f($a) {
+ return 'ok'.$a;
+}
+}
+ class A extends B {
+ public $p = 'g';
+}
+ $obj = new A();
+ var_dump(get_class($obj));
+ var_dump(get_parent_class($obj));
+ var_dump(is_a($obj, 'b'));
+ var_dump(is_subclass_of($obj, 'b'));
+var_dump(method_exists($obj, 'f'));
+var_dump(method_exists('A', 'f'));
+var_dump(is_callable(array($obj, 'f')));
+var_dump(is_callable(array('A', 'f')));
+var_dump(get_object_vars($obj));
+var_dump(call_user_method('f', $obj, 'blah'));
+var_dump(call_user_method_array('f', $obj, array('blah')));
diff --git a/hphp/test/slow/reflection/1332.php b/hphp/test/slow/reflection/1332.php
index fada709f2..5fa0aa919 100644
--- a/hphp/test/slow/reflection/1332.php
+++ b/hphp/test/slow/reflection/1332.php
@@ -1,3 +1,16 @@
 <?php
 
- class A { public static function f($a) { return 'ok'.$a;}} $obj = new A(); var_dump(method_exists($obj, 'f'));var_dump(method_exists('A', 'f'));var_dump(is_callable(array($obj, 'f')));var_dump(is_callable(array('A', 'f')));var_dump(call_user_func(array($obj,'f'), 'blah'));var_dump(call_user_func_array(array($obj,'f'), array('blah')));var_dump(call_user_func(array('A','f'), 'blah'));var_dump(call_user_func_array(array('A','f'), array('blah')));
\ No newline at end of file
+class A {
+ public static function f($a) {
+ return 'ok'.$a;
+}
+}
+ $obj = new A();
+ var_dump(method_exists($obj, 'f'));
+var_dump(method_exists('A', 'f'));
+var_dump(is_callable(array($obj, 'f')));
+var_dump(is_callable(array('A', 'f')));
+var_dump(call_user_func(array($obj,'f'), 'blah'));
+var_dump(call_user_func_array(array($obj,'f'), array('blah')));
+var_dump(call_user_func(array('A','f'), 'blah'));
+var_dump(call_user_func_array(array('A','f'), array('blah')));
diff --git a/hphp/test/slow/reflection/1333.php b/hphp/test/slow/reflection/1333.php
index 790c2025c..778a552b7 100644
--- a/hphp/test/slow/reflection/1333.php
+++ b/hphp/test/slow/reflection/1333.php
@@ -1,3 +1,11 @@
 <?php
 
- class A { function foo() {} }class B extends A { function bar() {}}var_dump(get_class_methods(new B()));
\ No newline at end of file
+class A {
+ function foo() {
+}
+ }
+class B extends A {
+ function bar() {
+}
+}
+var_dump(get_class_methods(new B()));
diff --git a/hphp/test/slow/reflection/1334.php b/hphp/test/slow/reflection/1334.php
index 404e6f943..47a0f180a 100644
--- a/hphp/test/slow/reflection/1334.php
+++ b/hphp/test/slow/reflection/1334.php
@@ -1,3 +1,26 @@
 <?php
 
- class X {  public function a() { var_dump(get_class_methods($this)); }  protected function b() {}  private function c() {}  final function d() {}  public function e() {}}class Y {  public function a() { var_dump(get_class_methods($this)); }}$x = new X;$x->a();$y = new Y;$y->a();var_dump(get_class_methods($x));var_dump(get_class_methods($y));
\ No newline at end of file
+class X {
+  public function a() {
+ var_dump(get_class_methods($this));
+ }
+  protected function b() {
+}
+  private function c() {
+}
+  final function d() {
+}
+  public function e() {
+}
+}
+class Y {
+  public function a() {
+ var_dump(get_class_methods($this));
+ }
+}
+$x = new X;
+$x->a();
+$y = new Y;
+$y->a();
+var_dump(get_class_methods($x));
+var_dump(get_class_methods($y));
diff --git a/hphp/test/slow/reflection/1335.php b/hphp/test/slow/reflection/1335.php
index 19fb954e1..4ed55b0f6 100644
--- a/hphp/test/slow/reflection/1335.php
+++ b/hphp/test/slow/reflection/1335.php
@@ -1,3 +1,10 @@
 <?php
 
- interface A { function foo(); }abstract class B implements A { function bar() {}}var_dump(get_class_methods('B'));
\ No newline at end of file
+interface A {
+ function foo();
+ }
+abstract class B implements A {
+ function bar() {
+}
+}
+var_dump(get_class_methods('B'));
diff --git a/hphp/test/slow/reflection/1336.php b/hphp/test/slow/reflection/1336.php
index 6a20fb6bc..19cb30298 100644
--- a/hphp/test/slow/reflection/1336.php
+++ b/hphp/test/slow/reflection/1336.php
@@ -1,3 +1,38 @@
 <?php
 
- interface I1 { function ifoo2(); function ifoo1(); }interface I2 { function ifoo4(); function ifoo3(); }class A { function foo() {} function foo2() {} }abstract class B extends A implements I1, I2 { function bar() {}}abstract class C extends A implements I2, I1 { function bar() {}}class D extends C { function ifoo2() {} function ifoo1() {}  function ifoo4() {} function ifoo3() {} function bar() {} }var_dump(get_class_methods('B'));var_dump(get_class_methods('C'));
\ No newline at end of file
+interface I1 {
+ function ifoo2();
+ function ifoo1();
+ }
+interface I2 {
+ function ifoo4();
+ function ifoo3();
+ }
+class A {
+ function foo() {
+}
+ function foo2() {
+}
+ }
+abstract class B extends A implements I1, I2 {
+ function bar() {
+}
+}
+abstract class C extends A implements I2, I1 {
+ function bar() {
+}
+}
+class D extends C {
+ function ifoo2() {
+}
+ function ifoo1() {
+}
+  function ifoo4() {
+}
+ function ifoo3() {
+}
+ function bar() {
+}
+ }
+var_dump(get_class_methods('B'));
+var_dump(get_class_methods('C'));
diff --git a/hphp/test/slow/reflection/1337.php b/hphp/test/slow/reflection/1337.php
index 4e3b472b1..638d079df 100644
--- a/hphp/test/slow/reflection/1337.php
+++ b/hphp/test/slow/reflection/1337.php
@@ -1,3 +1,8 @@
 <?php
 
- class A { static $a = 10; public $b = 20;}$obj = new A(); var_dump(get_object_vars($obj));
\ No newline at end of file
+class A {
+ static $a = 10;
+ public $b = 20;
+}
+$obj = new A();
+ var_dump(get_object_vars($obj));
diff --git a/hphp/test/slow/reflection/1338.php b/hphp/test/slow/reflection/1338.php
index b4747134e..1a2e83cbd 100644
--- a/hphp/test/slow/reflection/1338.php
+++ b/hphp/test/slow/reflection/1338.php
@@ -1,7 +1,7 @@
 <?php
 
-
-function foo($a = null) {}
+function foo($a = null) {
+}
 $func = new ReflectionFunction('foo');
 $params = $func->getParameters();
 var_dump($params[0]->isDefaultValueAvailable());
diff --git a/hphp/test/slow/reflection/1339.php b/hphp/test/slow/reflection/1339.php
index 7bfe0fb95..9b32dfcfd 100644
--- a/hphp/test/slow/reflection/1339.php
+++ b/hphp/test/slow/reflection/1339.php
@@ -1,3 +1,27 @@
 <?php
 
- class X {  function X() { }  function __construct() { }}class Y {  function Y() { }}class Z {  function z() { }}function test($cname, $mname) {  $x = new ReflectionClass($cname);  $m = $x->getMethod($mname);  echo "$cname:$mname:"; var_dump($m->isConstructor());}test('X', 'X');test('Y', 'Y');test('Y', 'y');test('Z', 'Z');test('Z', 'z');
\ No newline at end of file
+class X {
+  function X() {
+ }
+  function __construct() {
+ }
+}
+class Y {
+  function Y() {
+ }
+}
+class Z {
+  function z() {
+ }
+}
+function test($cname, $mname) {
+  $x = new ReflectionClass($cname);
+  $m = $x->getMethod($mname);
+  echo "$cname:$mname:";
+ var_dump($m->isConstructor());
+}
+test('X', 'X');
+test('Y', 'Y');
+test('Y', 'y');
+test('Z', 'Z');
+test('Z', 'z');
diff --git a/hphp/test/slow/reflection/1340.php b/hphp/test/slow/reflection/1340.php
index 89666196b..6d063de36 100644
--- a/hphp/test/slow/reflection/1340.php
+++ b/hphp/test/slow/reflection/1340.php
@@ -1,3 +1,6 @@
 <?php
 
- function foo($a, $b) { }$funcs = get_defined_functions();var_dump($funcs['user']);
\ No newline at end of file
+function foo($a, $b) {
+ }
+$funcs = get_defined_functions();
+var_dump($funcs['user']);
diff --git a/hphp/test/slow/reflection/1341.php b/hphp/test/slow/reflection/1341.php
index f49834a50..32cd0e63f 100644
--- a/hphp/test/slow/reflection/1341.php
+++ b/hphp/test/slow/reflection/1341.php
@@ -1,3 +1,9 @@
 <?php
 
- class bar { function baz() { yield 5; } }$x = new ReflectionClass('bar');var_dump(count($x->getMethods()));
\ No newline at end of file
+class bar {
+ function baz() {
+ yield 5;
+ }
+ }
+$x = new ReflectionClass('bar');
+var_dump(count($x->getMethods()));
diff --git a/hphp/test/slow/reflection/1342.php b/hphp/test/slow/reflection/1342.php
index 25222ed6b..ac9dc9b7f 100644
--- a/hphp/test/slow/reflection/1342.php
+++ b/hphp/test/slow/reflection/1342.php
@@ -1,3 +1,17 @@
 <?php
 
-Trait T { function bar() { yield 1; } }class X { use T; }function test() {  $r = new ReflectionClass('X');  foreach ($r->getMethods() as $m) {    var_dump($m->name);  }}test();
\ No newline at end of file
+Trait T {
+ function bar() {
+ yield 1;
+ }
+ }
+class X {
+ use T;
+ }
+function test() {
+  $r = new ReflectionClass('X');
+  foreach ($r->getMethods() as $m) {
+    var_dump($m->name);
+  }
+}
+test();
diff --git a/hphp/test/slow/reflection/1343.php b/hphp/test/slow/reflection/1343.php
index 377f0a6c5..4da0eb277 100644
--- a/hphp/test/slow/reflection/1343.php
+++ b/hphp/test/slow/reflection/1343.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * Doc comment on a function generator
  */
diff --git a/hphp/test/slow/reflection/1344.php b/hphp/test/slow/reflection/1344.php
index 91b1ef064..c35bc3fc1 100644
--- a/hphp/test/slow/reflection/1344.php
+++ b/hphp/test/slow/reflection/1344.php
@@ -1,3 +1,16 @@
 <?php
 
-function test() {  try {    $classes = get_declared_classes();    foreach ($classes as $class) {      $r = new ReflectionClass($class);      $t += count($r->getMethods());    }    var_dump('ok');  } catch (Exception $e) {    var_dump($e->getMessage());  }}test();
\ No newline at end of file
+function test() {
+  try {
+    $classes = get_declared_classes();
+    foreach ($classes as $class) {
+      $r = new ReflectionClass($class);
+      $t += count($r->getMethods());
+    }
+    var_dump('ok');
+  }
+ catch (Exception $e) {
+    var_dump($e->getMessage());
+  }
+}
+test();
diff --git a/hphp/test/slow/reflection/1345.php b/hphp/test/slow/reflection/1345.php
index b853da59c..1fa68ece1 100644
--- a/hphp/test/slow/reflection/1345.php
+++ b/hphp/test/slow/reflection/1345.php
@@ -1,3 +1,13 @@
 <?php
 
- trait T {}interface I {}foreach (get_declared_classes() as $c) {  if ($c == 'T' || $c == 'I') {    var_dump('failed');    exit(0);  }}var_dump('OK!');
\ No newline at end of file
+trait T {
+}
+interface I {
+}
+foreach (get_declared_classes() as $c) {
+  if ($c == 'T' || $c == 'I') {
+    var_dump('failed');
+    exit(0);
+  }
+}
+var_dump('OK!');
diff --git a/hphp/test/slow/reflection/1346.php b/hphp/test/slow/reflection/1346.php
index 3781fcc65..082d01108 100644
--- a/hphp/test/slow/reflection/1346.php
+++ b/hphp/test/slow/reflection/1346.php
@@ -1,3 +1,12 @@
 <?php
 
- class A {} class B extends A {}$a = new A; $b = new B;var_dump(is_a($a, 'A'));var_dump(is_a($a, 'B'));var_dump(is_a($b, 'A'));var_dump(is_a($b, 'A', true));
\ No newline at end of file
+class A {
+}
+ class B extends A {
+}
+$a = new A;
+ $b = new B;
+var_dump(is_a($a, 'A'));
+var_dump(is_a($a, 'B'));
+var_dump(is_a($b, 'A'));
+var_dump(is_a($b, 'A', true));
diff --git a/hphp/test/slow/reflection/1347.php b/hphp/test/slow/reflection/1347.php
index 2799708a3..6dd8baaaf 100644
--- a/hphp/test/slow/reflection/1347.php
+++ b/hphp/test/slow/reflection/1347.php
@@ -1,3 +1,15 @@
 <?php
 
- class A {}class B extends A {}class C extends B {}$a = new A; $b = new B;var_dump(is_a('a', 'A', true));var_dump(is_a('a', 'A', false));var_dump(is_a('b', 'A', true));var_dump(is_a('a', 'B', true));var_dump(is_a('c', 'A', true));
\ No newline at end of file
+class A {
+}
+class B extends A {
+}
+class C extends B {
+}
+$a = new A;
+ $b = new B;
+var_dump(is_a('a', 'A', true));
+var_dump(is_a('a', 'A', false));
+var_dump(is_a('b', 'A', true));
+var_dump(is_a('a', 'B', true));
+var_dump(is_a('c', 'A', true));
diff --git a/hphp/test/slow/reflection/1348.php b/hphp/test/slow/reflection/1348.php
index 4e439ab94..c39919042 100644
--- a/hphp/test/slow/reflection/1348.php
+++ b/hphp/test/slow/reflection/1348.php
@@ -1,3 +1,16 @@
 <?php
 
- interface A {}interface B extends A {}interface C extends B {}class D implements A {}$d = new D;var_dump(is_a($d, 'A'));var_dump(is_a($d, 'B'));var_dump(is_a('B', 'A', true));var_dump(is_a('B', 'B', true));var_dump(is_a('C', 'A', true));
\ No newline at end of file
+interface A {
+}
+interface B extends A {
+}
+interface C extends B {
+}
+class D implements A {
+}
+$d = new D;
+var_dump(is_a($d, 'A'));
+var_dump(is_a($d, 'B'));
+var_dump(is_a('B', 'A', true));
+var_dump(is_a('B', 'B', true));
+var_dump(is_a('C', 'A', true));
diff --git a/hphp/test/slow/reflection/1349.php b/hphp/test/slow/reflection/1349.php
index 7353246c9..174dc26d1 100644
--- a/hphp/test/slow/reflection/1349.php
+++ b/hphp/test/slow/reflection/1349.php
@@ -1,3 +1,12 @@
 <?php
 
- class A {} class B extends A {}$a = new A; $b = new B;var_dump(is_subclass_of($a, 'A'));var_dump(is_subclass_of($a, 'B'));var_dump(is_subclass_of($b, 'A'));var_dump(is_subclass_of($b, 'A', false));
\ No newline at end of file
+class A {
+}
+ class B extends A {
+}
+$a = new A;
+ $b = new B;
+var_dump(is_subclass_of($a, 'A'));
+var_dump(is_subclass_of($a, 'B'));
+var_dump(is_subclass_of($b, 'A'));
+var_dump(is_subclass_of($b, 'A', false));
diff --git a/hphp/test/slow/reflection/1350.php b/hphp/test/slow/reflection/1350.php
index c20ff5ed0..967c6e848 100644
--- a/hphp/test/slow/reflection/1350.php
+++ b/hphp/test/slow/reflection/1350.php
@@ -1,3 +1,15 @@
 <?php
 
- class A {}class B extends A {}class C extends B {}$a = new A; $b = new B;var_dump(is_subclass_of('a', 'A', true));var_dump(is_subclass_of('a', 'A', false));var_dump(is_subclass_of('b', 'A', true));var_dump(is_subclass_of('a', 'B', true));var_dump(is_subclass_of('c', 'A', true));
\ No newline at end of file
+class A {
+}
+class B extends A {
+}
+class C extends B {
+}
+$a = new A;
+ $b = new B;
+var_dump(is_subclass_of('a', 'A', true));
+var_dump(is_subclass_of('a', 'A', false));
+var_dump(is_subclass_of('b', 'A', true));
+var_dump(is_subclass_of('a', 'B', true));
+var_dump(is_subclass_of('c', 'A', true));
diff --git a/hphp/test/slow/reflection/1351.php b/hphp/test/slow/reflection/1351.php
index 6ad103f59..e648e37c2 100644
--- a/hphp/test/slow/reflection/1351.php
+++ b/hphp/test/slow/reflection/1351.php
@@ -1,3 +1,16 @@
 <?php
 
- interface A {}interface B extends A {}interface C extends B {}class D implements A {}$d = new D;var_dump(is_subclass_of($d, 'A'));var_dump(is_subclass_of($d, 'B'));var_dump(is_subclass_of('B', 'A'));var_dump(is_subclass_of('B', 'B'));var_dump(is_subclass_of('C', 'A'));
\ No newline at end of file
+interface A {
+}
+interface B extends A {
+}
+interface C extends B {
+}
+class D implements A {
+}
+$d = new D;
+var_dump(is_subclass_of($d, 'A'));
+var_dump(is_subclass_of($d, 'B'));
+var_dump(is_subclass_of('B', 'A'));
+var_dump(is_subclass_of('B', 'B'));
+var_dump(is_subclass_of('C', 'A'));
diff --git a/hphp/test/slow/reflection/1352.php b/hphp/test/slow/reflection/1352.php
index f23ff150d..fc12b3e2d 100644
--- a/hphp/test/slow/reflection/1352.php
+++ b/hphp/test/slow/reflection/1352.php
@@ -1,8 +1,11 @@
 <?php
 
-
-$f = function() { echo "in \$f\n"; };
-$g = function($a = 'default') { echo "in \$g; passed $a\n"; };
+$f = function() {
+  echo "in \$f\n";
+};
+$g = function($a = 'default') {
+  echo "in \$g; passed $a\n";
+};
 
 /** This doc comment is so helpful and descriptive. */
 $add = function($x, $y) {
diff --git a/hphp/test/slow/reflection/1352.php.expect b/hphp/test/slow/reflection/1352.php.expect
index 1da531263..87774ec1f 100644
--- a/hphp/test/slow/reflection/1352.php.expect
+++ b/hphp/test/slow/reflection/1352.php.expect
@@ -12,8 +12,8 @@ x + y = 10000000000
 showing f
 string(9) "{closure}"
 bool(true)
-int(4)
-int(4)
+int(3)
+int(5)
 bool(false)
 bool(true)
 parameters => array(0) {
@@ -24,8 +24,8 @@ int(0)
 showing g
 string(9) "{closure}"
 bool(true)
-int(5)
-int(5)
+int(6)
+int(8)
 bool(false)
 bool(true)
 parameters => array(1) {
@@ -37,8 +37,8 @@ int(0)
 showing add
 string(9) "{closure}"
 bool(true)
-int(8)
 int(11)
+int(14)
 string(54) "/** This doc comment is so helpful and descriptive. */"
 bool(true)
 parameters => array(2) {
diff --git a/hphp/test/slow/reflection/1353.php b/hphp/test/slow/reflection/1353.php
index 74bdcf75b..ec9187ff5 100644
--- a/hphp/test/slow/reflection/1353.php
+++ b/hphp/test/slow/reflection/1353.php
@@ -1,3 +1,21 @@
 <?php
 
- function __autoload($name) {  switch ($name) {    case 'C':      class C {}      break;    case 'M':      class M { function foo() {} }      break;    default: class C{} class M {}  }  var_dump($name);}$r1 = new ReflectionClass('C');$r2 = new ReflectionMethod('M', 'foo');
\ No newline at end of file
+function __autoload($name) {
+  switch ($name) {
+    case 'C':      class C {
+}
+      break;
+    case 'M':      class M {
+ function foo() {
+}
+ }
+      break;
+    default: class C{
+}
+ class M {
+}
+  }
+  var_dump($name);
+}
+$r1 = new ReflectionClass('C');
+$r2 = new ReflectionMethod('M', 'foo');
diff --git a/hphp/test/slow/reflection_classes/1354.php b/hphp/test/slow/reflection_classes/1354.php
index b2b4c90e1..d80a50e39 100644
--- a/hphp/test/slow/reflection_classes/1354.php
+++ b/hphp/test/slow/reflection_classes/1354.php
@@ -1,3 +1,136 @@
 <?php
 
- interface i1 {} interface i2 {}class cls1 implements i1, i2 {   const CLS_CONST = 2;  protected $prop1;  public static $prop2 = 23;  function method1($param1) { print $param1;} } function &func1(cls1 $p1, &$p2, $p3='def') {   static $a=1; var_dump($p1);} function func2($a) { var_dump($a);} class cls2 extends cls1 {}function dump_func($func) {  var_dump($func->getName());   var_dump($func->isInternal());   var_dump($func->isUserDefined());   var_dump($func->isClosure());   $vars = $func->getStaticVariables();   var_dump(count($vars));  var_dump(isset($vars['a']));  var_dump($func->returnsReference());   var_dump($func->getNumberOfParameters());   var_dump($func->getNumberOfRequiredParameters());   foreach ($func->getParameters() as $name => $param) {    var_dump($name);     dump_param($param);   }} function verify_class($cls) {  if ($cls) {    var_dump($cls->getName());   } else {    var_dump(null);  }}function verify_classes($classes) {  ksort($classes);  foreach ($classes as $cls) {    verify_class($cls);   }}function dump_param($param) {  var_dump($param->getName());   var_dump($param->isPassedByReference());   verify_class($param->getDeclaringClass());   verify_class($param->getClass());   var_dump($param->isArray());   var_dump($param->allowsNull());   var_dump($param->isOptional());   var_dump($param->isDefaultValueAvailable());   if ($param->isOptional()) {   }   var_dump($param->getPosition()); } function dump_prop($prop, $obj) {  var_dump($prop->getName());   var_dump($prop->isPublic());   var_dump($prop->isPrivate());   var_dump($prop->isProtected());   var_dump($prop->isStatic());   var_dump($prop->getModifiers() & 0xffff);   if ($prop->isPublic()) {     var_dump($prop->getValue($obj));     if (!$prop->isStatic()) {      var_dump($prop->setValue($obj, 78));     }    var_dump($prop->getValue($obj));   }   verify_class($prop->getDeclaringClass()); } function dump_class($cls, $obj) {  var_dump($cls->isInstance($obj));   var_dump($cls->getName());   var_dump($cls->isInternal());   var_dump($cls->isUserDefined());   var_dump($cls->isInstantiable());   var_dump($cls->hasConstant('CLS_CONST'));   var_dump($cls->hasMethod('method1'));   var_dump($cls->hasProperty('prop1'));   dump_func($cls->getMethod('method1'));   dump_prop($cls->getProperty('prop1'), $obj);   verify_classes($cls->getInterfaces());   var_dump($cls->isInterface());   var_dump($cls->isAbstract());   var_dump($cls->isFinal());   var_dump($cls->getModifiers() & 0xffff);   verify_class($cls->getParentClass());   var_dump($cls->isSubclassOf('i1'));   var_dump($cls->getStaticPropertyValue('prop2'));   cls1::$prop2 = 45;   var_dump($cls->getStaticPropertyValue('prop2'));   var_dump(cls1::$prop2);   var_dump($cls->isIterateable());   var_dump($cls->implementsInterface('i2'));   foreach ($cls->getProperties() as $name => $prop) {    var_dump($name);     dump_prop($prop, $obj);   }  foreach ($cls->getMethods() as $name => $func) {    var_dump($name);     dump_func($func);     var_dump($func->isFinal());     var_dump($func->isAbstract());     var_dump($func->isPublic());     var_dump($func->isPrivate());     var_dump($func->isProtected());     var_dump($func->isStatic());     var_dump($func->isConstructor());     var_dump($func->isDestructor());     var_dump($func->getModifiers() & 0xFFFF);     verify_class($func->getDeclaringClass());     if ($name == 'method1') $func->invoke($obj, 'invoked');   }}$func = new ReflectionFunction('func1'); dump_func($func); $func = new ReflectionFunction('func2'); $func->invoke('invoked');$cls = new ReflectionClass('cls1'); $obj = $cls->newInstance(); dump_class($cls, $obj);$cls = new ReflectionClass('cls2'); $obj = $cls->newInstance(); dump_class($cls, $obj);
\ No newline at end of file
+interface i1 {
+}
+ interface i2 {
+}
+class cls1 implements i1, i2 {
+   const CLS_CONST = 2;
+  protected $prop1;
+  public static $prop2 = 23;
+  function method1($param1) {
+ print $param1;
+}
+ }
+ function &func1(cls1 $p1, &$p2, $p3='def') {
+   static $a=1;
+ var_dump($p1);
+}
+ function func2($a) {
+ var_dump($a);
+}
+ class cls2 extends cls1 {
+}
+function dump_func($func) {
+  var_dump($func->getName());
+   var_dump($func->isInternal());
+   var_dump($func->isUserDefined());
+   var_dump($func->isClosure());
+   $vars = $func->getStaticVariables();
+   var_dump(count($vars));
+  var_dump(isset($vars['a']));
+  var_dump($func->returnsReference());
+   var_dump($func->getNumberOfParameters());
+   var_dump($func->getNumberOfRequiredParameters());
+   foreach ($func->getParameters() as $name => $param) {
+    var_dump($name);
+     dump_param($param);
+   }
+}
+ function verify_class($cls) {
+  if ($cls) {
+    var_dump($cls->getName());
+   }
+ else {
+    var_dump(null);
+  }
+}
+function verify_classes($classes) {
+  ksort($classes);
+  foreach ($classes as $cls) {
+    verify_class($cls);
+   }
+}
+function dump_param($param) {
+  var_dump($param->getName());
+   var_dump($param->isPassedByReference());
+   verify_class($param->getDeclaringClass());
+   verify_class($param->getClass());
+   var_dump($param->isArray());
+   var_dump($param->allowsNull());
+   var_dump($param->isOptional());
+   var_dump($param->isDefaultValueAvailable());
+   if ($param->isOptional()) {
+   }
+   var_dump($param->getPosition());
+ }
+ function dump_prop($prop, $obj) {
+  var_dump($prop->getName());
+   var_dump($prop->isPublic());
+   var_dump($prop->isPrivate());
+   var_dump($prop->isProtected());
+   var_dump($prop->isStatic());
+   var_dump($prop->getModifiers() & 0xffff);
+   if ($prop->isPublic()) {
+     var_dump($prop->getValue($obj));
+     if (!$prop->isStatic()) {
+      var_dump($prop->setValue($obj, 78));
+     }
+    var_dump($prop->getValue($obj));
+   }
+   verify_class($prop->getDeclaringClass());
+ }
+ function dump_class($cls, $obj) {
+  var_dump($cls->isInstance($obj));
+   var_dump($cls->getName());
+   var_dump($cls->isInternal());
+   var_dump($cls->isUserDefined());
+   var_dump($cls->isInstantiable());
+   var_dump($cls->hasConstant('CLS_CONST'));
+   var_dump($cls->hasMethod('method1'));
+   var_dump($cls->hasProperty('prop1'));
+   dump_func($cls->getMethod('method1'));
+   dump_prop($cls->getProperty('prop1'), $obj);
+   verify_classes($cls->getInterfaces());
+   var_dump($cls->isInterface());
+   var_dump($cls->isAbstract());
+   var_dump($cls->isFinal());
+   var_dump($cls->getModifiers() & 0xffff);
+   verify_class($cls->getParentClass());
+   var_dump($cls->isSubclassOf('i1'));
+   var_dump($cls->getStaticPropertyValue('prop2'));
+   cls1::$prop2 = 45;
+   var_dump($cls->getStaticPropertyValue('prop2'));
+   var_dump(cls1::$prop2);
+   var_dump($cls->isIterateable());
+   var_dump($cls->implementsInterface('i2'));
+   foreach ($cls->getProperties() as $name => $prop) {
+    var_dump($name);
+     dump_prop($prop, $obj);
+   }
+  foreach ($cls->getMethods() as $name => $func) {
+    var_dump($name);
+     dump_func($func);
+     var_dump($func->isFinal());
+     var_dump($func->isAbstract());
+     var_dump($func->isPublic());
+     var_dump($func->isPrivate());
+     var_dump($func->isProtected());
+     var_dump($func->isStatic());
+     var_dump($func->isConstructor());
+     var_dump($func->isDestructor());
+     var_dump($func->getModifiers() & 0xFFFF);
+     verify_class($func->getDeclaringClass());
+     if ($name == 'method1') $func->invoke($obj, 'invoked');
+   }
+}
+$func = new ReflectionFunction('func1');
+ dump_func($func);
+ $func = new ReflectionFunction('func2');
+ $func->invoke('invoked');
+$cls = new ReflectionClass('cls1');
+ $obj = $cls->newInstance();
+ dump_class($cls, $obj);
+$cls = new ReflectionClass('cls2');
+ $obj = $cls->newInstance();
+ dump_class($cls, $obj);
diff --git a/hphp/test/slow/reflection_classes/1355.php b/hphp/test/slow/reflection_classes/1355.php
index 3dda5dc35..680e688c9 100644
--- a/hphp/test/slow/reflection_classes/1355.php
+++ b/hphp/test/slow/reflection_classes/1355.php
@@ -1,3 +1,21 @@
 <?php
 
- abstract class c {  public static $arr = array();  function g() {    $cl = new ReflectionClass(get_class($this));    $p = $cl->getProperty('arr');    return $p->getValue();  }}abstract class aa extends c {  public function get_arr() {    $actions = parent::get_arr();    return $actions;  }}class a extends aa {  public static $arr = array('v');}$x = new a;var_dump($x->g());
\ No newline at end of file
+abstract class c {
+  public static $arr = array();
+  function g() {
+    $cl = new ReflectionClass(get_class($this));
+    $p = $cl->getProperty('arr');
+    return $p->getValue();
+  }
+}
+abstract class aa extends c {
+  public function get_arr() {
+    $actions = parent::get_arr();
+    return $actions;
+  }
+}
+class a extends aa {
+  public static $arr = array('v');
+}
+$x = new a;
+var_dump($x->g());
diff --git a/hphp/test/slow/reflection_classes/1356.php b/hphp/test/slow/reflection_classes/1356.php
index 528d1232b..d61d5539c 100644
--- a/hphp/test/slow/reflection_classes/1356.php
+++ b/hphp/test/slow/reflection_classes/1356.php
@@ -1,3 +1,22 @@
 <?php
 
- $z=true;if ($z) {  class AaaA {    function f() {      var_dump(get_class());    }  }} else {  class aAAa {}}class BbBb {}$r = new ReflectionClass('aaaa');var_dump($r->getName());$r = new ReflectionClass('bbbb');var_dump($r->getName());$a = new aaaa;$a->f();
\ No newline at end of file
+$z=true;
+if ($z) {
+  class AaaA {
+    function f() {
+      var_dump(get_class());
+    }
+  }
+}
+ else {
+  class aAAa {
+}
+}
+class BbBb {
+}
+$r = new ReflectionClass('aaaa');
+var_dump($r->getName());
+$r = new ReflectionClass('bbbb');
+var_dump($r->getName());
+$a = new aaaa;
+$a->f();
diff --git a/hphp/test/slow/reflection_classes/1357.php b/hphp/test/slow/reflection_classes/1357.php
index 1002a48c6..c3d436cc5 100644
--- a/hphp/test/slow/reflection_classes/1357.php
+++ b/hphp/test/slow/reflection_classes/1357.php
@@ -1,3 +1,11 @@
 <?php
 
- class z {  const foo = 10;}class c {  const bar = z::foo;}var_dump(c::bar);$r = new ReflectionClass('c');var_dump($r->getConstant("bar"));
\ No newline at end of file
+class z {
+  const foo = 10;
+}
+class c {
+  const bar = z::foo;
+}
+var_dump(c::bar);
+$r = new ReflectionClass('c');
+var_dump($r->getConstant("bar"));
diff --git a/hphp/test/slow/reflection_classes/1358.php b/hphp/test/slow/reflection_classes/1358.php
index e3b988225..97e2d18d4 100644
--- a/hphp/test/slow/reflection_classes/1358.php
+++ b/hphp/test/slow/reflection_classes/1358.php
@@ -1,3 +1,10 @@
 <?php
 
- class fOo {}interface ioO {}$c = new ReflectionClass('Foo');$i = new ReflectionClass('Ioo');var_dump($c->getFileName() !== '');var_dump($i->getFileName() !== '');
\ No newline at end of file
+class fOo {
+}
+interface ioO {
+}
+$c = new ReflectionClass('Foo');
+$i = new ReflectionClass('Ioo');
+var_dump($c->getFileName() !== '');
+var_dump($i->getFileName() !== '');
diff --git a/hphp/test/slow/reflection_classes/1359.php b/hphp/test/slow/reflection_classes/1359.php
index 0739a9ead..691d1d787 100644
--- a/hphp/test/slow/reflection_classes/1359.php
+++ b/hphp/test/slow/reflection_classes/1359.php
@@ -1,3 +1,12 @@
 <?php
 
- class C {public function mE() {echo 'fail';}}$ref = new ReflectionClass('C');var_dump($ref->hasMethod('mE'));var_dump($ref->hasMethod('me'));$m = $ref->getMethod('me');var_dump($m->getName());
\ No newline at end of file
+class C {
+public function mE() {
+echo 'fail';
+}
+}
+$ref = new ReflectionClass('C');
+var_dump($ref->hasMethod('mE'));
+var_dump($ref->hasMethod('me'));
+$m = $ref->getMethod('me');
+var_dump($m->getName());
diff --git a/hphp/test/slow/reflection_classes/1360.php b/hphp/test/slow/reflection_classes/1360.php
index 5e26fd465..0fd58e070 100644
--- a/hphp/test/slow/reflection_classes/1360.php
+++ b/hphp/test/slow/reflection_classes/1360.php
@@ -1,3 +1,23 @@
 <?php
 
- class Base {  function foo() {    $m = new ReflectionMethod(get_class($this), 'bar');    var_dump($m->name);  }}$condition = 123;if ($condition) {  class A extends Base {}} else {  class A extends Base {}}class B extends A {  function bar() {  }}$obj = new B();$obj->foo();
\ No newline at end of file
+class Base {
+  function foo() {
+    $m = new ReflectionMethod(get_class($this), 'bar');
+    var_dump($m->name);
+  }
+}
+$condition = 123;
+if ($condition) {
+  class A extends Base {
+}
+}
+ else {
+  class A extends Base {
+}
+}
+class B extends A {
+  function bar() {
+  }
+}
+$obj = new B();
+$obj->foo();
diff --git a/hphp/test/slow/reflection_classes/1361.php b/hphp/test/slow/reflection_classes/1361.php
index c125df135..36c0bf945 100644
--- a/hphp/test/slow/reflection_classes/1361.php
+++ b/hphp/test/slow/reflection_classes/1361.php
@@ -1,3 +1,16 @@
 <?php
 
- interface A {function foo();}interface B extends A {}class C implements B {function foo() {}};$klass = new ReflectionClass('C');var_dump($klass->implementsInterface('A'));$inter = new ReflectionClass('B');var_dump($inter->hasMethod('foo'));
\ No newline at end of file
+interface A {
+function foo();
+}
+interface B extends A {
+}
+class C implements B {
+function foo() {
+}
+}
+;
+$klass = new ReflectionClass('C');
+var_dump($klass->implementsInterface('A'));
+$inter = new ReflectionClass('B');
+var_dump($inter->hasMethod('foo'));
diff --git a/hphp/test/slow/reflection_classes/1362.php b/hphp/test/slow/reflection_classes/1362.php
index 8d49159ec..99f8b3dd9 100644
--- a/hphp/test/slow/reflection_classes/1362.php
+++ b/hphp/test/slow/reflection_classes/1362.php
@@ -1,11 +1,25 @@
 <?php
 
-
-class A { private $a; protected $b; public $c; static $d; }
-function f($a) { asort($a); foreach ($a as $v) { var_dump($v->getName()); } }
+class A {
+ private $a;
+ protected $b;
+ public $c;
+ static $d;
+ }
+function f($a) {
+ asort($a);
+ foreach ($a as $v) {
+ var_dump($v->getName());
+ }
+ }
 $r = new ReflectionClass('A');
-$a = $r->getProperties(); f($a);
-$a = $r->getProperties(ReflectionProperty::IS_PUBLIC); f($a);
-$a = $r->getProperties(ReflectionProperty::IS_PRIVATE); f($a);
-$a = $r->getProperties(ReflectionProperty::IS_PROTECTED); f($a);
-$a = $r->getProperties(ReflectionProperty::IS_STATIC); f($a);
+$a = $r->getProperties();
+ f($a);
+$a = $r->getProperties(ReflectionProperty::IS_PUBLIC);
+ f($a);
+$a = $r->getProperties(ReflectionProperty::IS_PRIVATE);
+ f($a);
+$a = $r->getProperties(ReflectionProperty::IS_PROTECTED);
+ f($a);
+$a = $r->getProperties(ReflectionProperty::IS_STATIC);
+ f($a);
diff --git a/hphp/test/slow/reflection_classes/1363.php b/hphp/test/slow/reflection_classes/1363.php
index 5b75e6e43..111af2414 100644
--- a/hphp/test/slow/reflection_classes/1363.php
+++ b/hphp/test/slow/reflection_classes/1363.php
@@ -1,2 +1,53 @@
 <?hh
-function foo(Vector<int> $z): Vector<int> {   return $z; } $rf = new ReflectionFunction('foo'); var_dump($rf->getReturnTypeText()); class C {   function goo(): int { return 0; } } $rc = new ReflectionClass('C'); $rm = $rc->getMethod('goo'); var_dump($rm->getReturnTypeText()); class C1 extends C {   function goo() { return 0; } } $rc = new ReflectionClass('C1'); $rm = $rc->getMethod('goo'); var_dump($rm->getReturnTypeText()); class C2 extends C1 {   function goo(): string { return '0'; } } $rc = new ReflectionClass('C2'); $rm = $rc->getMethod('goo'); var_dump($rm->getReturnTypeText()); interface I {   function m(): string; } $rc = new ReflectionClass('I'); $rm = $rc->getMethod('m'); var_dump($rm->getReturnTypeText()); interface I1<T> {   function m(): T; } $rc = new ReflectionClass('I1'); $rm = $rc->getMethod('m'); var_dump($rm->getReturnTypeText()); trait T {   function t(): C {     return new C();   } } class UseT {   use T; } $rc = new ReflectionClass('UseT'); $rm = $rc->getMethod('t'); var_dump($rm->getReturnTypeText());
+function foo(Vector<int> $z): Vector<int> {
+   return $z;
+ }
+ $rf = new ReflectionFunction('foo');
+ var_dump($rf->getReturnTypeText());
+ class C {
+   function goo(): int {
+ return 0;
+ }
+ }
+ $rc = new ReflectionClass('C');
+ $rm = $rc->getMethod('goo');
+ var_dump($rm->getReturnTypeText());
+ class C1 extends C {
+   function goo() {
+ return 0;
+ }
+ }
+ $rc = new ReflectionClass('C1');
+ $rm = $rc->getMethod('goo');
+ var_dump($rm->getReturnTypeText());
+ class C2 extends C1 {
+   function goo(): string {
+ return '0';
+ }
+ }
+ $rc = new ReflectionClass('C2');
+ $rm = $rc->getMethod('goo');
+ var_dump($rm->getReturnTypeText());
+ interface I {
+   function m(): string;
+ }
+ $rc = new ReflectionClass('I');
+ $rm = $rc->getMethod('m');
+ var_dump($rm->getReturnTypeText());
+ interface I1<T> {
+   function m(): T;
+ }
+ $rc = new ReflectionClass('I1');
+ $rm = $rc->getMethod('m');
+ var_dump($rm->getReturnTypeText());
+ trait T {
+   function t(): C {
+     return new C();
+   }
+ }
+ class UseT {
+   use T;
+ }
+ $rc = new ReflectionClass('UseT');
+ $rm = $rc->getMethod('t');
+ var_dump($rm->getReturnTypeText());
diff --git a/hphp/test/slow/reflection_classes/1365.php b/hphp/test/slow/reflection_classes/1365.php
index fbe6bde75..b97153eff 100644
--- a/hphp/test/slow/reflection_classes/1365.php
+++ b/hphp/test/slow/reflection_classes/1365.php
@@ -1,3 +1,33 @@
 <?php
 
- function not_a_closure() {   return 1; }; $rf = new ReflectionFunction('not_a_closure'); var_dump($rf->isClosure()); var_dump($rf->isGenerator());  function is_a_generator() {   yield 1;   yield 2; }; $rf = new ReflectionFunction('is_a_generator'); var_dump($rf->isClosure()); var_dump($rf->isGenerator());  $cl = function() {   return 1; }; $rf = new ReflectionFunction($cl); var_dump($rf->isClosure()); var_dump($rf->isGenerator());  $cl = function() {   yield 1;   yield 2; }; $rf = new ReflectionFunction($cl); var_dump($rf->isClosure()); var_dump($rf->isGenerator()); 
\ No newline at end of file
+function not_a_closure() {
+   return 1;
+ }
+;
+ $rf = new ReflectionFunction('not_a_closure');
+ var_dump($rf->isClosure());
+ var_dump($rf->isGenerator());
+  function is_a_generator() {
+   yield 1;
+   yield 2;
+ }
+;
+ $rf = new ReflectionFunction('is_a_generator');
+ var_dump($rf->isClosure());
+ var_dump($rf->isGenerator());
+  $cl = function() {
+   return 1;
+ }
+;
+ $rf = new ReflectionFunction($cl);
+ var_dump($rf->isClosure());
+ var_dump($rf->isGenerator());
+  $cl = function() {
+   yield 1;
+   yield 2;
+ }
+;
+ $rf = new ReflectionFunction($cl);
+ var_dump($rf->isClosure());
+ var_dump($rf->isGenerator());
+
diff --git a/hphp/test/slow/reflection_classes/1366.php b/hphp/test/slow/reflection_classes/1366.php
index 3d8b1ccb5..9df91aa96 100644
--- a/hphp/test/slow/reflection_classes/1366.php
+++ b/hphp/test/slow/reflection_classes/1366.php
@@ -137,14 +137,16 @@ class TC {
 }
 $rc = new ReflectionClass('TC');
 printClass($rc);
-function ff(Vector<int> $i, ?string $s, @C $c, array $a) {}
+function ff(Vector<int> $i, ?string $s, @C $c, array $a) {
+}
 $rf = new ReflectionFunction('ff');
 $rps = $rf->getParameters();
 foreach ($rps as $rp) {
   var_dump($rp->getTypeText());
   if ($rp->getClass() != null) {
       var_dump($rp->getClass()->getName());
-    } else {
+    }
+ else {
       var_dump("");
     }
 }
diff --git a/hphp/test/slow/rename_function/1190.php b/hphp/test/slow/rename_function/1190.php
index 3ff4bd48f..8c162388e 100644
--- a/hphp/test/slow/rename_function/1190.php
+++ b/hphp/test/slow/rename_function/1190.php
@@ -1,3 +1,13 @@
 <?php
 
- function test1() { print __FUNCTION__;} function test2() { print __FUNCTION__;} fb_rename_function('test2', 'test3');fb_rename_function('test1', 'test2'); teSt2();fb_rename_function('test2', 'test3'); teSt2();
\ No newline at end of file
+function test1() {
+ print __FUNCTION__;
+}
+ function test2() {
+ print __FUNCTION__;
+}
+ fb_rename_function('test2', 'test3');
+fb_rename_function('test1', 'test2');
+ teSt2();
+fb_rename_function('test2', 'test3');
+ teSt2();
diff --git a/hphp/test/slow/rename_function/1191.php b/hphp/test/slow/rename_function/1191.php
index 332fc9d99..8a3ccbab0 100644
--- a/hphp/test/slow/rename_function/1191.php
+++ b/hphp/test/slow/rename_function/1191.php
@@ -1,7 +1,8 @@
 <?php
 
-
-function one() { echo 'one';}
+function one() {
+ echo 'one';
+}
 fb_rename_function('one', 'two');
 fb_rename_function('two', 'three');
-three();
\ No newline at end of file
+three();
diff --git a/hphp/test/slow/rename_function/1192.php b/hphp/test/slow/rename_function/1192.php
index 9ae19a725..d1efd022b 100644
--- a/hphp/test/slow/rename_function/1192.php
+++ b/hphp/test/slow/rename_function/1192.php
@@ -1,5 +1,23 @@
 <?php
 
- function test1() { echo "test1
-"; }function test3() { echo "test3
-"; }function baz($test1, $test2) {  var_dump(function_exists("Test1"));  var_dump(function_exists("tEst2"));  var_dump(function_exists($test1));  var_dump(function_exists($test2));}baz("teSt1", "test2");fb_rename_function("test1", "test2");baz("TEst1", "test2");fb_rename_function("test3", "test1");baz("test1", "test2");test1();test2();
\ No newline at end of file
+function test1() {
+ echo "test1
+";
+ }
+function test3() {
+ echo "test3
+";
+ }
+function baz($test1, $test2) {
+  var_dump(function_exists("Test1"));
+  var_dump(function_exists("tEst2"));
+  var_dump(function_exists($test1));
+  var_dump(function_exists($test2));
+}
+baz("teSt1", "test2");
+fb_rename_function("test1", "test2");
+baz("TEst1", "test2");
+fb_rename_function("test3", "test1");
+baz("test1", "test2");
+test1();
+test2();
diff --git a/hphp/test/slow/rename_function/1193.php b/hphp/test/slow/rename_function/1193.php
index 16331c446..70aba5cd2 100644
--- a/hphp/test/slow/rename_function/1193.php
+++ b/hphp/test/slow/rename_function/1193.php
@@ -1,6 +1,7 @@
 <?php
 
-
-function one() { echo 'one';}
+function one() {
+ echo 'one';
+}
 fb_renamed_functions(array('one', 'three'));
 var_dump(fb_rename_function('one', 'two'));
diff --git a/hphp/test/slow/rename_function/1194.php b/hphp/test/slow/rename_function/1194.php
index 6f1ba363a..5c3e415ce 100644
--- a/hphp/test/slow/rename_function/1194.php
+++ b/hphp/test/slow/rename_function/1194.php
@@ -1,3 +1,14 @@
 <?php
 
- function err($code,$msg) { var_dump($code,$msg); }set_error_handler('err');function test1() {}function test2() {}fb_rename_function('test1', 'test3');fb_rename_function('test2', 'test1');fb_rename_function('test1', 'test2');fb_rename_function('test3', 'test1');
\ No newline at end of file
+function err($code,$msg) {
+ var_dump($code,$msg);
+ }
+set_error_handler('err');
+function test1() {
+}
+function test2() {
+}
+fb_rename_function('test1', 'test3');
+fb_rename_function('test2', 'test1');
+fb_rename_function('test1', 'test2');
+fb_rename_function('test3', 'test1');
diff --git a/hphp/test/slow/rename_function/1195.php b/hphp/test/slow/rename_function/1195.php
index 0b49ee1b8..0d4cc0079 100644
--- a/hphp/test/slow/rename_function/1195.php
+++ b/hphp/test/slow/rename_function/1195.php
@@ -1,3 +1,19 @@
 <?php
 
- function test1() {  var_dump(__METHOD__);}function test2() {  var_dump(__METHOD__);}function test($test) {  test1();  TeSt1();  $test();  $test = strtolower($test);  $test(1,2,3);}test('Test1');fb_rename_function('tEst1', 'fiz');fb_rename_function('test2', 'Test1');test('teSt1');
\ No newline at end of file
+function test1() {
+  var_dump(__METHOD__);
+}
+function test2() {
+  var_dump(__METHOD__);
+}
+function test($test) {
+  test1();
+  TeSt1();
+  $test();
+  $test = strtolower($test);
+  $test(1,2,3);
+}
+test('Test1');
+fb_rename_function('tEst1', 'fiz');
+fb_rename_function('test2', 'Test1');
+test('teSt1');
diff --git a/hphp/test/slow/return_statement/1418.php b/hphp/test/slow/return_statement/1418.php
index 7827ac952..f8f817310 100644
--- a/hphp/test/slow/return_statement/1418.php
+++ b/hphp/test/slow/return_statement/1418.php
@@ -1,3 +1,22 @@
 <?php
 
- function foo1($a) {  if ($a) return "ok";}function foo2($a) {  if ($a > 1) return;  if ($a == 1) return 1;}function foo3($a) {  if ($a > 1) return;  if ($a == 1) return;}function bar() {  $v1 = foo1(0);  var_dump($v1);  $v2 = foo2(0);  var_dump($v2);  $v3 = foo3(0);  var_dump($v3);}bar();
\ No newline at end of file
+function foo1($a) {
+  if ($a) return "ok";
+}
+function foo2($a) {
+  if ($a > 1) return;
+  if ($a == 1) return 1;
+}
+function foo3($a) {
+  if ($a > 1) return;
+  if ($a == 1) return;
+}
+function bar() {
+  $v1 = foo1(0);
+  var_dump($v1);
+  $v2 = foo2(0);
+  var_dump($v2);
+  $v3 = foo3(0);
+  var_dump($v3);
+}
+bar();
diff --git a/hphp/test/slow/return_statement/1419.php b/hphp/test/slow/return_statement/1419.php
index a5fcf4950..11451afe9 100644
--- a/hphp/test/slow/return_statement/1419.php
+++ b/hphp/test/slow/return_statement/1419.php
@@ -1,3 +1,14 @@
 <?php
 
- class q {}function g() {  return null;  return new q;}function f() {  return;  return new q;}var_dump(g());var_dump(f());
\ No newline at end of file
+class q {
+}
+function g() {
+  return null;
+  return new q;
+}
+function f() {
+  return;
+  return new q;
+}
+var_dump(g());
+var_dump(f());
diff --git a/hphp/test/slow/sanity/0.php b/hphp/test/slow/sanity/0.php
index 5510aebd8..5ee9087c8 100644
--- a/hphp/test/slow/sanity/0.php
+++ b/hphp/test/slow/sanity/0.php
@@ -1,3 +1,3 @@
 <?php
 
- print 'Hello, World!';
\ No newline at end of file
+print 'Hello, World!';
diff --git a/hphp/test/slow/sanity/3.php b/hphp/test/slow/sanity/3.php
index 140e9564f..fa80bb91e 100644
--- a/hphp/test/slow/sanity/3.php
+++ b/hphp/test/slow/sanity/3.php
@@ -1,3 +1,2 @@
-#!/usr/bin/php
+#!/usr/bin/php<?php
 
-<?php
diff --git a/hphp/test/slow/sanity/5.php b/hphp/test/slow/sanity/5.php
index b0d39c0fb..e19b14b9a 100644
--- a/hphp/test/slow/sanity/5.php
+++ b/hphp/test/slow/sanity/5.php
@@ -1,3 +1,7 @@
 <?php
 
- if (true) { ?>#<?php } ?>
\ No newline at end of file
+if (true) {
+ ?>#<?php
+
+}
+ ?>
diff --git a/hphp/test/slow/scalar_array/545.php b/hphp/test/slow/scalar_array/545.php
index 2a41817cc..eb581a8c7 100644
--- a/hphp/test/slow/scalar_array/545.php
+++ b/hphp/test/slow/scalar_array/545.php
@@ -1,3 +1,35 @@
 <?php
 
- $a1 = array();$a2 = array(null);$a3 = array(true);$a4 = array(false);$a5 = array(0);$a6 = array(1);$a7 = array(1.0);$a8 = array('1.0');$a9 = array(1.23456789e+34);$a13 = array(1.7976931348623157e+308);$a10 = array(1E666);$a11 = array(1E666/1E666);$a12 = array("a bc");$a13 = array("\xc1 bc");$a14 = array(null, true, false, 0, 1, 1.0,             '1.0', 1.23456789e+34,             1.7976931348623157e+308, 1E666,             1E666/1E666, "a bc",             "\xc1 bc");$a15 = array(null => true, false => 0, 1 => 1.0,             '1.0' => 1.23456789e+34,             1.7976931348623157e+308 => 1E666,             1E666/1E666 => "a bc",             "\xc1 bc");$a16 = array(null => true, false => 0, 1 => 1.0,             '1.0' => 1.23456789e+34,             1.7976931348623157e+308 => 1E666,             1E666/1E666 => "a bc",             "\xc1 bc",             array(null => true, array(),                   false => 0, 1 => 1.0,                   '1.0' => 1.23456789e+34,                   1.7976931348623157e+308 => 1E666,                   1E666/1E666 => "a bc",                   "\xc1 bc"));var_dump($a1);var_dump($a2);var_dump($a3);var_dump($a4);var_dump($a5);var_dump($a6);var_dump($a7);var_dump($a8);var_dump($a9);var_dump($a10);var_dump($a11);var_dump($a12);var_dump($a13);var_dump($a14);var_dump($a15);var_dump($a16);
\ No newline at end of file
+$a1 = array();
+$a2 = array(null);
+$a3 = array(true);
+$a4 = array(false);
+$a5 = array(0);
+$a6 = array(1);
+$a7 = array(1.0);
+$a8 = array('1.0');
+$a9 = array(1.23456789e+34);
+$a13 = array(1.7976931348623157e+308);
+$a10 = array(1E666);
+$a11 = array(1E666/1E666);
+$a12 = array("a bc");
+$a13 = array("\xc1 bc");
+$a14 = array(null, true, false, 0, 1, 1.0,             '1.0', 1.23456789e+34,             1.7976931348623157e+308, 1E666,             1E666/1E666, "a bc",             "\xc1 bc");
+$a15 = array(null => true, false => 0, 1 => 1.0,             '1.0' => 1.23456789e+34,             1.7976931348623157e+308 => 1E666,             1E666/1E666 => "a bc",             "\xc1 bc");
+$a16 = array(null => true, false => 0, 1 => 1.0,             '1.0' => 1.23456789e+34,             1.7976931348623157e+308 => 1E666,             1E666/1E666 => "a bc",             "\xc1 bc",             array(null => true, array(),                   false => 0, 1 => 1.0,                   '1.0' => 1.23456789e+34,                   1.7976931348623157e+308 => 1E666,                   1E666/1E666 => "a bc",                   "\xc1 bc"));
+var_dump($a1);
+var_dump($a2);
+var_dump($a3);
+var_dump($a4);
+var_dump($a5);
+var_dump($a6);
+var_dump($a7);
+var_dump($a8);
+var_dump($a9);
+var_dump($a10);
+var_dump($a11);
+var_dump($a12);
+var_dump($a13);
+var_dump($a14);
+var_dump($a15);
+var_dump($a16);
diff --git a/hphp/test/slow/scalar_array/546.php b/hphp/test/slow/scalar_array/546.php
index 0e5687d34..ab1da6d30 100644
--- a/hphp/test/slow/scalar_array/546.php
+++ b/hphp/test/slow/scalar_array/546.php
@@ -1,6 +1,12 @@
 <?php
 
-
-function test1() { $a = array(__FUNCTION__, __LINE__); return $a; }
-function test2() { $a = array(__FUNCTION__, __LINE__); return $a; }
-var_dump(test1()); var_dump(test2());
\ No newline at end of file
+function test1() {
+ $a = array(__FUNCTION__, __LINE__);
+ return $a;
+ }
+function test2() {
+ $a = array(__FUNCTION__, __LINE__);
+ return $a;
+ }
+var_dump(test1());
+ var_dump(test2());
diff --git a/hphp/test/slow/scalar_array/546.php.expect b/hphp/test/slow/scalar_array/546.php.expect
index 730b660a3..e9138b6e2 100644
--- a/hphp/test/slow/scalar_array/546.php.expect
+++ b/hphp/test/slow/scalar_array/546.php.expect
@@ -8,5 +8,5 @@ array(2) {
   [0]=>
   string(5) "test2"
   [1]=>
-  int(5)
+  int(8)
 }
diff --git a/hphp/test/slow/scalar_array/547.php b/hphp/test/slow/scalar_array/547.php
index ba8d62202..b7958adad 100644
--- a/hphp/test/slow/scalar_array/547.php
+++ b/hphp/test/slow/scalar_array/547.php
@@ -1,3 +1,7 @@
 <?php
 
- define('VALUE', 1);function func($params) { var_dump($params);}func(array('key' => @VALUE));
\ No newline at end of file
+define('VALUE', 1);
+function func($params) {
+ var_dump($params);
+}
+func(array('key' => @VALUE));
diff --git a/hphp/test/slow/serialization/1539.php b/hphp/test/slow/serialization/1539.php
index c17f6be01..6257c3068 100644
--- a/hphp/test/slow/serialization/1539.php
+++ b/hphp/test/slow/serialization/1539.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A implements Serializable {
   public $__foo = true;
   public function serialize() {
@@ -8,4 +7,5 @@ class A implements Serializable {
   }
   public function unserialize($serialized) {
   }
-} var_dump(unserialize(serialize(new A())));
\ No newline at end of file
+}
+ var_dump(unserialize(serialize(new A())));
diff --git a/hphp/test/slow/serialization/1540.php b/hphp/test/slow/serialization/1540.php
index 0f09ce748..a7ce7927b 100644
--- a/hphp/test/slow/serialization/1540.php
+++ b/hphp/test/slow/serialization/1540.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A implements Serializable {
   public $__foo = true;
   public function serialize() {
@@ -11,4 +10,6 @@ class A implements Serializable {
     $this->a = $props['a'];
     $this->b = $props['b'];
   }
-} $obj = unserialize(serialize(new A())); var_dump($obj->b);
\ No newline at end of file
+}
+ $obj = unserialize(serialize(new A()));
+ var_dump($obj->b);
diff --git a/hphp/test/slow/serialization/1541.php b/hphp/test/slow/serialization/1541.php
index 907af01fb..9a019c7ea 100644
--- a/hphp/test/slow/serialization/1541.php
+++ b/hphp/test/slow/serialization/1541.php
@@ -1,3 +1,53 @@
 <?php
 
- class Small {  private static $nc = 0;  public $name;  public $num;  function __construct() {    $n = self::$nc++;    $this->name = 'foo'.$n;    $this->num = 3*$n;  }}class Big {  public $groupAll = array();  public $group1 = array();  public $group2 = array();  public $wacky;  public $nothing;  public $unrelated = array();  function add() {    $s = new Small();    $this->groupAll[] = $s;    if ($s->num % 2 == 0) {      $this->group1[]=array($s->name, $s);    } else {      $this->group2[]=array($s->name, $s);    }  }  function finish() {    $x = 10;    $this->wacky = array(&$x, &$x);    $s = new Small();    $this->unrelated[] = $s;    $this->unrelated[] = $s;    $this->unrelated[] = $s;  }}function t() {  $b = new Big;  for ($i = 0; $i < 10; ++$i) {    $b->add();  }  $b->finish();  var_dump($b);  $s = serialize($b);  var_dump($s);  $us = unserialize($s);  var_dump($us);}t();
\ No newline at end of file
+class Small {
+  private static $nc = 0;
+  public $name;
+  public $num;
+  function __construct() {
+    $n = self::$nc++;
+    $this->name = 'foo'.$n;
+    $this->num = 3*$n;
+  }
+}
+class Big {
+  public $groupAll = array();
+  public $group1 = array();
+  public $group2 = array();
+  public $wacky;
+  public $nothing;
+  public $unrelated = array();
+  function add() {
+    $s = new Small();
+    $this->groupAll[] = $s;
+    if ($s->num % 2 == 0) {
+      $this->group1[]=array($s->name, $s);
+    }
+ else {
+      $this->group2[]=array($s->name, $s);
+    }
+  }
+  function finish() {
+    $x = 10;
+    $this->wacky = array(&$x, &$x);
+    $s = new Small();
+    $this->unrelated[] = $s;
+    $this->unrelated[] = $s;
+    $this->unrelated[] = $s;
+  }
+}
+function t() {
+  $b = new Big;
+  for ($i = 0;
+ $i < 10;
+ ++$i) {
+    $b->add();
+  }
+  $b->finish();
+  var_dump($b);
+  $s = serialize($b);
+  var_dump($s);
+  $us = unserialize($s);
+  var_dump($us);
+}
+t();
diff --git a/hphp/test/slow/serialization/1542.php b/hphp/test/slow/serialization/1542.php
index 083908795..792652e91 100644
--- a/hphp/test/slow/serialization/1542.php
+++ b/hphp/test/slow/serialization/1542.php
@@ -1,5 +1,21 @@
 <?php
 
- class t {  public $foo = 10;  protected $bar = 20;  private $derp = 30;}class t2 extends t {  private $derp2 = 40;  protected $bar2 = 50;}$x = new t;print_r($x);var_dump($x);echo serialize($x) . '
-';$x2 = new t2;print_r($x2);var_dump($x2);echo serialize($x2) . '
-';
\ No newline at end of file
+class t {
+  public $foo = 10;
+  protected $bar = 20;
+  private $derp = 30;
+}
+class t2 extends t {
+  private $derp2 = 40;
+  protected $bar2 = 50;
+}
+$x = new t;
+print_r($x);
+var_dump($x);
+echo serialize($x) . '
+';
+$x2 = new t2;
+print_r($x2);
+var_dump($x2);
+echo serialize($x2) . '
+';
diff --git a/hphp/test/slow/serialization/1543.php b/hphp/test/slow/serialization/1543.php
index 674cd0e69..10bc70b9f 100644
--- a/hphp/test/slow/serialization/1543.php
+++ b/hphp/test/slow/serialization/1543.php
@@ -1,3 +1,14 @@
 <?php
 
- class b {  private $foo = 1;  private $bar = 2;}class b2 extends b {  public $bar = 3;}$x = new b2;$x->foo = 100;var_dump((array)$x);var_dump(serialize($x));var_dump($x);
\ No newline at end of file
+class b {
+  private $foo = 1;
+  private $bar = 2;
+}
+class b2 extends b {
+  public $bar = 3;
+}
+$x = new b2;
+$x->foo = 100;
+var_dump((array)$x);
+var_dump(serialize($x));
+var_dump($x);
diff --git a/hphp/test/slow/serialization/1544.php b/hphp/test/slow/serialization/1544.php
index 43280243c..5ee7d6fba 100644
--- a/hphp/test/slow/serialization/1544.php
+++ b/hphp/test/slow/serialization/1544.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array(array());
 $a[0][0] = &$a[0];
 var_dump(serialize($a));
diff --git a/hphp/test/slow/serialization/1545.php b/hphp/test/slow/serialization/1545.php
index 0661dcb91..cf8cad8ae 100644
--- a/hphp/test/slow/serialization/1545.php
+++ b/hphp/test/slow/serialization/1545.php
@@ -1,3 +1,5 @@
 <?php
 
- var_dump(unserialize('a:1:{s:1:"1";s:3:"foo";}'));var_dump(unserialize('a:1:{d:1;s:3:"foo";}'));var_dump(unserialize('a:1:{a:1:{i:0;i:1;}}'));
\ No newline at end of file
+var_dump(unserialize('a:1:{s:1:"1";s:3:"foo";}'));
+var_dump(unserialize('a:1:{d:1;s:3:"foo";}'));
+var_dump(unserialize('a:1:{a:1:{i:0;i:1;}}'));
diff --git a/hphp/test/slow/serialization/1546.php b/hphp/test/slow/serialization/1546.php
index 6b0fa5ac3..667dd1bfb 100644
--- a/hphp/test/slow/serialization/1546.php
+++ b/hphp/test/slow/serialization/1546.php
@@ -1,3 +1,11 @@
 <?php
 
- class X {  private $priv = 'priv';  protected $prot = 'prot';}$x = new X;$s = serialize($x);$s = str_replace('X', 'Y', $s);$x = unserialize($s);var_dump($x,$x->prot,$x->priv);
\ No newline at end of file
+class X {
+  private $priv = 'priv';
+  protected $prot = 'prot';
+}
+$x = new X;
+$s = serialize($x);
+$s = str_replace('X', 'Y', $s);
+$x = unserialize($s);
+var_dump($x,$x->prot,$x->priv);
diff --git a/hphp/test/slow/serialization/1547.php b/hphp/test/slow/serialization/1547.php
index 9cecdceb3..a7f7db906 100644
--- a/hphp/test/slow/serialization/1547.php
+++ b/hphp/test/slow/serialization/1547.php
@@ -1,3 +1,13 @@
 <?php
 
- class Y {  private $priv = 'priv';  protected $prot = 'prot';}class Z extends Y {}$x = new Z;$s = serialize($x);$x = unserialize($s);var_dump($x);var_dump(serialize($x));
\ No newline at end of file
+class Y {
+  private $priv = 'priv';
+  protected $prot = 'prot';
+}
+class Z extends Y {
+}
+$x = new Z;
+$s = serialize($x);
+$x = unserialize($s);
+var_dump($x);
+var_dump(serialize($x));
diff --git a/hphp/test/slow/serialization/1548.php b/hphp/test/slow/serialization/1548.php
index 3200f43ef..5f809da49 100644
--- a/hphp/test/slow/serialization/1548.php
+++ b/hphp/test/slow/serialization/1548.php
@@ -1,3 +1,20 @@
 <?php
 
- class X {  private $priv;  protected $prot;  public $pub;  function __construct($a,$b,$c) {    $this->priv = $a;    $this->prot = $b;    $this->pub = $c;  }  function foo() { var_dump($this->priv, $this->prot, $this->pub); }}$x = new X(1,2,3);$s = serialize($x);$x = unserialize($s);var_dump($x);$x->foo();
\ No newline at end of file
+class X {
+  private $priv;
+  protected $prot;
+  public $pub;
+  function __construct($a,$b,$c) {
+    $this->priv = $a;
+    $this->prot = $b;
+    $this->pub = $c;
+  }
+  function foo() {
+ var_dump($this->priv, $this->prot, $this->pub);
+ }
+}
+$x = new X(1,2,3);
+$s = serialize($x);
+$x = unserialize($s);
+var_dump($x);
+$x->foo();
diff --git a/hphp/test/slow/serialization/1549.php b/hphp/test/slow/serialization/1549.php
index 3a41ba7b1..8105e9bec 100644
--- a/hphp/test/slow/serialization/1549.php
+++ b/hphp/test/slow/serialization/1549.php
@@ -1,3 +1,19 @@
 <?php
 
- class X {}$a = new X;$q = array(1,2,3);$a->foo = &$q;for ($i = 0; $i < 10; $i++) $a->{'x'.$i} = clone $a;$a->bar = &$q;$s = serialize($a);var_dump($s);$A = unserialize($s);var_dump($A);$r = &$A->bar;var_dump(array_keys($r));
\ No newline at end of file
+class X {
+}
+$a = new X;
+$q = array(1,2,3);
+$a->foo = &$q;
+for ($i = 0;
+ $i < 10;
+ $i++) $a->{
+'x'.$i}
+ = clone $a;
+$a->bar = &$q;
+$s = serialize($a);
+var_dump($s);
+$A = unserialize($s);
+var_dump($A);
+$r = &$A->bar;
+var_dump(array_keys($r));
diff --git a/hphp/test/slow/serialization/1550.php b/hphp/test/slow/serialization/1550.php
index 0b2f2e11e..fcd241a18 100644
--- a/hphp/test/slow/serialization/1550.php
+++ b/hphp/test/slow/serialization/1550.php
@@ -1,3 +1,19 @@
 <?php
 
- class X {  private $str;  private $arr;  private $obj;  function foo() {    $this->str = 'hello';    $this->arr = array(1,2,3);    $this->obj = $this;  }}function test() {  $x = new X;  $s = serialize($x);  $x = unserialize($s);  var_dump($x);}test();
\ No newline at end of file
+class X {
+  private $str;
+  private $arr;
+  private $obj;
+  function foo() {
+    $this->str = 'hello';
+    $this->arr = array(1,2,3);
+    $this->obj = $this;
+  }
+}
+function test() {
+  $x = new X;
+  $s = serialize($x);
+  $x = unserialize($s);
+  var_dump($x);
+}
+test();
diff --git a/hphp/test/slow/serialize/1864.php b/hphp/test/slow/serialize/1864.php
index 417976510..f2a951da4 100644
--- a/hphp/test/slow/serialize/1864.php
+++ b/hphp/test/slow/serialize/1864.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f() {
   $a = array(123);
   $b = $a;
diff --git a/hphp/test/slow/serialize/1865.php b/hphp/test/slow/serialize/1865.php
index cc490a0de..3008bbc6a 100644
--- a/hphp/test/slow/serialize/1865.php
+++ b/hphp/test/slow/serialize/1865.php
@@ -1,3 +1,19 @@
 <?php
 
- class X {  private $o, $a, $o2;  function foo() {    $this->o = $this;    $this->a = array(1,2,3);    $this->o2 = $this;  }}function test() {  $x = new X;  $x->foo();  $s = serialize($x);  var_dump($s);  $y = unserialize($s);  var_dump($y);}test();
\ No newline at end of file
+class X {
+  private $o, $a, $o2;
+  function foo() {
+    $this->o = $this;
+    $this->a = array(1,2,3);
+    $this->o2 = $this;
+  }
+}
+function test() {
+  $x = new X;
+  $x->foo();
+  $s = serialize($x);
+  var_dump($s);
+  $y = unserialize($s);
+  var_dump($y);
+}
+test();
diff --git a/hphp/test/slow/silence_operator/1440.php b/hphp/test/slow/silence_operator/1440.php
index 7d8290689..b4037e890 100644
--- a/hphp/test/slow/silence_operator/1440.php
+++ b/hphp/test/slow/silence_operator/1440.php
@@ -1,3 +1,3 @@
 <?php
 
- @define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
\ No newline at end of file
+@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
diff --git a/hphp/test/slow/simple_xml/1629.php b/hphp/test/slow/simple_xml/1629.php
index a3f611f0f..3ef1a0f1b 100644
--- a/hphp/test/slow/simple_xml/1629.php
+++ b/hphp/test/slow/simple_xml/1629.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function addChildNode(SimpleXMLElement $parent, SimpleXMLElement $node) {
   $newchild = $parent->addChild($node->getName(), (string)$node);
   foreach ($node->attributes() as $name => $value) {
diff --git a/hphp/test/slow/simple_xml/1630.php b/hphp/test/slow/simple_xml/1630.php
index 7fdef89ee..bb3442c9e 100644
--- a/hphp/test/slow/simple_xml/1630.php
+++ b/hphp/test/slow/simple_xml/1630.php
@@ -1,3 +1,4 @@
 <?php
 
- $x = new SimpleXMLElement('<foo><bar>345.234</bar></foo>');var_dump((double)$x->bar);
\ No newline at end of file
+$x = new SimpleXMLElement('<foo><bar>345.234</bar></foo>');
+var_dump((double)$x->bar);
diff --git a/hphp/test/slow/simple_xml/1631.php b/hphp/test/slow/simple_xml/1631.php
index b2865bcda..a7eb573af 100644
--- a/hphp/test/slow/simple_xml/1631.php
+++ b/hphp/test/slow/simple_xml/1631.php
@@ -1,3 +1,4 @@
 <?php
 
- $x = new SimpleXMLElement('<foo><bar></bar></foo>');var_dump((bool)$x->bar);
\ No newline at end of file
+$x = new SimpleXMLElement('<foo><bar></bar></foo>');
+var_dump((bool)$x->bar);
diff --git a/hphp/test/slow/simple_xml/1632.php b/hphp/test/slow/simple_xml/1632.php
index 4a8624b19..48c1bf24a 100644
--- a/hphp/test/slow/simple_xml/1632.php
+++ b/hphp/test/slow/simple_xml/1632.php
@@ -1,3 +1,4 @@
 <?php
 
- $x = new SimpleXMLElement('<foo><bar>0</bar></foo>');var_dump((bool)$x->bar);
\ No newline at end of file
+$x = new SimpleXMLElement('<foo><bar>0</bar></foo>');
+var_dump((bool)$x->bar);
diff --git a/hphp/test/slow/simple_xml/1633.php b/hphp/test/slow/simple_xml/1633.php
index 4b6bfbb72..3830aef61 100644
--- a/hphp/test/slow/simple_xml/1633.php
+++ b/hphp/test/slow/simple_xml/1633.php
@@ -1,3 +1,7 @@
 <?php
 
- $x = new SimpleXMLElement('<foo/>'); $x->addAttribute('attr', 'one'); $x['attr'] = 'two'; var_dump((string)$x['attr']); var_dump($x->asXML());
\ No newline at end of file
+$x = new SimpleXMLElement('<foo/>');
+ $x->addAttribute('attr', 'one');
+ $x['attr'] = 'two';
+ var_dump((string)$x['attr']);
+ var_dump($x->asXML());
diff --git a/hphp/test/slow/simple_xml/1634.php b/hphp/test/slow/simple_xml/1634.php
index a208c0d61..1d60c43be 100644
--- a/hphp/test/slow/simple_xml/1634.php
+++ b/hphp/test/slow/simple_xml/1634.php
@@ -1,5 +1,4 @@
 <?php
 
-
 $node = new SimpleXMLElement('<foo><bar>whoops</bar></foo>');
-var_dump((array)$node->bar);
\ No newline at end of file
+var_dump((array)$node->bar);
diff --git a/hphp/test/slow/simple_xml/1635.php b/hphp/test/slow/simple_xml/1635.php
index 34ad9e8fa..0debf5b53 100644
--- a/hphp/test/slow/simple_xml/1635.php
+++ b/hphp/test/slow/simple_xml/1635.php
@@ -1,5 +1,4 @@
 <?php
 
-
 $node = new SimpleXMLElement('<foo><bar name="value">whoops</bar></foo>');
-var_dump((array)$node->bar);
\ No newline at end of file
+var_dump((array)$node->bar);
diff --git a/hphp/test/slow/simple_xml/1636.php b/hphp/test/slow/simple_xml/1636.php
index 2c948cede..e9f19360f 100644
--- a/hphp/test/slow/simple_xml/1636.php
+++ b/hphp/test/slow/simple_xml/1636.php
@@ -1,5 +1,4 @@
 <?php
 
-
 $node = new SimpleXMLElement('<foo><bar>whoops</bar></foo>');
-var_dump((string)$node[0]);
\ No newline at end of file
+var_dump((string)$node[0]);
diff --git a/hphp/test/slow/simple_xml/1637.php b/hphp/test/slow/simple_xml/1637.php
index 475b3172f..cc81f86ac 100644
--- a/hphp/test/slow/simple_xml/1637.php
+++ b/hphp/test/slow/simple_xml/1637.php
@@ -1,4 +1,4 @@
 <?php
 
-
-$node = simplexml_load_string('<foo><bar>whoops</bar></foo>');var_dump((string)$node);
\ No newline at end of file
+$node = simplexml_load_string('<foo><bar>whoops</bar></foo>');
+var_dump((string)$node);
diff --git a/hphp/test/slow/simple_xml/1638.php b/hphp/test/slow/simple_xml/1638.php
index f0a8d37b5..f702d787c 100644
--- a/hphp/test/slow/simple_xml/1638.php
+++ b/hphp/test/slow/simple_xml/1638.php
@@ -1,4 +1,4 @@
 <?php
 
-
-$node = new SimpleXMLElement('<foo><bar>whoops</bar></foo>');var_dump((string)$node);
\ No newline at end of file
+$node = new SimpleXMLElement('<foo><bar>whoops</bar></foo>');
+var_dump((string)$node);
diff --git a/hphp/test/slow/simple_xml/1639.php b/hphp/test/slow/simple_xml/1639.php
index 1960f8a4b..6a3c8c045 100644
--- a/hphp/test/slow/simple_xml/1639.php
+++ b/hphp/test/slow/simple_xml/1639.php
@@ -1,4 +1,4 @@
 <?php
 
-
-$node = new SimpleXMLElement('<foo>whoops</foo>');var_dump((string)$node);
\ No newline at end of file
+$node = new SimpleXMLElement('<foo>whoops</foo>');
+var_dump((string)$node);
diff --git a/hphp/test/slow/simple_xml/1640.php b/hphp/test/slow/simple_xml/1640.php
index bcfae1454..fdcc1f6e2 100644
--- a/hphp/test/slow/simple_xml/1640.php
+++ b/hphp/test/slow/simple_xml/1640.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $sxe = new SimpleXMLElement('<image-definition />');
 $sxe->addChild('path', 'some/path/to/my.file');
 $sxe->addChild('options');
diff --git a/hphp/test/slow/simple_xml/1641.php b/hphp/test/slow/simple_xml/1641.php
index 8ed706f2a..b5f244589 100644
--- a/hphp/test/slow/simple_xml/1641.php
+++ b/hphp/test/slow/simple_xml/1641.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $x = new SimpleXMLElement('<foo/>');
 $x->addChild('bar', 'whoops');
 var_dump((string)$x);
diff --git a/hphp/test/slow/simple_xml/1642.php b/hphp/test/slow/simple_xml/1642.php
index 6e1aae37d..760679cf6 100644
--- a/hphp/test/slow/simple_xml/1642.php
+++ b/hphp/test/slow/simple_xml/1642.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function convert_simplexml_to_array($sxml) {
   $arr = array();
   if ($sxml) {
@@ -8,17 +7,20 @@ function convert_simplexml_to_array($sxml) {
       if ($sxml['list']) {
         if (isset($v['key'])) {
           $arr[(string)$v['key']] = convert_simplexml_to_array($v);
-        } else {
+        }
+ else {
           $arr[] = convert_simplexml_to_array($v);
         }
-      } else {
+      }
+ else {
         $arr[$k] = convert_simplexml_to_array($v);
       }
     }
   }
   if (sizeof($arr) > 0) {
     return $arr;
-  } else {
+  }
+ else {
     return (string)$sxml;
   }
 }
diff --git a/hphp/test/slow/simple_xml/1643.php b/hphp/test/slow/simple_xml/1643.php
index e4fd7a86d..7544c9aa3 100644
--- a/hphp/test/slow/simple_xml/1643.php
+++ b/hphp/test/slow/simple_xml/1643.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $xml = '<?xml version="1.0" encoding="UTF-8"?><response>test</response>';
 $sxml = simplexml_load_string($xml);
 foreach ($sxml as $k => $v) {
diff --git a/hphp/test/slow/simple_xml/1644.php b/hphp/test/slow/simple_xml/1644.php
index e996a18c0..e14b421c1 100644
--- a/hphp/test/slow/simple_xml/1644.php
+++ b/hphp/test/slow/simple_xml/1644.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $xml = '<?xml version="1.0" encoding="UTF-8"?><response><t>6</t><t>7</t><t>8</t></response>';
 $sxml = simplexml_load_string($xml);
 foreach ($sxml as $k => $v) {
diff --git a/hphp/test/slow/simple_xml/1645.php b/hphp/test/slow/simple_xml/1645.php
index 8e047eaaf..ba174e953 100644
--- a/hphp/test/slow/simple_xml/1645.php
+++ b/hphp/test/slow/simple_xml/1645.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $xml = '<?xml version="1.0" encoding="UTF-8"?><response><t>6</t><t>7</t><t>8</t></response>';
 $sxml = simplexml_load_string($xml);
 foreach ($sxml as $k => $v) {
diff --git a/hphp/test/slow/simple_xml/1646.php b/hphp/test/slow/simple_xml/1646.php
index da9922f8b..01df29af4 100644
--- a/hphp/test/slow/simple_xml/1646.php
+++ b/hphp/test/slow/simple_xml/1646.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $xml = '<?xml version="1.0" encoding="UTF-8"?><root><invalidations><invalidation id="12345"/></invalidations></root>';
 $dom = new SimpleXMLElement($xml);
 $invalidations = $dom->invalidations;
diff --git a/hphp/test/slow/simple_xml/1647.php b/hphp/test/slow/simple_xml/1647.php
index b21dfef84..45f3efb6d 100644
--- a/hphp/test/slow/simple_xml/1647.php
+++ b/hphp/test/slow/simple_xml/1647.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 $file = <<<EOM
 <?xml version="1.0" encoding="UTF-8"?>
 <wurfl-config>
diff --git a/hphp/test/slow/simple_xml/1648.php b/hphp/test/slow/simple_xml/1648.php
index 9ac7a8e57..c0180872e 100644
--- a/hphp/test/slow/simple_xml/1648.php
+++ b/hphp/test/slow/simple_xml/1648.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $xml = '<?xml version="1.0" encoding="UTF-8"?><response><t>6</t></response>';
 $sxml = simplexml_load_string($xml);
 function convert_simplexml_to_array($sxml) {
@@ -11,4 +10,4 @@ function convert_simplexml_to_array($sxml) {
     }
   }
 }
-convert_simplexml_to_array($sxml);
\ No newline at end of file
+convert_simplexml_to_array($sxml);
diff --git a/hphp/test/slow/simple_xml/1649.php b/hphp/test/slow/simple_xml/1649.php
index f6d2bda91..ab83e01c3 100644
--- a/hphp/test/slow/simple_xml/1649.php
+++ b/hphp/test/slow/simple_xml/1649.php
@@ -1,3 +1,5 @@
 <?php
 
- $doc = new SimpleXMLElement('<?xml version="1.0"?><root><node><option>1</option></node></root>'); $doc->node->option = false; var_dump($doc->asXML());
\ No newline at end of file
+$doc = new SimpleXMLElement('<?xml version="1.0"?><root><node><option>1</option></node></root>');
+ $doc->node->option = false;
+ var_dump($doc->asXML());
diff --git a/hphp/test/slow/simple_xml/1650.php b/hphp/test/slow/simple_xml/1650.php
index 9627ee303..35885457f 100644
--- a/hphp/test/slow/simple_xml/1650.php
+++ b/hphp/test/slow/simple_xml/1650.php
@@ -1,3 +1,5 @@
 <?php
 
- $doc = new SimpleXMLElement('<?xml version="1.0"?><root><node><option>1</option></node></root>'); $doc->node->option = 0; var_dump($doc->asXML());
\ No newline at end of file
+$doc = new SimpleXMLElement('<?xml version="1.0"?><root><node><option>1</option></node></root>');
+ $doc->node->option = 0;
+ var_dump($doc->asXML());
diff --git a/hphp/test/slow/simple_xml/1651.php b/hphp/test/slow/simple_xml/1651.php
index 2305f74c5..69359aca2 100644
--- a/hphp/test/slow/simple_xml/1651.php
+++ b/hphp/test/slow/simple_xml/1651.php
@@ -1,3 +1,5 @@
 <?php
 
- $doc = new SimpleXMLElement('<?xml version="1.0"?><root><node><option>1</option></node></root>'); unset($doc->node->option); var_dump($doc->asXML());
\ No newline at end of file
+$doc = new SimpleXMLElement('<?xml version="1.0"?><root><node><option>1</option></node></root>');
+ unset($doc->node->option);
+ var_dump($doc->asXML());
diff --git a/hphp/test/slow/simple_xml/1652.php b/hphp/test/slow/simple_xml/1652.php
index e477e7bd1..a2a72a8ec 100644
--- a/hphp/test/slow/simple_xml/1652.php
+++ b/hphp/test/slow/simple_xml/1652.php
@@ -1,3 +1,6 @@
 <?php
 
- $doc = simplexml_load_String('<?xml version="1.0"?><lists><list path="svn+ssh"><entry kind="dir"></entry><entry kind="file"></entry></list></lists>'); foreach ($doc->list[0]->entry as $r) { var_dump((array)$r->attributes());}
\ No newline at end of file
+$doc = simplexml_load_String('<?xml version="1.0"?><lists><list path="svn+ssh"><entry kind="dir"></entry><entry kind="file"></entry></list></lists>');
+ foreach ($doc->list[0]->entry as $r) {
+ var_dump((array)$r->attributes());
+}
diff --git a/hphp/test/slow/simple_xml/1653.php b/hphp/test/slow/simple_xml/1653.php
index 512484566..2f8efb2c8 100644
--- a/hphp/test/slow/simple_xml/1653.php
+++ b/hphp/test/slow/simple_xml/1653.php
@@ -1,4 +1,7 @@
 <?php
 
- $sxe = new SimpleXMLElement('<foo />');$sxe->addChild('options');$sxe->options->addChild('paddingtop', 0);echo 'Success
-';
\ No newline at end of file
+$sxe = new SimpleXMLElement('<foo />');
+$sxe->addChild('options');
+$sxe->options->addChild('paddingtop', 0);
+echo 'Success
+';
diff --git a/hphp/test/slow/simple_xml/1654.php b/hphp/test/slow/simple_xml/1654.php
index 8709ee319..50639f091 100644
--- a/hphp/test/slow/simple_xml/1654.php
+++ b/hphp/test/slow/simple_xml/1654.php
@@ -1,3 +1,15 @@
 <?php
 
- $doc = simplexml_load_string('<?xml version="1.0"?><root xmlns:foo="http://example.com"><foo:b1>c1</foo:b1><foo:b2>c2</foo:b2><foo:b2>c3</foo:b2></root>'); $foo_ns_bar = $doc->children('http://example.com');var_dump($doc->getName());foreach ($foo_ns_bar as $v) var_dump((string)$v);var_dump($foo_ns_bar->getName());var_dump(count($foo_ns_bar->b1));var_dump((string)$foo_ns_bar->b1);var_dump((string)$foo_ns_bar->b1[0]);foreach ($foo_ns_bar->b1 as $v) var_dump((string)$v);var_dump(count($foo_ns_bar->b2));var_dump((string)$foo_ns_bar->b2[0]);var_dump((string)$foo_ns_bar->b2[1]);foreach ($foo_ns_bar->b2 as $v) var_dump((string)$v);
\ No newline at end of file
+$doc = simplexml_load_string('<?xml version="1.0"?><root xmlns:foo="http://example.com"><foo:b1>c1</foo:b1><foo:b2>c2</foo:b2><foo:b2>c3</foo:b2></root>');
+ $foo_ns_bar = $doc->children('http://example.com');
+var_dump($doc->getName());
+foreach ($foo_ns_bar as $v) var_dump((string)$v);
+var_dump($foo_ns_bar->getName());
+var_dump(count($foo_ns_bar->b1));
+var_dump((string)$foo_ns_bar->b1);
+var_dump((string)$foo_ns_bar->b1[0]);
+foreach ($foo_ns_bar->b1 as $v) var_dump((string)$v);
+var_dump(count($foo_ns_bar->b2));
+var_dump((string)$foo_ns_bar->b2[0]);
+var_dump((string)$foo_ns_bar->b2[1]);
+foreach ($foo_ns_bar->b2 as $v) var_dump((string)$v);
diff --git a/hphp/test/slow/simple_xml/1655.php b/hphp/test/slow/simple_xml/1655.php
index e34f9d6ae..ef0f58345 100644
--- a/hphp/test/slow/simple_xml/1655.php
+++ b/hphp/test/slow/simple_xml/1655.php
@@ -1,3 +1,17 @@
 <?php
 
- function printElement($el, $indent='') {  if (strlen($indent) > 10) {    var_dump('Recursed to deep, backing out');    return;  }  print $indent.$el->getName()."\n";  foreach ($el->attributes() as $k => $v) {    print $indent.$k.' => '.$v."\n";  }  foreach ($el->children() as $child) {    printElement($child, $indent.'  ');  }}$a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><xx><yy><node a="b">hi</node></yy><yy><node a="b">hi</node></yy></xx>');printElement($a);
\ No newline at end of file
+function printElement($el, $indent='') {
+  if (strlen($indent) > 10) {
+    var_dump('Recursed to deep, backing out');
+    return;
+  }
+  print $indent.$el->getName()."\n";
+  foreach ($el->attributes() as $k => $v) {
+    print $indent.$k.' => '.$v."\n";
+  }
+  foreach ($el->children() as $child) {
+    printElement($child, $indent.'  ');
+  }
+}
+$a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><xx><yy><node a="b">hi</node></yy><yy><node a="b">hi</node></yy></xx>');
+printElement($a);
diff --git a/hphp/test/slow/simple_xml/1656.php b/hphp/test/slow/simple_xml/1656.php
index a23585f5e..da5904d56 100644
--- a/hphp/test/slow/simple_xml/1656.php
+++ b/hphp/test/slow/simple_xml/1656.php
@@ -1,3 +1,23 @@
 <?php
 
- $a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node a="b"><subnode attr1="value1" attr2="value2">test</subnode><subnode><subsubnode>test</subsubnode></subnode><test>v</test></node>');var_dump((array)$a->attributes());var_dump((string)$a->subnode[0]);var_dump((string)$a->subnode[0]['attr1']);var_dump((string)$a->subnode[1]['subsubnode']);var_dump((string)$a->subnode[1]->subsubnode);var_dump((string)$a->test);var_dump((array)$a->subnode[0]->attributes());var_dump((array)$a->subnode[1]->attributes());var_dump($a->asxml());var_dump((string)$a->addchild('newnode', 'newvalue'));$a->addattribute('newattr', 'newattrvalue');var_dump($a->asxml());var_dump((array)$a->attributes());var_dump((string)$a->newnode);var_dump($a->getname());var_dump((array)$a->children()->subnode[0]->subsubnode);$nodes = $a->xpath('//node/subnode');var_dump((string)$nodes[1]->subsubnode);$nodes = $nodes[1]->xpath('subsubnode');var_dump((string)$nodes[0]);
\ No newline at end of file
+$a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node a="b"><subnode attr1="value1" attr2="value2">test</subnode><subnode><subsubnode>test</subsubnode></subnode><test>v</test></node>');
+var_dump((array)$a->attributes());
+var_dump((string)$a->subnode[0]);
+var_dump((string)$a->subnode[0]['attr1']);
+var_dump((string)$a->subnode[1]['subsubnode']);
+var_dump((string)$a->subnode[1]->subsubnode);
+var_dump((string)$a->test);
+var_dump((array)$a->subnode[0]->attributes());
+var_dump((array)$a->subnode[1]->attributes());
+var_dump($a->asxml());
+var_dump((string)$a->addchild('newnode', 'newvalue'));
+$a->addattribute('newattr', 'newattrvalue');
+var_dump($a->asxml());
+var_dump((array)$a->attributes());
+var_dump((string)$a->newnode);
+var_dump($a->getname());
+var_dump((array)$a->children()->subnode[0]->subsubnode);
+$nodes = $a->xpath('//node/subnode');
+var_dump((string)$nodes[1]->subsubnode);
+$nodes = $nodes[1]->xpath('subsubnode');
+var_dump((string)$nodes[0]);
diff --git a/hphp/test/slow/simple_xml/1657.php b/hphp/test/slow/simple_xml/1657.php
index 4d2fc7a89..4ab4049c3 100644
--- a/hphp/test/slow/simple_xml/1657.php
+++ b/hphp/test/slow/simple_xml/1657.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode>test</subsubnode></subnode></node>');var_dump((array)($a->subnode->subsubnode));var_dump((string)($a->subnode->subsubnode));
\ No newline at end of file
+$a = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode>test</subsubnode></subnode></node>');
+var_dump((array)($a->subnode->subsubnode));
+var_dump((string)($a->subnode->subsubnode));
diff --git a/hphp/test/slow/simple_xml/1658.php b/hphp/test/slow/simple_xml/1658.php
index c8eebaa8a..d87f046af 100644
--- a/hphp/test/slow/simple_xml/1658.php
+++ b/hphp/test/slow/simple_xml/1658.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode>test</subsubnode></subnode></node>');var_dump((array)($a->subnode->subsubnode));var_dump((string)($a->subnode->subsubnode));
\ No newline at end of file
+$a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode>test</subsubnode></subnode></node>');
+var_dump((array)($a->subnode->subsubnode));
+var_dump((string)($a->subnode->subsubnode));
diff --git a/hphp/test/slow/simple_xml/1659.php b/hphp/test/slow/simple_xml/1659.php
index 4567773a0..db4af1d93 100644
--- a/hphp/test/slow/simple_xml/1659.php
+++ b/hphp/test/slow/simple_xml/1659.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode>test</subsubnode></subnode></node>');var_dump((string)($a->subnode->subsubnode['0']));var_dump((string)($a->subnode->subsubnode[0]));
\ No newline at end of file
+$a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode>test</subsubnode></subnode></node>');
+var_dump((string)($a->subnode->subsubnode['0']));
+var_dump((string)($a->subnode->subsubnode[0]));
diff --git a/hphp/test/slow/simple_xml/1660.php b/hphp/test/slow/simple_xml/1660.php
index 2ea202384..d53a9d183 100644
--- a/hphp/test/slow/simple_xml/1660.php
+++ b/hphp/test/slow/simple_xml/1660.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node><subnode attr1="value1">test</subnode></node>');var_dump((string)($a->subnode['attr1']));
\ No newline at end of file
+$a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node><subnode attr1="value1">test</subnode></node>');
+var_dump((string)($a->subnode['attr1']));
diff --git a/hphp/test/slow/simple_xml/1661.php b/hphp/test/slow/simple_xml/1661.php
index f5ceef948..f7c46f0dc 100644
--- a/hphp/test/slow/simple_xml/1661.php
+++ b/hphp/test/slow/simple_xml/1661.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode attr1="value1">test</subsubnode></subnode></node>');var_dump((string)($a->subnode->subsubnode['attr1']));
\ No newline at end of file
+$a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode attr1="value1">test</subsubnode></subnode></node>');
+var_dump((string)($a->subnode->subsubnode['attr1']));
diff --git a/hphp/test/slow/simple_xml/1662.php b/hphp/test/slow/simple_xml/1662.php
index a21633656..1cf4bebe7 100644
--- a/hphp/test/slow/simple_xml/1662.php
+++ b/hphp/test/slow/simple_xml/1662.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode><sssnode>test</sssnode></subsubnode></subnode></node>');var_dump((string)($a->subnode->subsubnode->sssnode));
\ No newline at end of file
+$a = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8"?><node><subnode><subsubnode><sssnode>test</sssnode></subsubnode></subnode></node>');
+var_dump((string)($a->subnode->subsubnode->sssnode));
diff --git a/hphp/test/slow/simple_xml/1663.php b/hphp/test/slow/simple_xml/1663.php
index 9389a57e9..eb66fe6a3 100644
--- a/hphp/test/slow/simple_xml/1663.php
+++ b/hphp/test/slow/simple_xml/1663.php
@@ -1,3 +1,7 @@
 <?php
 
- $post_xml = '<?xml version="1.0" encoding="utf-8"?><ScanResults version="1.0"><scannedItem itemType="5" itemSize="1079856" itemName="C:\\Program Files\\VMware\\VMware Tools\\VMwareUser.exe" IsScanned="1" IsInfected="0" ObjectSummary="0" ScanError="0"/></ScanResults>';$xml = new SimpleXMLElement($post_xml);foreach ($xml->scannedItem as $item) {  echo $item['itemName'] . "\n";}
\ No newline at end of file
+$post_xml = '<?xml version="1.0" encoding="utf-8"?><ScanResults version="1.0"><scannedItem itemType="5" itemSize="1079856" itemName="C:\\Program Files\\VMware\\VMware Tools\\VMwareUser.exe" IsScanned="1" IsInfected="0" ObjectSummary="0" ScanError="0"/></ScanResults>';
+$xml = new SimpleXMLElement($post_xml);
+foreach ($xml->scannedItem as $item) {
+  echo $item['itemName'] . "\n";
+}
diff --git a/hphp/test/slow/simple_xml/1664.php b/hphp/test/slow/simple_xml/1664.php
index a3260d29b..2993c9162 100644
--- a/hphp/test/slow/simple_xml/1664.php
+++ b/hphp/test/slow/simple_xml/1664.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><?mso-application progid="Excel.Sheet"?><node><subnode><subsubnode>test</subsubnode></subnode></node>');var_dump((string)($a->subnode->subsubnode[0]));
\ No newline at end of file
+$a = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><?mso-application progid="Excel.Sheet"?><node><subnode><subsubnode>test</subsubnode></subnode></node>');
+var_dump((string)($a->subnode->subsubnode[0]));
diff --git a/hphp/test/slow/simple_xml/1665.php b/hphp/test/slow/simple_xml/1665.php
index bb2dd9d5c..c0143bb76 100644
--- a/hphp/test/slow/simple_xml/1665.php
+++ b/hphp/test/slow/simple_xml/1665.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $xml = '<?xml version="1.0" encoding="UTF-8"?><response><t a="apple" b="banana">6</t><t>7</t><t>8</t></response>';
 $sxml = simplexml_load_string($xml);
 var_dump(count($sxml->t));
@@ -9,4 +8,5 @@ var_dump((string)$sxml->t[1]);
 var_dump((string)$sxml->t[2]);
 var_dump(count($sxml->t->bogus));
 var_dump(count($sxml->t->attributes()));
-foreach ($sxml->bogus as $v) {}
\ No newline at end of file
+foreach ($sxml->bogus as $v) {
+}
diff --git a/hphp/test/slow/simple_xml/1666.php b/hphp/test/slow/simple_xml/1666.php
index 1910f1547..5087e7e59 100644
--- a/hphp/test/slow/simple_xml/1666.php
+++ b/hphp/test/slow/simple_xml/1666.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class MyElement extends SimpleXMLElement {
   public function asUcWordString() {
     return ucwords((string)$this);
diff --git a/hphp/test/slow/simple_xml/dom_import_simplexml.php b/hphp/test/slow/simple_xml/dom_import_simplexml.php
index 4dd1a30d4..6a95f2897 100644
--- a/hphp/test/slow/simple_xml/dom_import_simplexml.php
+++ b/hphp/test/slow/simple_xml/dom_import_simplexml.php
@@ -1,4 +1,5 @@
 <?php
+
 function main() {
   $s = simplexml_load_string('<a><b>c</b></a>');
   $dom = dom_import_simplexml($s);
diff --git a/hphp/test/slow/static_statement/1394.php b/hphp/test/slow/static_statement/1394.php
index 6a81d239a..4fe5bfe94 100644
--- a/hphp/test/slow/static_statement/1394.php
+++ b/hphp/test/slow/static_statement/1394.php
@@ -1,3 +1,18 @@
 <?php
 
- function test_unset_static() {  static $static_var;  $static_var ++;  echo "value of static_var before unset: $static_var\n";  var_dump( isset($static_var) );  var_dump( empty($static_var) );  unset($static_var);  echo "value of static_var after unset: $static_var\n";  var_dump( isset($static_var) );  var_dump( empty($static_var) );  $static_var = 20;  echo "value of static_var after new assignment: $static_var\n";}test_unset_static();test_unset_static();test_unset_static();
\ No newline at end of file
+function test_unset_static() {
+  static $static_var;
+  $static_var ++;
+  echo "value of static_var before unset: $static_var\n";
+  var_dump( isset($static_var) );
+  var_dump( empty($static_var) );
+  unset($static_var);
+  echo "value of static_var after unset: $static_var\n";
+  var_dump( isset($static_var) );
+  var_dump( empty($static_var) );
+  $static_var = 20;
+  echo "value of static_var after new assignment: $static_var\n";
+}
+test_unset_static();
+test_unset_static();
+test_unset_static();
diff --git a/hphp/test/slow/static_statement/1395.php b/hphp/test/slow/static_statement/1395.php
index 54392e677..23e7fdc5c 100644
--- a/hphp/test/slow/static_statement/1395.php
+++ b/hphp/test/slow/static_statement/1395.php
@@ -1,3 +1,10 @@
 <?php
 
- function test() {  $static_var = 3;  echo $static_var;  static $static_var;  $static_var ++;  echo $static_var;}test();
\ No newline at end of file
+function test() {
+  $static_var = 3;
+  echo $static_var;
+  static $static_var;
+  $static_var ++;
+  echo $static_var;
+}
+test();
diff --git a/hphp/test/slow/static_statement/1396.php b/hphp/test/slow/static_statement/1396.php
index 0b18ed3dc..8ae744f74 100644
--- a/hphp/test/slow/static_statement/1396.php
+++ b/hphp/test/slow/static_statement/1396.php
@@ -1,3 +1,12 @@
 <?php
 
- class A { static function test() {  $static_var = 3;  echo $static_var;  static $static_var;  $static_var ++;  echo $static_var;} }A::test();
\ No newline at end of file
+class A {
+ static function test() {
+  $static_var = 3;
+  echo $static_var;
+  static $static_var;
+  $static_var ++;
+  echo $static_var;
+}
+ }
+A::test();
diff --git a/hphp/test/slow/static_statement/1397.php b/hphp/test/slow/static_statement/1397.php
index abdab5c2b..f1eb6de88 100644
--- a/hphp/test/slow/static_statement/1397.php
+++ b/hphp/test/slow/static_statement/1397.php
@@ -1,3 +1,8 @@
 <?php
 
-   $static_var = 1;  echo $static_var . "\n";  static $static_var;  echo $static_var . "\n";  $static_var ++;  echo $static_var . "\n";
\ No newline at end of file
+$static_var = 1;
+  echo $static_var . "\n";
+  static $static_var;
+  echo $static_var . "\n";
+  $static_var ++;
+  echo $static_var . "\n";
diff --git a/hphp/test/slow/static_statement/1398.php b/hphp/test/slow/static_statement/1398.php
index f5711fd9d..07bb1a246 100644
--- a/hphp/test/slow/static_statement/1398.php
+++ b/hphp/test/slow/static_statement/1398.php
@@ -1,3 +1,7 @@
 <?php
 
-   $static_var = 1;  global $static_var;  echo $static_var . "\n";  $static_var --;  echo $static_var . "\n";
\ No newline at end of file
+$static_var = 1;
+  global $static_var;
+  echo $static_var . "\n";
+  $static_var --;
+  echo $static_var . "\n";
diff --git a/hphp/test/slow/static_statement/1399.php b/hphp/test/slow/static_statement/1399.php
index 6b1fbcb04..66b346bdd 100644
--- a/hphp/test/slow/static_statement/1399.php
+++ b/hphp/test/slow/static_statement/1399.php
@@ -1,3 +1,12 @@
 <?php
 
-   $static_var = 1;  echo $static_var . "\n";  static $static_var;  echo $static_var . "\n";  $static_var ++;  echo $static_var . "\n";  global $static_var;  echo $static_var . "\n";  $static_var --;  echo $static_var . "\n";
\ No newline at end of file
+$static_var = 1;
+  echo $static_var . "\n";
+  static $static_var;
+  echo $static_var . "\n";
+  $static_var ++;
+  echo $static_var . "\n";
+  global $static_var;
+  echo $static_var . "\n";
+  $static_var --;
+  echo $static_var . "\n";
diff --git a/hphp/test/slow/static_statement/1400.php b/hphp/test/slow/static_statement/1400.php
index b022e6609..bafa2ff67 100644
--- a/hphp/test/slow/static_statement/1400.php
+++ b/hphp/test/slow/static_statement/1400.php
@@ -1,3 +1,14 @@
 <?php
 
- static $static_var = 1;echo $static_var . "\n";function test(){  static $static_var = -1;  echo $static_var . "\n";  $static_var = 2;  echo $static_var . "\n";  $static_var++;  echo $static_var . "\n";}test();test();
\ No newline at end of file
+static $static_var = 1;
+echo $static_var . "\n";
+function test(){
+  static $static_var = -1;
+  echo $static_var . "\n";
+  $static_var = 2;
+  echo $static_var . "\n";
+  $static_var++;
+  echo $static_var . "\n";
+}
+test();
+test();
diff --git a/hphp/test/slow/static_statement/1401.php b/hphp/test/slow/static_statement/1401.php
index 443a14197..5134d72d9 100644
--- a/hphp/test/slow/static_statement/1401.php
+++ b/hphp/test/slow/static_statement/1401.php
@@ -1,3 +1,6 @@
 <?php
 
- static $static_var;echo $static_var . "\n";$static_var = 1;echo $static_var . "\n";
\ No newline at end of file
+static $static_var;
+echo $static_var . "\n";
+$static_var = 1;
+echo $static_var . "\n";
diff --git a/hphp/test/slow/static_statement/1402.php b/hphp/test/slow/static_statement/1402.php
index f99ece5ef..562ad041a 100644
--- a/hphp/test/slow/static_statement/1402.php
+++ b/hphp/test/slow/static_statement/1402.php
@@ -1,3 +1,11 @@
 <?php
 
- function test() {  if (false) {    static $static_var = +3;  }  echo $static_var . "\n";  $static_var = 4;  echo $static_var . "\n";}test();
\ No newline at end of file
+function test() {
+  if (false) {
+    static $static_var = +3;
+  }
+  echo $static_var . "\n";
+  $static_var = 4;
+  echo $static_var . "\n";
+}
+test();
diff --git a/hphp/test/slow/static_statement/1403.php b/hphp/test/slow/static_statement/1403.php
index c7dd7c873..824f588ac 100644
--- a/hphp/test/slow/static_statement/1403.php
+++ b/hphp/test/slow/static_statement/1403.php
@@ -1,3 +1,8 @@
 <?php
 
- if (false) {  static $static_var = +3;}echo $static_var . "\n";$static_var = 4;echo $static_var . "\n";
\ No newline at end of file
+if (false) {
+  static $static_var = +3;
+}
+echo $static_var . "\n";
+$static_var = 4;
+echo $static_var . "\n";
diff --git a/hphp/test/slow/static_statement/1404.php b/hphp/test/slow/static_statement/1404.php
index e749deb71..e53f63ebe 100644
--- a/hphp/test/slow/static_statement/1404.php
+++ b/hphp/test/slow/static_statement/1404.php
@@ -1,3 +1,5 @@
 <?php
 
- echo $static_var . "\n";static $static_var = 4;echo $static_var . "\n";
\ No newline at end of file
+echo $static_var . "\n";
+static $static_var = 4;
+echo $static_var . "\n";
diff --git a/hphp/test/slow/static_statement/1405.php b/hphp/test/slow/static_statement/1405.php
index 3d6160854..43a08427d 100644
--- a/hphp/test/slow/static_statement/1405.php
+++ b/hphp/test/slow/static_statement/1405.php
@@ -1,3 +1,6 @@
 <?php
 
- static $a = 5;echo $a . "\n";global $a;echo $a . "\n";
\ No newline at end of file
+static $a = 5;
+echo $a . "\n";
+global $a;
+echo $a . "\n";
diff --git a/hphp/test/slow/static_statement/1406.php b/hphp/test/slow/static_statement/1406.php
index cb5328d73..8e38f54cc 100644
--- a/hphp/test/slow/static_statement/1406.php
+++ b/hphp/test/slow/static_statement/1406.php
@@ -1,3 +1,11 @@
 <?php
 
- function test() {  static $commenced = false;  if ($commenced === false) {    return 1;  }  $commenced = true;  unset($args);}echo test();
\ No newline at end of file
+function test() {
+  static $commenced = false;
+  if ($commenced === false) {
+    return 1;
+  }
+  $commenced = true;
+  unset($args);
+}
+echo test();
diff --git a/hphp/test/slow/static_statement/1407.php b/hphp/test/slow/static_statement/1407.php
index 636cb7378..6b1ed52a6 100644
--- a/hphp/test/slow/static_statement/1407.php
+++ b/hphp/test/slow/static_statement/1407.php
@@ -1,3 +1,117 @@
 <?php
 
- static $a = 1, $b = 2;static $c = 1;static $d = 1;static $e = 1;static $f = 1;static $g = 1;static $h = 1;static $i = 1;static $i = 2;if (false) {  static $a = 2;  static $b = 3;  static $c = 2;  static $g;  static $i;  $e = 2;} else {  static $d = 2;  static $h;  $f = 2;}echo $a;echo $b;echo $c;echo $d;echo $e;echo $f;echo $g;echo $h;echo $i;function f() {  static $a = 1, $b = 2;  static $c = 1;  static $d = 1;  static $e = 1;  static $f = 1;  static $g = 1;  static $h = 1;  static $i = 1;  static $i = 2;  if (false) {    static $a = 2;    static $b = 3;    static $c = 2;    static $g;    static $i;    $e = 2;  } else {    static $d = 2;    static $h;    $f = 2;  }  echo $a;  echo $b;  echo $c;  echo $d;  echo $e;  echo $f;  echo $g;  echo $h;  echo $i;}f();class foo {  static $a = 1, $b = 2;  static $c = 1;  static $d = 1;  static $e = 1;  static $f = 1;  function bar() {    static $a = 1, $b = 2;    static $c = 1;    static $d = 1;    static $e = 1;    static $f = 1;    static $g = 1;    static $h = 1;    static $i = 1;    static $i = 2;    if (false) {      static $a = 2;      static $b = 3;      static $c = 2;      static $g;      static $i;      $e = 2;    } else {      static $d = 2;      static $h;      $f = 2;    }    echo foo::$a;    echo foo::$b;    echo foo::$c;    echo foo::$d;    echo foo::$e;    echo foo::$f;    echo $a;    echo $b;    echo $c;    echo $d;    echo $e;    echo $f;    echo $g;    echo $h;    echo $i;  }}echo foo::$a;echo foo::$b;$v = new foo;$v->bar();
\ No newline at end of file
+static $a = 1, $b = 2;
+static $c = 1;
+static $d = 1;
+static $e = 1;
+static $f = 1;
+static $g = 1;
+static $h = 1;
+static $i = 1;
+static $i = 2;
+if (false) {
+  static $a = 2;
+  static $b = 3;
+  static $c = 2;
+  static $g;
+  static $i;
+  $e = 2;
+}
+ else {
+  static $d = 2;
+  static $h;
+  $f = 2;
+}
+echo $a;
+echo $b;
+echo $c;
+echo $d;
+echo $e;
+echo $f;
+echo $g;
+echo $h;
+echo $i;
+function f() {
+  static $a = 1, $b = 2;
+  static $c = 1;
+  static $d = 1;
+  static $e = 1;
+  static $f = 1;
+  static $g = 1;
+  static $h = 1;
+  static $i = 1;
+  static $i = 2;
+  if (false) {
+    static $a = 2;
+    static $b = 3;
+    static $c = 2;
+    static $g;
+    static $i;
+    $e = 2;
+  }
+ else {
+    static $d = 2;
+    static $h;
+    $f = 2;
+  }
+  echo $a;
+  echo $b;
+  echo $c;
+  echo $d;
+  echo $e;
+  echo $f;
+  echo $g;
+  echo $h;
+  echo $i;
+}
+f();
+class foo {
+  static $a = 1, $b = 2;
+  static $c = 1;
+  static $d = 1;
+  static $e = 1;
+  static $f = 1;
+  function bar() {
+    static $a = 1, $b = 2;
+    static $c = 1;
+    static $d = 1;
+    static $e = 1;
+    static $f = 1;
+    static $g = 1;
+    static $h = 1;
+    static $i = 1;
+    static $i = 2;
+    if (false) {
+      static $a = 2;
+      static $b = 3;
+      static $c = 2;
+      static $g;
+      static $i;
+      $e = 2;
+    }
+ else {
+      static $d = 2;
+      static $h;
+      $f = 2;
+    }
+    echo foo::$a;
+    echo foo::$b;
+    echo foo::$c;
+    echo foo::$d;
+    echo foo::$e;
+    echo foo::$f;
+    echo $a;
+    echo $b;
+    echo $c;
+    echo $d;
+    echo $e;
+    echo $f;
+    echo $g;
+    echo $h;
+    echo $i;
+  }
+}
+echo foo::$a;
+echo foo::$b;
+$v = new foo;
+$v->bar();
diff --git a/hphp/test/slow/static_statement/1408.php b/hphp/test/slow/static_statement/1408.php
index e80723aca..dd319a6a8 100644
--- a/hphp/test/slow/static_statement/1408.php
+++ b/hphp/test/slow/static_statement/1408.php
@@ -1,3 +1,13 @@
 <?php
 
- define('FOO', 1);class a {  static $b = FOO;}function foo() {  static $a;  static $a = FOO;  echo $a;}foo();echo a::$b;
\ No newline at end of file
+define('FOO', 1);
+class a {
+  static $b = FOO;
+}
+function foo() {
+  static $a;
+  static $a = FOO;
+  echo $a;
+}
+foo();
+echo a::$b;
diff --git a/hphp/test/slow/static_statement/1409.php b/hphp/test/slow/static_statement/1409.php
index 4cb2cc934..60fd7e182 100644
--- a/hphp/test/slow/static_statement/1409.php
+++ b/hphp/test/slow/static_statement/1409.php
@@ -1,3 +1,41 @@
 <?php
 
- class c {  public $q = 20;  function x() {    $foo = 20;    static $foo;    $foo = $this->q;    echo $foo;  }  function y() {    static $foo = 20;    $foo++;    echo $foo;  }  static function sf() {    static $foo = 0;    $foo++;    echo $foo;  }}class d extends c {  public $q = 30;}$x = new c();$x->x();$x->y();$x->y();$x->y();$x->y();$x = new d();$x->x();$x->y();$x->y();$x->y();c::sf();c::sf();c::sf();d::sf();d::sf();d::sf();
\ No newline at end of file
+class c {
+  public $q = 20;
+  function x() {
+    $foo = 20;
+    static $foo;
+    $foo = $this->q;
+    echo $foo;
+  }
+  function y() {
+    static $foo = 20;
+    $foo++;
+    echo $foo;
+  }
+  static function sf() {
+    static $foo = 0;
+    $foo++;
+    echo $foo;
+  }
+}
+class d extends c {
+  public $q = 30;
+}
+$x = new c();
+$x->x();
+$x->y();
+$x->y();
+$x->y();
+$x->y();
+$x = new d();
+$x->x();
+$x->y();
+$x->y();
+$x->y();
+c::sf();
+c::sf();
+c::sf();
+d::sf();
+d::sf();
+d::sf();
diff --git a/hphp/test/slow/static_statement/1410.php b/hphp/test/slow/static_statement/1410.php
index 339a37440..bfa73adeb 100644
--- a/hphp/test/slow/static_statement/1410.php
+++ b/hphp/test/slow/static_statement/1410.php
@@ -1,3 +1,22 @@
 <?php
 
- class A {  private function foo() {    static $x = null;    var_dump(get_class($this), $x);    $x = 1;  }  public function run() {    $this->foo();  }}class B extends A {}class C extends A {}$a = new A;$b = new B;$c = new C;$a->run();$b->run();$c->run();
\ No newline at end of file
+class A {
+  private function foo() {
+    static $x = null;
+    var_dump(get_class($this), $x);
+    $x = 1;
+  }
+  public function run() {
+    $this->foo();
+  }
+}
+class B extends A {
+}
+class C extends A {
+}
+$a = new A;
+$b = new B;
+$c = new C;
+$a->run();
+$b->run();
+$c->run();
diff --git a/hphp/test/slow/string/117.php b/hphp/test/slow/string/117.php
index 9b4a25d4e..22f285fcf 100644
--- a/hphp/test/slow/string/117.php
+++ b/hphp/test/slow/string/117.php
@@ -1,3 +1,3 @@
 <?php
 
- print '\'\\"';
\ No newline at end of file
+print '\'\\"';
diff --git a/hphp/test/slow/string/118.php b/hphp/test/slow/string/118.php
index 006fde0c2..178255212 100644
--- a/hphp/test/slow/string/118.php
+++ b/hphp/test/slow/string/118.php
@@ -1,4 +1,4 @@
 <?php
 
- print 'test
-ok';
\ No newline at end of file
+print 'test
+ok';
diff --git a/hphp/test/slow/string/119.php b/hphp/test/slow/string/119.php
index 66dfc0a11..e5e784b93 100644
--- a/hphp/test/slow/string/119.php
+++ b/hphp/test/slow/string/119.php
@@ -1,4 +1,4 @@
 <?php
 
- print "test
-ok";
\ No newline at end of file
+print "test
+ok";
diff --git a/hphp/test/slow/string/120.php b/hphp/test/slow/string/120.php
index db387245a..3d990a80d 100644
--- a/hphp/test/slow/string/120.php
+++ b/hphp/test/slow/string/120.php
@@ -1,3 +1,3 @@
 <?php
 
- print "test\n\r\t\v\f\\\$\"";
\ No newline at end of file
+print "test\n\r\t\v\f\\\$\"";
diff --git a/hphp/test/slow/string/121.php b/hphp/test/slow/string/121.php
index bf5719c38..57f840967 100644
--- a/hphp/test/slow/string/121.php
+++ b/hphp/test/slow/string/121.php
@@ -1,3 +1,3 @@
 <?php
 
- print "\1\12\123\1234\xA\xAB";
\ No newline at end of file
+print "\1\12\123\1234\xA\xAB";
diff --git a/hphp/test/slow/string/122.php b/hphp/test/slow/string/122.php
index f6a226fb2..5b1137612 100644
--- a/hphp/test/slow/string/122.php
+++ b/hphp/test/slow/string/122.php
@@ -1,3 +1,3 @@
 <?php
 
- print 'test\n';
\ No newline at end of file
+print 'test\n';
diff --git a/hphp/test/slow/string/123.php b/hphp/test/slow/string/123.php
index d4c67eb13..d759c49f8 100644
--- a/hphp/test/slow/string/123.php
+++ b/hphp/test/slow/string/123.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $b = $a; print $b;
\ No newline at end of file
+$a = 'test';
+ $b = $a;
+ print $b;
diff --git a/hphp/test/slow/string/124.php b/hphp/test/slow/string/124.php
index 099be8037..cc1b609d3 100644
--- a/hphp/test/slow/string/124.php
+++ b/hphp/test/slow/string/124.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; $b = $a; $a = 'changed'; print $b;
\ No newline at end of file
+$a = 'test';
+ $b = $a;
+ $a = 'changed';
+ print $b;
diff --git a/hphp/test/slow/string/125.php b/hphp/test/slow/string/125.php
index 34c488c59..1b8821a4a 100644
--- a/hphp/test/slow/string/125.php
+++ b/hphp/test/slow/string/125.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; $b = $a; $a = 'changed'; print $a;
\ No newline at end of file
+$a = 'test';
+ $b = $a;
+ $a = 'changed';
+ print $a;
diff --git a/hphp/test/slow/string/126.php b/hphp/test/slow/string/126.php
index e2a4edbf8..9aa5fa5da 100644
--- a/hphp/test/slow/string/126.php
+++ b/hphp/test/slow/string/126.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; $b = $a; $b = 'changed'; print $a;
\ No newline at end of file
+$a = 'test';
+ $b = $a;
+ $b = 'changed';
+ print $a;
diff --git a/hphp/test/slow/string/127.php b/hphp/test/slow/string/127.php
index af4678cf0..7f289a67c 100644
--- a/hphp/test/slow/string/127.php
+++ b/hphp/test/slow/string/127.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'a'; $b = 'b'; $c = 'a' . 'b'; print $c;
\ No newline at end of file
+$a = 'a';
+ $b = 'b';
+ $c = 'a' . 'b';
+ print $c;
diff --git a/hphp/test/slow/string/128.php b/hphp/test/slow/string/128.php
index 40a843767..ef79b0769 100644
--- a/hphp/test/slow/string/128.php
+++ b/hphp/test/slow/string/128.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'a'; $b = 'b'; $c = $a  . 'b'; print $c;
\ No newline at end of file
+$a = 'a';
+ $b = 'b';
+ $c = $a  . 'b';
+ print $c;
diff --git a/hphp/test/slow/string/129.php b/hphp/test/slow/string/129.php
index e545f4aba..2a5d4b326 100644
--- a/hphp/test/slow/string/129.php
+++ b/hphp/test/slow/string/129.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'a'; $b = 'b'; $c = 'a' . $b ; print $c;
\ No newline at end of file
+$a = 'a';
+ $b = 'b';
+ $c = 'a' . $b ;
+ print $c;
diff --git a/hphp/test/slow/string/130.php b/hphp/test/slow/string/130.php
index 51ddf7e1c..0ee52325a 100644
--- a/hphp/test/slow/string/130.php
+++ b/hphp/test/slow/string/130.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'a'; $b = 'b'; $b .= $a;       print $b;
\ No newline at end of file
+$a = 'a';
+ $b = 'b';
+ $b .= $a;
+       print $b;
diff --git a/hphp/test/slow/string/131.php b/hphp/test/slow/string/131.php
index 41a0f14a8..918eb5597 100644
--- a/hphp/test/slow/string/131.php
+++ b/hphp/test/slow/string/131.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; print $a{0};
\ No newline at end of file
+$a = 'test';
+ print $a{
+0}
+;
diff --git a/hphp/test/slow/string/132.php b/hphp/test/slow/string/132.php
index 7e5f5e06e..bf1d2764c 100644
--- a/hphp/test/slow/string/132.php
+++ b/hphp/test/slow/string/132.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; print '['.$a{-1}.']';
\ No newline at end of file
+$a = 'test';
+ print '['.$a{
+-1}
+.']';
diff --git a/hphp/test/slow/string/133.php b/hphp/test/slow/string/133.php
index 39af53d14..0311c8d7a 100644
--- a/hphp/test/slow/string/133.php
+++ b/hphp/test/slow/string/133.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; print '['.$a{100}.']';
\ No newline at end of file
+$a = 'test';
+ print '['.$a{
+100}
+.']';
diff --git a/hphp/test/slow/string/134.php b/hphp/test/slow/string/134.php
index a33f38162..d8f6c1046 100644
--- a/hphp/test/slow/string/134.php
+++ b/hphp/test/slow/string/134.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 'test'; print $a[0];
\ No newline at end of file
+$a = 'test';
+ print $a[0];
diff --git a/hphp/test/slow/string/135.php b/hphp/test/slow/string/135.php
index 95f6fee56..d40d83092 100644
--- a/hphp/test/slow/string/135.php
+++ b/hphp/test/slow/string/135.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 'test'; print $a['junk'];
\ No newline at end of file
+$a = 'test';
+ print $a['junk'];
diff --git a/hphp/test/slow/string/136.php b/hphp/test/slow/string/136.php
index f6233cc6a..12fd845a9 100644
--- a/hphp/test/slow/string/136.php
+++ b/hphp/test/slow/string/136.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 'test'; print '['.$a[-1].']';
\ No newline at end of file
+$a = 'test';
+ print '['.$a[-1].']';
diff --git a/hphp/test/slow/string/137.php b/hphp/test/slow/string/137.php
index 15f602d7a..2d57adb89 100644
--- a/hphp/test/slow/string/137.php
+++ b/hphp/test/slow/string/137.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 'test'; print '['.$a[100].']';
\ No newline at end of file
+$a = 'test';
+ print '['.$a[100].']';
diff --git a/hphp/test/slow/string/138.php b/hphp/test/slow/string/138.php
index 6d125ec88..949885b69 100644
--- a/hphp/test/slow/string/138.php
+++ b/hphp/test/slow/string/138.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $a[0] = 'ABC'; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $a[0] = 'ABC';
+ var_dump($a);
diff --git a/hphp/test/slow/string/139.php b/hphp/test/slow/string/139.php
index 37607a448..80fb808d3 100644
--- a/hphp/test/slow/string/139.php
+++ b/hphp/test/slow/string/139.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $a[10] = 'ABC'; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $a[10] = 'ABC';
+ var_dump($a);
diff --git a/hphp/test/slow/string/140.php b/hphp/test/slow/string/140.php
index cf8d922d9..9b1a1df4f 100644
--- a/hphp/test/slow/string/140.php
+++ b/hphp/test/slow/string/140.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 'test'; $b = $a; $a[0] = 'ABC'; var_dump($a); var_dump($b);
\ No newline at end of file
+$a = 'test';
+ $b = $a;
+ $a[0] = 'ABC';
+ var_dump($a);
+ var_dump($b);
diff --git a/hphp/test/slow/string/141.php b/hphp/test/slow/string/141.php
index ab0c1b773..b1db4a4ca 100644
--- a/hphp/test/slow/string/141.php
+++ b/hphp/test/slow/string/141.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 'test'; $b = $a; $a[10] = 'ABC'; var_dump($a);var_dump($b);
\ No newline at end of file
+$a = 'test';
+ $b = $a;
+ $a[10] = 'ABC';
+ var_dump($a);
+var_dump($b);
diff --git a/hphp/test/slow/string/142.php b/hphp/test/slow/string/142.php
index 10740fe93..7e1487370 100644
--- a/hphp/test/slow/string/142.php
+++ b/hphp/test/slow/string/142.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 'test'; $b = $a; $b[0] = 'ABC'; var_dump($a); var_dump($b);
\ No newline at end of file
+$a = 'test';
+ $b = $a;
+ $b[0] = 'ABC';
+ var_dump($a);
+ var_dump($b);
diff --git a/hphp/test/slow/string/143.php b/hphp/test/slow/string/143.php
index d50c9389c..fb59417ef 100644
--- a/hphp/test/slow/string/143.php
+++ b/hphp/test/slow/string/143.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 'test'; $b = $a; $b[10] = 'ABC'; var_dump($a);var_dump($b);
\ No newline at end of file
+$a = 'test';
+ $b = $a;
+ $b[10] = 'ABC';
+ var_dump($a);
+var_dump($b);
diff --git a/hphp/test/slow/string/144.php b/hphp/test/slow/string/144.php
index 664a8e29e..d6fe26a40 100644
--- a/hphp/test/slow/string/144.php
+++ b/hphp/test/slow/string/144.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 'test'; var_dump(~$a);
\ No newline at end of file
+$a = 'test';
+ var_dump(~$a);
diff --git a/hphp/test/slow/string/145.php b/hphp/test/slow/string/145.php
index ed9e4f558..298a36258 100644
--- a/hphp/test/slow/string/145.php
+++ b/hphp/test/slow/string/145.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $b = 'zzz'; var_dump($a & $b);
\ No newline at end of file
+$a = 'test';
+ $b = 'zzz';
+ var_dump($a & $b);
diff --git a/hphp/test/slow/string/146.php b/hphp/test/slow/string/146.php
index 84bb9fee6..2ced4bef6 100644
--- a/hphp/test/slow/string/146.php
+++ b/hphp/test/slow/string/146.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $b = 'zzz'; var_dump($a | $b);
\ No newline at end of file
+$a = 'test';
+ $b = 'zzz';
+ var_dump($a | $b);
diff --git a/hphp/test/slow/string/147.php b/hphp/test/slow/string/147.php
index 51a318d76..98d9a5697 100644
--- a/hphp/test/slow/string/147.php
+++ b/hphp/test/slow/string/147.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $b = 'zzz'; var_dump($a ^ $b);
\ No newline at end of file
+$a = 'test';
+ $b = 'zzz';
+ var_dump($a ^ $b);
diff --git a/hphp/test/slow/string/148.php b/hphp/test/slow/string/148.php
index c509c0fae..07d75ff6b 100644
--- a/hphp/test/slow/string/148.php
+++ b/hphp/test/slow/string/148.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; $b = 'zzz'; $a &= $b; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $b = 'zzz';
+ $a &= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/string/149.php b/hphp/test/slow/string/149.php
index d99b85bdc..2b34868a2 100644
--- a/hphp/test/slow/string/149.php
+++ b/hphp/test/slow/string/149.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; $b = 'zzz'; $a |= $b; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $b = 'zzz';
+ $a |= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/string/150.php b/hphp/test/slow/string/150.php
index b6b49fc00..62d4da6c0 100644
--- a/hphp/test/slow/string/150.php
+++ b/hphp/test/slow/string/150.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'test'; $b = 'zzz'; $a ^= $b; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $b = 'zzz';
+ $a ^= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/string/151.php b/hphp/test/slow/string/151.php
index 00c9e4ba4..035068a16 100644
--- a/hphp/test/slow/string/151.php
+++ b/hphp/test/slow/string/151.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'zzz'; $b = 'test'; var_dump($a & $b);
\ No newline at end of file
+$a = 'zzz';
+ $b = 'test';
+ var_dump($a & $b);
diff --git a/hphp/test/slow/string/152.php b/hphp/test/slow/string/152.php
index 66c05b4d7..d247cac63 100644
--- a/hphp/test/slow/string/152.php
+++ b/hphp/test/slow/string/152.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'zzz'; $b = 'test'; var_dump($a | $b);
\ No newline at end of file
+$a = 'zzz';
+ $b = 'test';
+ var_dump($a | $b);
diff --git a/hphp/test/slow/string/153.php b/hphp/test/slow/string/153.php
index f31865730..f2911c067 100644
--- a/hphp/test/slow/string/153.php
+++ b/hphp/test/slow/string/153.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'zzz'; $b = 'test'; var_dump($a ^ $b);
\ No newline at end of file
+$a = 'zzz';
+ $b = 'test';
+ var_dump($a ^ $b);
diff --git a/hphp/test/slow/string/154.php b/hphp/test/slow/string/154.php
index 019adc6a2..f69977fa4 100644
--- a/hphp/test/slow/string/154.php
+++ b/hphp/test/slow/string/154.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'zzz'; $b = 'test'; $a &= $b; var_dump($a);
\ No newline at end of file
+$a = 'zzz';
+ $b = 'test';
+ $a &= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/string/155.php b/hphp/test/slow/string/155.php
index 400e447a0..2b17588ae 100644
--- a/hphp/test/slow/string/155.php
+++ b/hphp/test/slow/string/155.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'zzz'; $b = 'test'; $a |= $b; var_dump($a);
\ No newline at end of file
+$a = 'zzz';
+ $b = 'test';
+ $a |= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/string/156.php b/hphp/test/slow/string/156.php
index 93eec56bc..9218bc12a 100644
--- a/hphp/test/slow/string/156.php
+++ b/hphp/test/slow/string/156.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 'zzz'; $b = 'test'; $a ^= $b; var_dump($a);
\ No newline at end of file
+$a = 'zzz';
+ $b = 'test';
+ $a ^= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/string/157.php b/hphp/test/slow/string/157.php
index f3df5d940..a3ad7d1db 100644
--- a/hphp/test/slow/string/157.php
+++ b/hphp/test/slow/string/157.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'zzz'; $a++; var_dump($a);
\ No newline at end of file
+$a = 'zzz';
+ $a++;
+ var_dump($a);
diff --git a/hphp/test/slow/string/158.php b/hphp/test/slow/string/158.php
index b1e20574b..65f431c38 100644
--- a/hphp/test/slow/string/158.php
+++ b/hphp/test/slow/string/158.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'zzz'; ++$a; var_dump($a);
\ No newline at end of file
+$a = 'zzz';
+ ++$a;
+ var_dump($a);
diff --git a/hphp/test/slow/string/159.php b/hphp/test/slow/string/159.php
index 703bb8d1c..ce50f388c 100644
--- a/hphp/test/slow/string/159.php
+++ b/hphp/test/slow/string/159.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'zzz'; $a--; var_dump($a);
\ No newline at end of file
+$a = 'zzz';
+ $a--;
+ var_dump($a);
diff --git a/hphp/test/slow/string/160.php b/hphp/test/slow/string/160.php
index cdc4d87f6..c119369b9 100644
--- a/hphp/test/slow/string/160.php
+++ b/hphp/test/slow/string/160.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'zzz'; --$a; var_dump($a);
\ No newline at end of file
+$a = 'zzz';
+ --$a;
+ var_dump($a);
diff --git a/hphp/test/slow/string/161.php b/hphp/test/slow/string/161.php
index 261e2b657..cba102429 100644
--- a/hphp/test/slow/string/161.php
+++ b/hphp/test/slow/string/161.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 'abc'; var_dump(isset($a[1], $a[2], $a[3]));
\ No newline at end of file
+$a = 'abc';
+ var_dump(isset($a[1], $a[2], $a[3]));
diff --git a/hphp/test/slow/string/162.php b/hphp/test/slow/string/162.php
index e38216c7a..9bb9d58e2 100644
--- a/hphp/test/slow/string/162.php
+++ b/hphp/test/slow/string/162.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(bin2hex(serialize("a\x00b")));
\ No newline at end of file
+var_dump(bin2hex(serialize("a\x00b")));
diff --git a/hphp/test/slow/string/163.php b/hphp/test/slow/string/163.php
index 36ce98445..2290a2854 100644
--- a/hphp/test/slow/string/163.php
+++ b/hphp/test/slow/string/163.php
@@ -1,3 +1,3 @@
 <?php
 
- var_dump(json_encode("\0001"));
\ No newline at end of file
+var_dump(json_encode("\0001"));
diff --git a/hphp/test/slow/string/164.php b/hphp/test/slow/string/164.php
index ee35d5ae4..9e26b0e28 100644
--- a/hphp/test/slow/string/164.php
+++ b/hphp/test/slow/string/164.php
@@ -1,3 +1,8 @@
 <?php
 
- $a = array('x'=>'foo');$b = 'qqq';class c {}$c = new c;$c->p = 'zzz';var_dump("AAA ${a['x']} $a[x] $b $c->p");
\ No newline at end of file
+$a = array('x'=>'foo');
+$b = 'qqq';
+class c {}
+$c = new c;
+$c->p = 'zzz';
+var_dump("AAA ${a['x']} $a[x] $b $c->p");
diff --git a/hphp/test/slow/string/165.php b/hphp/test/slow/string/165.php
index ea9b7be68..cf8f00bc2 100644
--- a/hphp/test/slow/string/165.php
+++ b/hphp/test/slow/string/165.php
@@ -1,3 +1,36 @@
 <?php
 
- function test($a, $b) {  $buf = 'hello';  foreach ($a as $v) {    $buf .= $v . ';';    foreach ($b as $w) {      $buf .= $w;    }  }  var_dump($buf);}test(array('a', 'b', 'c'), array('u', 'v'));function test2($a, $b) {  $buf = 'hello';  foreach ($a as $v) {    $buf .= $v . ';';    foreach ($b as $w) {      $buf .= $w;    }    echo $buf;  }  var_dump($buf);}test2(array('a', 'b', 'c'), array('u', 'v'));function test3($a, $b) {  $buf = 'hello';  foreach ($a as $v) {    $buf .= $v . ';';    foreach ($b as $w) {      echo ($buf .= $w);    }  }  var_dump($buf);}test3(array('a', 'b', 'c'), array('u', 'v'));
\ No newline at end of file
+function test($a, $b) {
+  $buf = 'hello';
+  foreach ($a as $v) {
+    $buf .= $v . ';';
+    foreach ($b as $w) {
+      $buf .= $w;
+    }
+  }
+  var_dump($buf);
+}
+test(array('a', 'b', 'c'), array('u', 'v'));
+function test2($a, $b) {
+  $buf = 'hello';
+  foreach ($a as $v) {
+    $buf .= $v . ';';
+    foreach ($b as $w) {
+      $buf .= $w;
+    }
+    echo $buf;
+  }
+  var_dump($buf);
+}
+test2(array('a', 'b', 'c'), array('u', 'v'));
+function test3($a, $b) {
+  $buf = 'hello';
+  foreach ($a as $v) {
+    $buf .= $v . ';';
+    foreach ($b as $w) {
+      echo ($buf .= $w);
+    }
+  }
+  var_dump($buf);
+}
+test3(array('a', 'b', 'c'), array('u', 'v'));
diff --git a/hphp/test/slow/string/166.php b/hphp/test/slow/string/166.php
index 0dc80b381..19f41cc0a 100644
--- a/hphp/test/slow/string/166.php
+++ b/hphp/test/slow/string/166.php
@@ -1,3 +1,41 @@
 <?php
 
- function f() { return 'x'; }function g() {}function test1($a) {  $buf = '';  foreach ($a as $s) {     $buf .= f() . g() . 'h' . f() . 'h' . g();  }  foreach ($a as $s) {    $buf .= ($s . 'h' . $s);  }  return $buf;}var_dump(test1(array(1)));function test2() {  return f() . g() . f() . g();}var_dump(test2());function test3() {  return f() . g() . f() . g() . f() . g() . f() . g() . f();}var_dump(test3());function test4() {  $s = f();  $s .=    ('foo'.    'bar'.    f().    'foo'.    'baz'.    f().    'fuz'.    'boo'.    f().    'fiz'.     'faz');  $s .= f();  return $s;}var_dump(test4());function test5() {  return g().g().g().g();}var_dump(test5());function test6() {  return g().f().g();}var_dump(test6());
\ No newline at end of file
+function f() {
+ return 'x';
+ }
+function g() {
+}
+function test1($a) {
+  $buf = '';
+  foreach ($a as $s) {
+     $buf .= f() . g() . 'h' . f() . 'h' . g();
+  }
+  foreach ($a as $s) {
+    $buf .= ($s . 'h' . $s);
+  }
+  return $buf;
+}
+var_dump(test1(array(1)));
+function test2() {
+  return f() . g() . f() . g();
+}
+var_dump(test2());
+function test3() {
+  return f() . g() . f() . g() . f() . g() . f() . g() . f();
+}
+var_dump(test3());
+function test4() {
+  $s = f();
+  $s .=    ('foo'.    'bar'.    f().    'foo'.    'baz'.    f().    'fuz'.    'boo'.    f().    'fiz'.     'faz');
+  $s .= f();
+  return $s;
+}
+var_dump(test4());
+function test5() {
+  return g().g().g().g();
+}
+var_dump(test5());
+function test6() {
+  return g().f().g();
+}
+var_dump(test6());
diff --git a/hphp/test/slow/string/167.php b/hphp/test/slow/string/167.php
index 186855a98..578b8345e 100644
--- a/hphp/test/slow/string/167.php
+++ b/hphp/test/slow/string/167.php
@@ -1,3 +1,8 @@
 <?php
 
- class X { static function g() {}};echo 'abc' . X::g() . 'efg';
\ No newline at end of file
+class X {
+ static function g() {
+}
+}
+;
+echo 'abc' . X::g() . 'efg';
diff --git a/hphp/test/slow/string/168.php b/hphp/test/slow/string/168.php
index 0f1433c66..7b5d6f891 100644
--- a/hphp/test/slow/string/168.php
+++ b/hphp/test/slow/string/168.php
@@ -1,3 +1,10 @@
 <?php
 
- $s = 'x';var_dump(strrpos($s.'0', $s));for ($i = -7; $i < 7; $i++) {  echo $i,':';var_dump(strrpos('xabcay', 'a',$i));}
\ No newline at end of file
+$s = 'x';
+var_dump(strrpos($s.'0', $s));
+for ($i = -7;
+ $i < 7;
+ $i++) {
+  echo $i,':';
+var_dump(strrpos('xabcay', 'a',$i));
+}
diff --git a/hphp/test/slow/string/169.php b/hphp/test/slow/string/169.php
index e2f7dba6e..17d2b91f4 100644
--- a/hphp/test/slow/string/169.php
+++ b/hphp/test/slow/string/169.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = 'zz';
 $a++;
 $b = 'zz';
diff --git a/hphp/test/slow/string/170.php b/hphp/test/slow/string/170.php
index 5a7cbadbf..126618bff 100644
--- a/hphp/test/slow/string/170.php
+++ b/hphp/test/slow/string/170.php
@@ -1,9 +1,10 @@
 <?php
 
-
 function test($s) {
   $a = array('abc' => 1, 'abcd' => 2);
-  $s .= 'c'; var_dump($a[$s]);
-  $s .= 'd'; var_dump($a[$s]);
+  $s .= 'c';
+ var_dump($a[$s]);
+  $s .= 'd';
+ var_dump($a[$s]);
 }
 test('ab');
diff --git a/hphp/test/slow/string/171.php b/hphp/test/slow/string/171.php
index 0d52a63e2..e7c1836da 100644
--- a/hphp/test/slow/string/171.php
+++ b/hphp/test/slow/string/171.php
@@ -1,4 +1,29 @@
 <?php
 
-
-function foo() {  $a = '';  $a++;  var_dump($a);  $a = '';  ++$a;  var_dump($a);  $a = '';  $a--;  var_dump($a);  $a = '';  --$a;  var_dump($a);  $a = '@';  $a++;  var_dump($a);  $a = '@';  ++$a;  var_dump($a);  $a = '@';  $a--;  var_dump($a);  $a = '@';  --$a;  var_dump($a);}foo();
\ No newline at end of file
+function foo() {
+  $a = '';
+  $a++;
+  var_dump($a);
+  $a = '';
+  ++$a;
+  var_dump($a);
+  $a = '';
+  $a--;
+  var_dump($a);
+  $a = '';
+  --$a;
+  var_dump($a);
+  $a = '@';
+  $a++;
+  var_dump($a);
+  $a = '@';
+  ++$a;
+  var_dump($a);
+  $a = '@';
+  $a--;
+  var_dump($a);
+  $a = '@';
+  --$a;
+  var_dump($a);
+}
+foo();
diff --git a/hphp/test/slow/string/172.php b/hphp/test/slow/string/172.php
index 76f594a3c..2ca60f202 100644
--- a/hphp/test/slow/string/172.php
+++ b/hphp/test/slow/string/172.php
@@ -1,3 +1,6 @@
 <?php
 
- var_dump(strncmp('foo', 'foo', -100));var_dump(strncasecmp('foo', 'foo', -100));var_dump(substr_compare('foo', 'foo', 0, -100, true));var_dump(substr_compare('foo', 'bar', -3));
\ No newline at end of file
+var_dump(strncmp('foo', 'foo', -100));
+var_dump(strncasecmp('foo', 'foo', -100));
+var_dump(substr_compare('foo', 'foo', 0, -100, true));
+var_dump(substr_compare('foo', 'bar', -3));
diff --git a/hphp/test/slow/super_globals/1384.php b/hphp/test/slow/super_globals/1384.php
index ec9773100..4a864f6e2 100644
--- a/hphp/test/slow/super_globals/1384.php
+++ b/hphp/test/slow/super_globals/1384.php
@@ -1,3 +1,8 @@
 <?php
 
- function test() {  unset($GLOBALS['_SERVER']);  $GLOBALS['_SERVER']['foo'] = 'bar';  var_dump($_SERVER['foo']);  }test();
\ No newline at end of file
+function test() {
+  unset($GLOBALS['_SERVER']);
+  $GLOBALS['_SERVER']['foo'] = 'bar';
+  var_dump($_SERVER['foo']);
+  }
+test();
diff --git a/hphp/test/slow/super_globals/1385.php b/hphp/test/slow/super_globals/1385.php
index ff5f43fa7..402358273 100644
--- a/hphp/test/slow/super_globals/1385.php
+++ b/hphp/test/slow/super_globals/1385.php
@@ -1,3 +1,7 @@
 <?php
 
- function test() {  $_POST = array('HELLO' => 1);}test();var_dump($_POST);
\ No newline at end of file
+function test() {
+  $_POST = array('HELLO' => 1);
+}
+test();
+var_dump($_POST);
diff --git a/hphp/test/slow/super_globals/1386.php b/hphp/test/slow/super_globals/1386.php
index 7f103709a..482c0b0e3 100644
--- a/hphp/test/slow/super_globals/1386.php
+++ b/hphp/test/slow/super_globals/1386.php
@@ -1,3 +1,14 @@
 <?php
 
- class X {  static function test() {    var_dump(__FUNCTION__);    var_dump(__CLASS__);    var_dump(__METHOD__);    return array($GLOBALS[__FUNCTION__],                 $GLOBALS[__CLASS__],                 $GLOBALS[__METHOD__]);  }}$test = 'this_is_function_test';$X = 'this_is_class_x';$GLOBALS['X::test'] = 'this_is_method_test::x';var_dump(X::test());
\ No newline at end of file
+class X {
+  static function test() {
+    var_dump(__FUNCTION__);
+    var_dump(__CLASS__);
+    var_dump(__METHOD__);
+    return array($GLOBALS[__FUNCTION__],                 $GLOBALS[__CLASS__],                 $GLOBALS[__METHOD__]);
+  }
+}
+$test = 'this_is_function_test';
+$X = 'this_is_class_x';
+$GLOBALS['X::test'] = 'this_is_method_test::x';
+var_dump(X::test());
diff --git a/hphp/test/slow/super_globals/1387.php b/hphp/test/slow/super_globals/1387.php
index 91e07fa1d..b222cf2c7 100644
--- a/hphp/test/slow/super_globals/1387.php
+++ b/hphp/test/slow/super_globals/1387.php
@@ -1,10 +1,11 @@
 <?php
 
-
 $a = 100;
 function f() {
   foreach ($GLOBALS as $k => &$v) {
-    if ($k == 'a') { $v = -1; }
+    if ($k == 'a') {
+ $v = -1;
+ }
   }
   global $a;
   var_dump($a);
diff --git a/hphp/test/slow/switch_statement/1751.php b/hphp/test/slow/switch_statement/1751.php
index 1e910d991..adc71a6ab 100644
--- a/hphp/test/slow/switch_statement/1751.php
+++ b/hphp/test/slow/switch_statement/1751.php
@@ -1,3 +1,7 @@
 <?php
 
- class A {} $a = new A();switch ($a) { case 'foo': default:}
\ No newline at end of file
+class A {
+}
+ $a = new A();
+switch ($a) {
+ case 'foo': default:}
diff --git a/hphp/test/slow/switch_statement/1752.php b/hphp/test/slow/switch_statement/1752.php
index 2bcff064d..66bbc246f 100644
--- a/hphp/test/slow/switch_statement/1752.php
+++ b/hphp/test/slow/switch_statement/1752.php
@@ -1,3 +1,7 @@
 <?php
 
- class A {};switch (new A()) { case 'foo': default:}
\ No newline at end of file
+class A {
+}
+;
+switch (new A()) {
+ case 'foo': default:}
diff --git a/hphp/test/slow/switch_statement/1753.php b/hphp/test/slow/switch_statement/1753.php
index f394524af..a8477d719 100644
--- a/hphp/test/slow/switch_statement/1753.php
+++ b/hphp/test/slow/switch_statement/1753.php
@@ -1,3 +1,51 @@
 <?php
 
- function test() {  $a = 2;  switch ($a) {    case ++$a: var_dump('ok'); break;    case 2: var_dump('broken'); break;    case 3: var_dump('really broken'); break;    default: var_dump('fail'); break;  }  $a = 'b';  $b = 2;  switch ($$a) {    case ++$$a: var_dump('broken'); break;    case 2: var_dump('ok'); break;    case 3: var_dump('really broken'); break;    default: var_dump('fail'); break;  }}$a = 2;switch ($a) {  case ++$a: var_dump('ok'); break;  case 2: var_dump('broken'); break;  case 3: var_dump('really broken'); break;  default: var_dump('fail'); break;}$a = 'b';$b = 2;switch ($$a) {  case ++$$a: var_dump('broken'); break;  case 2: var_dump('ok'); break;  case 3: var_dump('really broken'); break;  default: var_dump('fail'); break;}test();
\ No newline at end of file
+function test() {
+  $a = 2;
+  switch ($a) {
+    case ++$a: var_dump('ok');
+ break;
+    case 2: var_dump('broken');
+ break;
+    case 3: var_dump('really broken');
+ break;
+    default: var_dump('fail');
+ break;
+  }
+  $a = 'b';
+  $b = 2;
+  switch ($$a) {
+    case ++$$a: var_dump('broken');
+ break;
+    case 2: var_dump('ok');
+ break;
+    case 3: var_dump('really broken');
+ break;
+    default: var_dump('fail');
+ break;
+  }
+}
+$a = 2;
+switch ($a) {
+  case ++$a: var_dump('ok');
+ break;
+  case 2: var_dump('broken');
+ break;
+  case 3: var_dump('really broken');
+ break;
+  default: var_dump('fail');
+ break;
+}
+$a = 'b';
+$b = 2;
+switch ($$a) {
+  case ++$$a: var_dump('broken');
+ break;
+  case 2: var_dump('ok');
+ break;
+  case 3: var_dump('really broken');
+ break;
+  default: var_dump('fail');
+ break;
+}
+test();
diff --git a/hphp/test/slow/switch_statement/1754.php b/hphp/test/slow/switch_statement/1754.php
index 1bb320487..ad1130d4d 100644
--- a/hphp/test/slow/switch_statement/1754.php
+++ b/hphp/test/slow/switch_statement/1754.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f_str($x) {
   var_dump($x);
   print ' goes to: ';
@@ -112,7 +111,10 @@ function f($x) {
     break;
   }
 }
-function fcn($x) { if ($x) return 5; return 'bar'; }
+function fcn($x) {
+ if ($x) return 5;
+ return 'bar';
+ }
 function st($x) {
   switch ($y = $x) {
   case 0:
@@ -138,7 +140,8 @@ function st($x) {
   default:
     print 'default';
   }
-  switch($x){}
+  switch($x){
+}
   switch($x){
   default:
     print 'default';
@@ -156,7 +159,8 @@ f(1.0);
 f('1abc');
 f('3');
 f('foo');
-class M{}
+class M{
+}
 f(new M());
 f_str('0');
 f_str('');
diff --git a/hphp/test/slow/switch_statement/1755.php b/hphp/test/slow/switch_statement/1755.php
index 926139926..e132ea572 100644
--- a/hphp/test/slow/switch_statement/1755.php
+++ b/hphp/test/slow/switch_statement/1755.php
@@ -1,84 +1,84 @@
 <?php
 
-
 class Evil {
   private $x;
-  public function __construct() { $this->x = 0; }
+  public function __construct() {
+ $this->x = 0;
+ }
   public function __toString() {
     return sprintf("Evil%d", $this->x++);
   }
 }
 function f_1($x) {
   switch ($x) {
-  case "123": print '"123"' . "
-"; break;
-  case "4abc": print '"4abc"' . "
-"; break;
-  default: print "default
-"; break;
-  case "0": print '"0"' . "
-"; break;
-  case "": print '""' . "
-"; break; 
-  case "Evil4": print '"Evil4"' . "
-"; break;
+  case "123": print '"123"' . "";
+ break;
+  case "4abc": print '"4abc"' . "";
+ break;
+  default: print "default";
+ break;
+  case "0": print '"0"' . "";
+ break;
+  case "": print '""' . "";
+ break;
+
+  case "Evil4": print '"Evil4"' . "";
+ break;
   }
 }
 function f_2($x) {
-  var_dump($x); print "  goes to:";
+  var_dump($x);
+ print "  goes to:";
   switch ($x) {
-  case "foo": print "foo
-"; break;
-  case "1": print "1
-"; break;
-  case "2.0": print "2.0
-"; break;
-  case "2ab": print "2ab
-"; break;
-  case "3.212": print "3.212
-"; break;
-  case "0": print "0
-"; break;
-  case "": print "{empty str}
-"; break;
-  default: print "default
-"; break;
+  case "foo": print "foo";
+ break;
+  case "1": print "1";
+ break;
+  case "2.0": print "2.0";
+ break;
+  case "2ab": print "2ab";
+ break;
+  case "3.212": print "3.212";
+ break;
+  case "0": print "0";
+ break;
+  case "": print "{empty str}";
+ break;
+  default: print "default";
+ break;
   }
 }
 function g_2($x) {
-  var_dump($x); print "  goes to:";
+  var_dump($x);
+ print "  goes to:";
   switch ($x) {
-  case "": print "{empty str}
-"; break;
-  case "0": print "0
-"; break;
-  default: print "default
-"; break;
+  case "": print "{empty str}";
+ break;
+  case "0": print "0";
+ break;
+  default: print "default";
+ break;
   }
 }
 function h_2($x) {
-  var_dump($x); print "  goes to:";
+  var_dump($x);
+ print "  goes to:";
   switch ($x) {
-  case "3.0": print "3.0
-"; break;
-  case "3.0abc": print "3.0abc
-"; break;
-  case "3": print "3
-"; break;
-  default: print "
-";
+  case "3.0": print "3.0";
+ break;
+  case "3.0abc": print "3.0abc";
+ break;
+  case "3": print "3";
+ break;
+  default: print "";
   }
 }
 function f_3($x) {
   switch ($x) {
-  default: print "default
-";
-  case "bar": print "bar
-";
-  case "foo": print "foo
-";
-  case "baz": print "baz
-";
+  default: print "default";
+  case "bar": print "bar";
+  case "foo": print "foo";
+  case "baz": print "baz";
   }
 }
 f_1("");
diff --git a/hphp/test/slow/switch_statement/1755.php.expect b/hphp/test/slow/switch_statement/1755.php.expect
index 900484999..aa693d229 100644
--- a/hphp/test/slow/switch_statement/1755.php.expect
+++ b/hphp/test/slow/switch_statement/1755.php.expect
@@ -1,62 +1,21 @@
-""
-""
-"0"
-"0"
-default
-"0"
-"0"
-"0"
-"123"
-"0"
-"4abc"
-"4abc"
-default
-"Evil4"
-int(1)
-  goes to:1
-int(2)
-  goes to:2.0
-float(2)
-  goes to:2.0
-bool(true)
-  goes to:foo
-bool(false)
-  goes to:0
-NULL
-  goes to:{empty str}
-object(stdClass)#1 (0) {
+"""""0""0"default"0""0""0""123""0""4abc""4abc"default"Evil4"int(1)
+  goes to:1int(2)
+  goes to:2.0float(2)
+  goes to:2.0bool(true)
+  goes to:foobool(false)
+  goes to:0NULL
+  goes to:{empty str}object(stdClass)#1 (0) {
 }
-  goes to:default
-array(0) {
+  goes to:defaultarray(0) {
 }
-  goes to:default
-float(3.212)
-  goes to:3.212
-int(0)
-  goes to:{empty str}
-NULL
-  goes to:{empty str}
-bool(false)
-  goes to:{empty str}
-bool(true)
-  goes to:default
-string(1) "3"
-  goes to:3.0
-string(4) "3abc"
-  goes to:
-string(2) "3a"
-  goes to:
-int(3)
-  goes to:3.0
-float(3)
-  goes to:3.0
-foo
-baz
-bar
-foo
-baz
-baz
-default
-bar
-foo
-baz
+  goes to:defaultfloat(3.212)
+  goes to:3.212int(0)
+  goes to:{empty str}NULL
+  goes to:{empty str}bool(false)
+  goes to:{empty str}bool(true)
+  goes to:defaultstring(1) "3"
+  goes to:3.0string(4) "3abc"
+  goes to:string(2) "3a"
+  goes to:int(3)
+  goes to:3.0float(3)
+  goes to:3.0foobazbarfoobazbazdefaultbarfoobaz
\ No newline at end of file
diff --git a/hphp/test/slow/switch_statement/1756.php b/hphp/test/slow/switch_statement/1756.php
index 9e6d77560..e716c2e2e 100644
--- a/hphp/test/slow/switch_statement/1756.php
+++ b/hphp/test/slow/switch_statement/1756.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x) {
   switch ($x) {
   default:
@@ -23,8 +22,10 @@ function f($x) {
 }
 function g($x) {
   switch ($x) {
-  case 'x': print 'x'; break;
-  case '0': print '0'; break;
+  case 'x': print 'x';
+ break;
+  case '0': print '0';
+ break;
   }
 }
 f("foo");
diff --git a/hphp/test/slow/switch_statement/1757.php b/hphp/test/slow/switch_statement/1757.php
index c11c42a5b..00f36fe17 100644
--- a/hphp/test/slow/switch_statement/1757.php
+++ b/hphp/test/slow/switch_statement/1757.php
@@ -1,23 +1,26 @@
 <?php
 
-
 class X {
   function foo() {
     switch ($this) {
-    case 'foo': echo 'foo'; break;
-    case 'bar': echo 'bar'; break;
+    case 'foo': echo 'foo';
+ break;
+    case 'bar': echo 'bar';
+ break;
     default: echo 'def';
     }
   }
   function bar($arg) {
     switch ($this) {
-    case $arg: echo 'arg'; break;
+    case $arg: echo 'arg';
+ break;
     default: echo 'def';
     }
   }
   function baz($arg) {
     switch ($this) {
-    case $arg: echo 'arg'; break;
+    case $arg: echo 'arg';
+ break;
     default: echo 'def';
     }
     yield $arg;
diff --git a/hphp/test/slow/switch_statement/1758.php b/hphp/test/slow/switch_statement/1758.php
index 1f6a35caf..0a8f2dd15 100644
--- a/hphp/test/slow/switch_statement/1758.php
+++ b/hphp/test/slow/switch_statement/1758.php
@@ -1,19 +1,26 @@
 <?php
 
-
 switch ($_POST) {
-case array(): echo 'empty array'; break;
-case $_GET:   echo 'get'; break;
+case array(): echo 'empty array';
+ break;
+case $_GET:   echo 'get';
+ break;
 default: echo 'default';
 }
 switch ($GLOBALS) {
-case array(): echo 'empty array'; break;
+case array(): echo 'empty array';
+ break;
 default: echo 'default';
 }
-function ret_true($x) { return true; }
+function ret_true($x) {
+ return true;
+ }
 switch ($GLOBALS) {
-case ret_true($GLOBALS['foo'] = 10): echo '1'; break;
-case array(); echo '2'; break;
+case ret_true($GLOBALS['foo'] = 10): echo '1';
+ break;
+case array();
+ echo '2';
+ break;
 default: echo '3';
 }
 var_dump($foo);
diff --git a/hphp/test/slow/switch_statement/1759.php b/hphp/test/slow/switch_statement/1759.php
index d3332b0fe..f2ae5a73a 100644
--- a/hphp/test/slow/switch_statement/1759.php
+++ b/hphp/test/slow/switch_statement/1759.php
@@ -1,12 +1,18 @@
 <?php
 
-
-function id($x) { return $x; }
-function ret_false($x) { return false; }
+function id($x) {
+ return $x;
+ }
+function ret_false($x) {
+ return false;
+ }
 function f($x) {
   switch ($x) {
-  case ret_false($x = 32); echo 'fail'; break;
-  case id($x = 5): echo 'here'; break;
+  case ret_false($x = 32);
+ echo 'fail';
+ break;
+  case id($x = 5): echo 'here';
+ break;
   default: echo 'default';
   }
 }
diff --git a/hphp/test/slow/switch_statement/1760.php b/hphp/test/slow/switch_statement/1760.php
index 3fcba9c42..5479ecf88 100644
--- a/hphp/test/slow/switch_statement/1760.php
+++ b/hphp/test/slow/switch_statement/1760.php
@@ -1,3 +1,13 @@
 <?php
 
- class X {}function test($x) {  switch (true) {    case $x instanceof X: var_dump('X'); break;    default: var_dump('Other'); break;  }}test(new X);
\ No newline at end of file
+class X {
+}
+function test($x) {
+  switch (true) {
+    case $x instanceof X: var_dump('X');
+ break;
+    default: var_dump('Other');
+ break;
+  }
+}
+test(new X);
diff --git a/hphp/test/slow/ternary/1725.php b/hphp/test/slow/ternary/1725.php
index fd0640647..8eacd837d 100644
--- a/hphp/test/slow/ternary/1725.php
+++ b/hphp/test/slow/ternary/1725.php
@@ -1,3 +1,5 @@
 <?php
 
- $t = true; $a = $t ? "hello" : "world"; var_dump($a);
\ No newline at end of file
+$t = true;
+ $a = $t ? "hello" : "world";
+ var_dump($a);
diff --git a/hphp/test/slow/ternary/1726.php b/hphp/test/slow/ternary/1726.php
index 5c0a188a7..92f8f742e 100644
--- a/hphp/test/slow/ternary/1726.php
+++ b/hphp/test/slow/ternary/1726.php
@@ -1,3 +1,5 @@
 <?php
 
- $f = false; $a = $f ? 5 : "hello"; var_dump($a);
\ No newline at end of file
+$f = false;
+ $a = $f ? 5 : "hello";
+ var_dump($a);
diff --git a/hphp/test/slow/ternary/1727.php b/hphp/test/slow/ternary/1727.php
index 8a25a867d..fd4f7881e 100644
--- a/hphp/test/slow/ternary/1727.php
+++ b/hphp/test/slow/ternary/1727.php
@@ -1,3 +1,5 @@
 <?php
 
- $t = true; $a = $t ? "hello" : null; var_dump($a);
\ No newline at end of file
+$t = true;
+ $a = $t ? "hello" : null;
+ var_dump($a);
diff --git a/hphp/test/slow/ternary/1728.php b/hphp/test/slow/ternary/1728.php
index d926d928c..babc8f685 100644
--- a/hphp/test/slow/ternary/1728.php
+++ b/hphp/test/slow/ternary/1728.php
@@ -1,3 +1,7 @@
 <?php
 
- function memcache_init_split_vars() {  global $_SERVER;  global $MEMCACHED_SPLIT_HASH;  $MEMCACHED_SPLIT_HASH =    crc32(empty($_SERVER['SERVER_ADDR']) ? php_uname('n')                                         : $_SERVER['SERVER_ADDR']);}
\ No newline at end of file
+function memcache_init_split_vars() {
+  global $_SERVER;
+  global $MEMCACHED_SPLIT_HASH;
+  $MEMCACHED_SPLIT_HASH =    crc32(empty($_SERVER['SERVER_ADDR']) ? php_uname('n')                                         : $_SERVER['SERVER_ADDR']);
+}
diff --git a/hphp/test/slow/ternary/1729.php b/hphp/test/slow/ternary/1729.php
index 5c4d01c93..a22fd984e 100644
--- a/hphp/test/slow/ternary/1729.php
+++ b/hphp/test/slow/ternary/1729.php
@@ -1,3 +1,9 @@
 <?php
 
- function f() {} function g() {} $t = true;$a = $t ? f() : g();var_dump($a);
\ No newline at end of file
+function f() {
+}
+ function g() {
+}
+ $t = true;
+$a = $t ? f() : g();
+var_dump($a);
diff --git a/hphp/test/slow/ternary/1730.php b/hphp/test/slow/ternary/1730.php
index 4550767c6..0dc84cd90 100644
--- a/hphp/test/slow/ternary/1730.php
+++ b/hphp/test/slow/ternary/1730.php
@@ -1,3 +1,6 @@
 <?php
 
- function test($a) { $b = $a + 1 == 5 ? 5 : 7; } test(4);
\ No newline at end of file
+function test($a) {
+ $b = $a + 1 == 5 ? 5 : 7;
+ }
+ test(4);
diff --git a/hphp/test/slow/ternary/1731.php b/hphp/test/slow/ternary/1731.php
index ce8e61f17..1dc2e8987 100644
--- a/hphp/test/slow/ternary/1731.php
+++ b/hphp/test/slow/ternary/1731.php
@@ -1,3 +1,5 @@
 <?php
 
- $t = true; $f = false;$a = $t ? null : ($f ? "hello" : "world");
\ No newline at end of file
+$t = true;
+ $f = false;
+$a = $t ? null : ($f ? "hello" : "world");
diff --git a/hphp/test/slow/ternary/1732.php b/hphp/test/slow/ternary/1732.php
index fc95b7044..5452fe201 100644
--- a/hphp/test/slow/ternary/1732.php
+++ b/hphp/test/slow/ternary/1732.php
@@ -1,3 +1,4 @@
 <?php
 
- $t = true; $a = $t ? "" : "a" . $t . "b";
\ No newline at end of file
+$t = true;
+ $a = $t ? "" : "a" . $t . "b";
diff --git a/hphp/test/slow/ternary/1733.php b/hphp/test/slow/ternary/1733.php
index 0a8eb5664..a470e1bad 100644
--- a/hphp/test/slow/ternary/1733.php
+++ b/hphp/test/slow/ternary/1733.php
@@ -1,3 +1,7 @@
 <?php
 
- function add_cssclass($add, $class) {  $class = empty($class) ? $add : $class .= ' ' . $add;  return $class;}add_cssclass('test', $a);
\ No newline at end of file
+function add_cssclass($add, $class) {
+  $class = empty($class) ? $add : $class .= ' ' . $add;
+  return $class;
+}
+add_cssclass('test', $a);
diff --git a/hphp/test/slow/ternary/1734.php b/hphp/test/slow/ternary/1734.php
index 901e1a7f7..14b7c127f 100644
--- a/hphp/test/slow/ternary/1734.php
+++ b/hphp/test/slow/ternary/1734.php
@@ -1,3 +1,4 @@
 <?php
 
- $a = 123;echo $a ? @mysql_data_seek(null, null) : false;
\ No newline at end of file
+$a = 123;
+echo $a ? @mysql_data_seek(null, null) : false;
diff --git a/hphp/test/slow/ternary/1735.php b/hphp/test/slow/ternary/1735.php
index 6ca1ce94f..79855d3c3 100644
--- a/hphp/test/slow/ternary/1735.php
+++ b/hphp/test/slow/ternary/1735.php
@@ -1,3 +1,8 @@
 <?php
 
- function foo($a) {  $x = $a ? 1 : 0;  return $x - 5;}var_dump(foo(1, 2, 3));var_dump(foo(0, 2, 3));
\ No newline at end of file
+function foo($a) {
+  $x = $a ? 1 : 0;
+  return $x - 5;
+}
+var_dump(foo(1, 2, 3));
+var_dump(foo(0, 2, 3));
diff --git a/hphp/test/slow/ternary/1736.php b/hphp/test/slow/ternary/1736.php
index bdcec7449..4c8f36077 100644
--- a/hphp/test/slow/ternary/1736.php
+++ b/hphp/test/slow/ternary/1736.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class X {
   public $exp_info;
   public function __construct(array $exp_info = null) {
diff --git a/hphp/test/slow/ternary/1737.php b/hphp/test/slow/ternary/1737.php
index 49cf4b42a..a7d80b371 100644
--- a/hphp/test/slow/ternary/1737.php
+++ b/hphp/test/slow/ternary/1737.php
@@ -1,7 +1,7 @@
 <?php
 
-
-class X {}
+class X {
+}
 function f($a0,
            $a1,
            $a2,
@@ -11,7 +11,8 @@ function f($a0,
   $r0 = $a0 ?: 0;
   $r1 = $a1 ?: 0.0;
   $r2 = $a2 ?: false;
-  $r3 = $a3 ?: ''; 
+  $r3 = $a3 ?: '';
+
   $r4 = $a4 ?: array();
   $r5 = $a5 ?: new X;
   return array(
diff --git a/hphp/test/slow/ternary/1738.php b/hphp/test/slow/ternary/1738.php
index 279172bfb..431eedba2 100644
--- a/hphp/test/slow/ternary/1738.php
+++ b/hphp/test/slow/ternary/1738.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x, $y) {
   return $x[0][$y++] ?: false;
 }
diff --git a/hphp/test/slow/ternary_shortcut/1908.php b/hphp/test/slow/ternary_shortcut/1908.php
index 5c118a1f0..a94e760ce 100644
--- a/hphp/test/slow/ternary_shortcut/1908.php
+++ b/hphp/test/slow/ternary_shortcut/1908.php
@@ -1,7 +1,9 @@
 <?php
 
-
-function foo() { var_dump('hello'); return 789;}
+function foo() {
+ var_dump('hello');
+ return 789;
+}
 $a = 123 ?: 456;
 var_dump($a);
 $b[123] = 456;
diff --git a/hphp/test/slow/thrift/1556.php b/hphp/test/slow/thrift/1556.php
index ca272120d..d9e1050b8 100644
--- a/hphp/test/slow/thrift/1556.php
+++ b/hphp/test/slow/thrift/1556.php
@@ -33,7 +33,8 @@ class DummyProtocol {
 class DummyTransport {
   public $buff = '';
   public $pos = 0;
-  function flush() { }
+  function flush() {
+ }
   function write($buff) {
     $this->buff .= $buff;
   }
diff --git a/hphp/test/slow/thrift/1557.php b/hphp/test/slow/thrift/1557.php
index ea5e43273..198491e14 100644
--- a/hphp/test/slow/thrift/1557.php
+++ b/hphp/test/slow/thrift/1557.php
@@ -1,3 +1,71 @@
 <?php
 
- class TType {  const STOP   = 0;  const VOID   = 1;  const BOOL   = 2;  const BYTE   = 3;  const I08    = 3;  const DOUBLE = 4;  const I16    = 6;  const I32    = 8;  const I64    = 10;  const STRING = 11;  const UTF7   = 11;  const STRUCT = 12;  const MAP    = 13;  const SET    = 14;  const LST    = 15;  const UTF8   = 16;  const UTF16  = 17;}class DummyProtocol {  public $t;  function __construct() {    $this->t = new DummyTransport();  }  function getTransport() {    return $this->t;  }}class DummyTransport {  public $buff = '';  public $pos = 0;  function flush() { }  function write($buff) {    $this->buff .= $buff;  }  function read($n) {    $r = substr($this->buff, $this->pos, $n);    $this->pos += $n;    return $r;  }}class TestStruct {  static $_TSPEC;  public $aBool = null;  public $anInt = null;  public $aDouble = null;  public $anInt64 = null;  public $anByte = null;  public $anI16 = null;  public function __construct($vals=null) {    if (!isset(self::$_TSPEC)) {      self::$_TSPEC = array(        -1 => array(          'var' => 'aBool',          'type' => TType::BOOL,                   ),        1 => array(          'var' => 'anInt',          'type' => TType::I32,                   ),        2 => array(          'var' => 'aDouble',          'type' => TType::DOUBLE,                   ),        3 => array(          'var' => 'anInt64',          'type' => TType::I64,                   ),        4 => array(          'var' => 'anByte',          'type' => TType::BYTE,                  ),        5 => array(          'var' => 'anI16',          'type' => TType::I16,                  ),                            );    }  }}function test() {  $p = new DummyProtocol();  $v1 = new TestStruct();  $v1->aBool = false;  $v1->anInt = -1234;  $v1->aDouble = -1.2345;  $v1->anInt64 = -1;  $v1->anByte = -12;  $v1->anI16 = -123;  thrift_protocol_write_binary($p, 'foomethod', 1, $v1, 20, true);  var_dump(thrift_protocol_read_binary($p, 'TestStruct', true));}test();
\ No newline at end of file
+class TType {
+  const STOP   = 0;
+  const VOID   = 1;
+  const BOOL   = 2;
+  const BYTE   = 3;
+  const I08    = 3;
+  const DOUBLE = 4;
+  const I16    = 6;
+  const I32    = 8;
+  const I64    = 10;
+  const STRING = 11;
+  const UTF7   = 11;
+  const STRUCT = 12;
+  const MAP    = 13;
+  const SET    = 14;
+  const LST    = 15;
+  const UTF8   = 16;
+  const UTF16  = 17;
+}
+class DummyProtocol {
+  public $t;
+  function __construct() {
+    $this->t = new DummyTransport();
+  }
+  function getTransport() {
+    return $this->t;
+  }
+}
+class DummyTransport {
+  public $buff = '';
+  public $pos = 0;
+  function flush() {
+ }
+  function write($buff) {
+    $this->buff .= $buff;
+  }
+  function read($n) {
+    $r = substr($this->buff, $this->pos, $n);
+    $this->pos += $n;
+    return $r;
+  }
+}
+class TestStruct {
+  static $_TSPEC;
+  public $aBool = null;
+  public $anInt = null;
+  public $aDouble = null;
+  public $anInt64 = null;
+  public $anByte = null;
+  public $anI16 = null;
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(        -1 => array(          'var' => 'aBool',          'type' => TType::BOOL,                   ),        1 => array(          'var' => 'anInt',          'type' => TType::I32,                   ),        2 => array(          'var' => 'aDouble',          'type' => TType::DOUBLE,                   ),        3 => array(          'var' => 'anInt64',          'type' => TType::I64,                   ),        4 => array(          'var' => 'anByte',          'type' => TType::BYTE,                  ),        5 => array(          'var' => 'anI16',          'type' => TType::I16,                  ),                            );
+    }
+  }
+}
+function test() {
+  $p = new DummyProtocol();
+  $v1 = new TestStruct();
+  $v1->aBool = false;
+  $v1->anInt = -1234;
+  $v1->aDouble = -1.2345;
+  $v1->anInt64 = -1;
+  $v1->anByte = -12;
+  $v1->anI16 = -123;
+  thrift_protocol_write_binary($p, 'foomethod', 1, $v1, 20, true);
+  var_dump(thrift_protocol_read_binary($p, 'TestStruct', true));
+}
+test();
diff --git a/hphp/test/slow/thrift/1558.php b/hphp/test/slow/thrift/1558.php
index d9d43fe1b..9a3345ca7 100644
--- a/hphp/test/slow/thrift/1558.php
+++ b/hphp/test/slow/thrift/1558.php
@@ -1,3 +1,79 @@
 <?php
 
- class TType {  const STOP   = 0;  const VOID   = 1;  const BOOL   = 2;  const BYTE   = 3;  const I08    = 3;  const DOUBLE = 4;  const I16    = 6;  const I32    = 8;  const I64    = 10;  const STRING = 11;  const UTF7   = 11;  const STRUCT = 12;  const MAP    = 13;  const SET    = 14;  const LST    = 15;  const UTF8   = 16;  const UTF16  = 17;}class DummyProtocol {  public $t;  function __construct() {    $this->t = new DummyTransport();  }  function getTransport() {    return $this->t;  }}   class DummyTransport {  public $buff = '';  public $pos = 0;  function flush() { }  function write($buff) {    $this->buff .= $buff;  }   function read($n) {    $r = substr($this->buff, $this->pos, $n);    $this->pos += $n;    return $r;  } }   class TestStruct {  static $_TSPEC;      public $aBool = null;  public $anInt = null;  public $aString = null;  public $aDouble = null;  public $anInt64 = null;  public $aList = null;  public $aMap = null;  public $aSet = null;  public $anByte = null;  public $anI16 = null;      public function __construct($vals=null) {    if (!isset(self::$_TSPEC)) {      self::$_TSPEC = array(        -1 => array(          'var' => 'aBool',          'type' => TType::BOOL,                   ),        1 => array(          'var' => 'anInt',          'type' => TType::I32,                   ),        2 => array(          'var' => 'aString',          'type' => TType::STRING,                   ),        3 => array(          'var' => 'aDouble',          'type' => TType::DOUBLE,                   ),        4 => array(          'var' => 'anInt64',          'type' => TType::I64,                   ),        5 => array(          'var' => 'aList',          'type' => TType::LST,          'etype' => TType::DOUBLE,          'elem' => array(            'type' => TType::DOUBLE,                          ),                   ),        6 => array(          'var' => 'aMap',          'type' => TType::MAP,          'ktype' => TType::I32,          'vtype' => TType::DOUBLE,          'key' => array(            'type' => TType::I32,                         ),          'val' => array(            'type' => TType::DOUBLE,                         ),          ),       7 => array(          'var' => 'aSet',          'type' => TType::SET,          'etype' => TType::I32,          'elem' => array(            'type' => TType::I32,                          ),                  ),       8 => array(          'var' => 'anByte',          'type' => TType::BYTE,                  ),       9 => array(          'var' => 'anI16',          'type' => TType::I16,                  ),                            );    }  }}function test() {  $p = new DummyProtocol();  $v1 = new TestStruct();  $v1->aBool = true;  $v1->anInt = 1234;  $v1->aString = 'abcdef';  $v1->aDouble = 1.2345;  $v1->anInt64 = 8589934592;  $v1->aList = array(13.3, 23.4, 3576.2);  $v1->aMap = array(10=>1.2, 43=>5.33);  $v1->aSet = array(10=>true, 11=>true);  $v1->anByte = 123;  $v1->anI16 = 1234;  thrift_protocol_write_compact($p, 'foomethod', 1, $v1, 20);  var_dump(md5($p->getTransport()->buff));}test();
\ No newline at end of file
+class TType {
+  const STOP   = 0;
+  const VOID   = 1;
+  const BOOL   = 2;
+  const BYTE   = 3;
+  const I08    = 3;
+  const DOUBLE = 4;
+  const I16    = 6;
+  const I32    = 8;
+  const I64    = 10;
+  const STRING = 11;
+  const UTF7   = 11;
+  const STRUCT = 12;
+  const MAP    = 13;
+  const SET    = 14;
+  const LST    = 15;
+  const UTF8   = 16;
+  const UTF16  = 17;
+}
+class DummyProtocol {
+  public $t;
+  function __construct() {
+    $this->t = new DummyTransport();
+  }
+  function getTransport() {
+    return $this->t;
+  }
+}
+   class DummyTransport {
+  public $buff = '';
+  public $pos = 0;
+  function flush() {
+ }
+  function write($buff) {
+    $this->buff .= $buff;
+  }
+   function read($n) {
+    $r = substr($this->buff, $this->pos, $n);
+    $this->pos += $n;
+    return $r;
+  }
+ }
+   class TestStruct {
+  static $_TSPEC;
+      public $aBool = null;
+  public $anInt = null;
+  public $aString = null;
+  public $aDouble = null;
+  public $anInt64 = null;
+  public $aList = null;
+  public $aMap = null;
+  public $aSet = null;
+  public $anByte = null;
+  public $anI16 = null;
+      public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(        -1 => array(          'var' => 'aBool',          'type' => TType::BOOL,                   ),        1 => array(          'var' => 'anInt',          'type' => TType::I32,                   ),        2 => array(          'var' => 'aString',          'type' => TType::STRING,                   ),        3 => array(          'var' => 'aDouble',          'type' => TType::DOUBLE,                   ),        4 => array(          'var' => 'anInt64',          'type' => TType::I64,                   ),        5 => array(          'var' => 'aList',          'type' => TType::LST,          'etype' => TType::DOUBLE,          'elem' => array(            'type' => TType::DOUBLE,                          ),                   ),        6 => array(          'var' => 'aMap',          'type' => TType::MAP,          'ktype' => TType::I32,          'vtype' => TType::DOUBLE,          'key' => array(            'type' => TType::I32,                         ),          'val' => array(            'type' => TType::DOUBLE,                         ),          ),       7 => array(          'var' => 'aSet',          'type' => TType::SET,          'etype' => TType::I32,          'elem' => array(            'type' => TType::I32,                          ),                  ),       8 => array(          'var' => 'anByte',          'type' => TType::BYTE,                  ),       9 => array(          'var' => 'anI16',          'type' => TType::I16,                  ),                            );
+    }
+  }
+}
+function test() {
+  $p = new DummyProtocol();
+  $v1 = new TestStruct();
+  $v1->aBool = true;
+  $v1->anInt = 1234;
+  $v1->aString = 'abcdef';
+  $v1->aDouble = 1.2345;
+  $v1->anInt64 = 8589934592;
+  $v1->aList = array(13.3, 23.4, 3576.2);
+  $v1->aMap = array(10=>1.2, 43=>5.33);
+  $v1->aSet = array(10=>true, 11=>true);
+  $v1->anByte = 123;
+  $v1->anI16 = 1234;
+  thrift_protocol_write_compact($p, 'foomethod', 1, $v1, 20);
+  var_dump(md5($p->getTransport()->buff));
+}
+test();
diff --git a/hphp/test/slow/thrift/1559.php b/hphp/test/slow/thrift/1559.php
index f072ec58d..f12e9c1a7 100644
--- a/hphp/test/slow/thrift/1559.php
+++ b/hphp/test/slow/thrift/1559.php
@@ -1,3 +1,83 @@
 <?php
 
- class TType {  const STOP   = 0;  const VOID   = 1;  const BOOL   = 2;  const BYTE   = 3;  const I08    = 3;  const DOUBLE = 4;  const I16    = 6;  const I32    = 8;  const I64    = 10;  const STRING = 11;  const UTF7   = 11;  const STRUCT = 12;  const MAP    = 13;  const SET    = 14;  const LST    = 15;  const UTF8   = 16;  const UTF16  = 17;}class DummyProtocol {  public $t;  function __construct() {    $this->t = new DummyTransport();  }  function getTransport() {    return $this->t;  }}   class DummyTransport {  public $buff = '';  public $pos = 0;  function flush() { }  function write($buff) {    $this->buff .= $buff;  }   function read($n) {    $r = substr($this->buff, $this->pos, $n);    $this->pos += $n;    return $r;  }   function putBack($data) {    $this->buff = ($data . $this->buff);  } }   class TestStruct {  static $_TSPEC;      public $aBool = null;  public $anInt = null;  public $aString = null;  public $aDouble = null;  public $anInt64 = null;  public $aList = null;  public $aMap = null;  public $aSet = null;  public $anByte = null;  public $anI16 = null;      public function __construct($vals=null) {    if (!isset(self::$_TSPEC)) {      self::$_TSPEC = array(        -1 => array(          'var' => 'aBool',          'type' => TType::BOOL,                   ),        1 => array(          'var' => 'anInt',          'type' => TType::I32,                   ),        2 => array(          'var' => 'aString',          'type' => TType::STRING,                   ),        3 => array(          'var' => 'aDouble',          'type' => TType::DOUBLE,                   ),        4 => array(          'var' => 'anInt64',          'type' => TType::I64,                   ),        5 => array(          'var' => 'aList',          'type' => TType::LST,          'etype' => TType::DOUBLE,          'elem' => array(            'type' => TType::DOUBLE,                          ),                   ),        6 => array(          'var' => 'aMap',          'type' => TType::MAP,          'ktype' => TType::I32,          'vtype' => TType::DOUBLE,          'key' => array(            'type' => TType::I32,                         ),          'val' => array(            'type' => TType::DOUBLE,                         ),          ),       7 => array(          'var' => 'aSet',          'type' => TType::SET,          'etype' => TType::I32,          'elem' => array(            'type' => TType::I32,                          ),                  ),       8 => array(          'var' => 'anByte',          'type' => TType::BYTE,                  ),       9 => array(          'var' => 'anI16',          'type' => TType::I16,                  ),                            );    }  }}function test() {  $p = new DummyProtocol();  $v1 = new TestStruct();  $v1->aBool = true;  $v1->anInt = 1234;  $v1->aString = 'abcdef';  $v1->aDouble = 1.2345;  $v1->anInt64 = 8589934592;  $v1->aList = array(13.3, 23.4, 3576.2);  $v1->aMap = array(10=>1.2, 43=>5.33);  $v1->aSet = array(10=>true, 11=>true);  $v1->anByte = 123;  $v1->anI16 = 1234;  thrift_protocol_write_compact($p, 'foomethod', 1, $v1, 20);  $p->getTransport()->buff[1] = pack('C', 0x42);  var_dump(thrift_protocol_read_compact($p, 'TestStruct'));}test();
\ No newline at end of file
+class TType {
+  const STOP   = 0;
+  const VOID   = 1;
+  const BOOL   = 2;
+  const BYTE   = 3;
+  const I08    = 3;
+  const DOUBLE = 4;
+  const I16    = 6;
+  const I32    = 8;
+  const I64    = 10;
+  const STRING = 11;
+  const UTF7   = 11;
+  const STRUCT = 12;
+  const MAP    = 13;
+  const SET    = 14;
+  const LST    = 15;
+  const UTF8   = 16;
+  const UTF16  = 17;
+}
+class DummyProtocol {
+  public $t;
+  function __construct() {
+    $this->t = new DummyTransport();
+  }
+  function getTransport() {
+    return $this->t;
+  }
+}
+   class DummyTransport {
+  public $buff = '';
+  public $pos = 0;
+  function flush() {
+ }
+  function write($buff) {
+    $this->buff .= $buff;
+  }
+   function read($n) {
+    $r = substr($this->buff, $this->pos, $n);
+    $this->pos += $n;
+    return $r;
+  }
+   function putBack($data) {
+    $this->buff = ($data . $this->buff);
+  }
+ }
+   class TestStruct {
+  static $_TSPEC;
+      public $aBool = null;
+  public $anInt = null;
+  public $aString = null;
+  public $aDouble = null;
+  public $anInt64 = null;
+  public $aList = null;
+  public $aMap = null;
+  public $aSet = null;
+  public $anByte = null;
+  public $anI16 = null;
+      public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(        -1 => array(          'var' => 'aBool',          'type' => TType::BOOL,                   ),        1 => array(          'var' => 'anInt',          'type' => TType::I32,                   ),        2 => array(          'var' => 'aString',          'type' => TType::STRING,                   ),        3 => array(          'var' => 'aDouble',          'type' => TType::DOUBLE,                   ),        4 => array(          'var' => 'anInt64',          'type' => TType::I64,                   ),        5 => array(          'var' => 'aList',          'type' => TType::LST,          'etype' => TType::DOUBLE,          'elem' => array(            'type' => TType::DOUBLE,                          ),                   ),        6 => array(          'var' => 'aMap',          'type' => TType::MAP,          'ktype' => TType::I32,          'vtype' => TType::DOUBLE,          'key' => array(            'type' => TType::I32,                         ),          'val' => array(            'type' => TType::DOUBLE,                         ),          ),       7 => array(          'var' => 'aSet',          'type' => TType::SET,          'etype' => TType::I32,          'elem' => array(            'type' => TType::I32,                          ),                  ),       8 => array(          'var' => 'anByte',          'type' => TType::BYTE,                  ),       9 => array(          'var' => 'anI16',          'type' => TType::I16,                  ),                            );
+    }
+  }
+}
+function test() {
+  $p = new DummyProtocol();
+  $v1 = new TestStruct();
+  $v1->aBool = true;
+  $v1->anInt = 1234;
+  $v1->aString = 'abcdef';
+  $v1->aDouble = 1.2345;
+  $v1->anInt64 = 8589934592;
+  $v1->aList = array(13.3, 23.4, 3576.2);
+  $v1->aMap = array(10=>1.2, 43=>5.33);
+  $v1->aSet = array(10=>true, 11=>true);
+  $v1->anByte = 123;
+  $v1->anI16 = 1234;
+  thrift_protocol_write_compact($p, 'foomethod', 1, $v1, 20);
+  $p->getTransport()->buff[1] = pack('C', 0x42);
+  var_dump(thrift_protocol_read_compact($p, 'TestStruct'));
+}
+test();
diff --git a/hphp/test/slow/thrift/namespace.php b/hphp/test/slow/thrift/namespace.php
index 0cc9a3923..d9f9ecf92 100644
--- a/hphp/test/slow/thrift/namespace.php
+++ b/hphp/test/slow/thrift/namespace.php
@@ -35,7 +35,8 @@ class DummyProtocol {
 class DummyTransport {
   public $buff = '';
   public $pos = 0;
-  function flush() { }
+  function flush() {
+ }
   function write($buff) {
     $this->buff .= $buff;
   }
diff --git a/hphp/test/slow/traits/1942.php b/hphp/test/slow/traits/1942.php
index c85362e21..57ff2ad1e 100644
--- a/hphp/test/slow/traits/1942.php
+++ b/hphp/test/slow/traits/1942.php
@@ -1,5 +1,5 @@
 <?php
 
-
-trait this_is_a_trait { }
+trait this_is_a_trait {
+ }
 ?>
diff --git a/hphp/test/slow/traits/1943.php b/hphp/test/slow/traits/1943.php
index a1aec0a54..2858625bf 100644
--- a/hphp/test/slow/traits/1943.php
+++ b/hphp/test/slow/traits/1943.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Base {
   public function sayHello() {
     echo 'Hello ';
diff --git a/hphp/test/slow/traits/1944.php b/hphp/test/slow/traits/1944.php
index 0bb59fa52..f5ed0be50 100644
--- a/hphp/test/slow/traits/1944.php
+++ b/hphp/test/slow/traits/1944.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait HelloWorld {
   public function sayHello() {
     echo "Hello World!\n";
diff --git a/hphp/test/slow/traits/1945.php b/hphp/test/slow/traits/1945.php
index 18209aff3..2a8f48066 100644
--- a/hphp/test/slow/traits/1945.php
+++ b/hphp/test/slow/traits/1945.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Hello {
   public function sayHello() {
     echo 'Hello ';
diff --git a/hphp/test/slow/traits/1946.php b/hphp/test/slow/traits/1946.php
index bf9c1a217..8ad0c93dc 100644
--- a/hphp/test/slow/traits/1946.php
+++ b/hphp/test/slow/traits/1946.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Hello {
   public function sayHello() {
     echo 'Hello ';
diff --git a/hphp/test/slow/traits/1947.php b/hphp/test/slow/traits/1947.php
index 4deb4128d..adc96d9dd 100644
--- a/hphp/test/slow/traits/1947.php
+++ b/hphp/test/slow/traits/1947.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait SayWorld {
   public function sayHelloWorld() {
     $this->sayHello();
diff --git a/hphp/test/slow/traits/1948.php b/hphp/test/slow/traits/1948.php
index 7497c214d..b0162a9f0 100644
--- a/hphp/test/slow/traits/1948.php
+++ b/hphp/test/slow/traits/1948.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait SayWorld {
   public function sayHello() {
     echo 'Hello from trait!';
diff --git a/hphp/test/slow/traits/1949.php b/hphp/test/slow/traits/1949.php
index de0bf5cf6..4f8b70a8f 100644
--- a/hphp/test/slow/traits/1949.php
+++ b/hphp/test/slow/traits/1949.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait SayWorld {
   public function sayHello() {
     echo 'Hello from trait!';
diff --git a/hphp/test/slow/traits/1950.php b/hphp/test/slow/traits/1950.php
index 383328093..5d2a93a3e 100644
--- a/hphp/test/slow/traits/1950.php
+++ b/hphp/test/slow/traits/1950.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT1 {
   public function sayHello() {
     echo 'Hello from MY_TRAIT1!';
diff --git a/hphp/test/slow/traits/1951.php b/hphp/test/slow/traits/1951.php
index eeae4518a..56dfa8940 100644
--- a/hphp/test/slow/traits/1951.php
+++ b/hphp/test/slow/traits/1951.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT1 {
   public function sayHello() {
     echo 'Hello from MY_TRAIT1!';
diff --git a/hphp/test/slow/traits/1952.php b/hphp/test/slow/traits/1952.php
index af1380453..e9139e60c 100644
--- a/hphp/test/slow/traits/1952.php
+++ b/hphp/test/slow/traits/1952.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT1 {
   public function sayHello() {
     echo "Hello from MY_TRAIT1!\n";
diff --git a/hphp/test/slow/traits/1953.php b/hphp/test/slow/traits/1953.php
index f6a25e84b..a394ed850 100644
--- a/hphp/test/slow/traits/1953.php
+++ b/hphp/test/slow/traits/1953.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT2 {
   protected function sayGoodbye() {
     echo "Goodbye from MY_TRAIT2!\n";
diff --git a/hphp/test/slow/traits/1954.php b/hphp/test/slow/traits/1954.php
index f5c2095ad..488f6c46c 100644
--- a/hphp/test/slow/traits/1954.php
+++ b/hphp/test/slow/traits/1954.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Company {
   public function getName() {
     return 'Facebook';
@@ -11,7 +10,8 @@ trait Person {
     return 'Ottoni';
   }
 }
-class Language{}
+class Language{
+}
 class English extends Language {
   use Company, Person {
     Person::getName insteadof Company;
diff --git a/hphp/test/slow/traits/1955.php b/hphp/test/slow/traits/1955.php
index d42869e01..c040c91d4 100644
--- a/hphp/test/slow/traits/1955.php
+++ b/hphp/test/slow/traits/1955.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait A {
   public function say() {
     echo "Hello\n";
diff --git a/hphp/test/slow/traits/1956.php b/hphp/test/slow/traits/1956.php
index ce0d0d061..673942263 100644
--- a/hphp/test/slow/traits/1956.php
+++ b/hphp/test/slow/traits/1956.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait English {
   public function say() {
     echo "Banana\n";
diff --git a/hphp/test/slow/traits/1957.php b/hphp/test/slow/traits/1957.php
index 440d47b59..b35701f7b 100644
--- a/hphp/test/slow/traits/1957.php
+++ b/hphp/test/slow/traits/1957.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT  {
   public function sayHello() {
     echo 'World!';
diff --git a/hphp/test/slow/traits/1958.php b/hphp/test/slow/traits/1958.php
index 0ba47be01..9270f6964 100644
--- a/hphp/test/slow/traits/1958.php
+++ b/hphp/test/slow/traits/1958.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT1 {
   public function sayHello() {
     echo "Hello from MY_TRAIT1\n";
diff --git a/hphp/test/slow/traits/1959.php b/hphp/test/slow/traits/1959.php
index e5cac742e..1ddbe8e43 100644
--- a/hphp/test/slow/traits/1959.php
+++ b/hphp/test/slow/traits/1959.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Company {
   public function getName() {
     return 'Facebook';
diff --git a/hphp/test/slow/traits/1960.php b/hphp/test/slow/traits/1960.php
index 6ac9f02d1..fee8177e1 100644
--- a/hphp/test/slow/traits/1960.php
+++ b/hphp/test/slow/traits/1960.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   function foo() {
     echo "Foo";
diff --git a/hphp/test/slow/traits/1961.php b/hphp/test/slow/traits/1961.php
index 7bcfc3839..ca8c95bb5 100644
--- a/hphp/test/slow/traits/1961.php
+++ b/hphp/test/slow/traits/1961.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait SayWorld {
   public function sayHelloWorld() {
     self::sayHello();
diff --git a/hphp/test/slow/traits/1962.php b/hphp/test/slow/traits/1962.php
index fffdade5f..eb4eea2ac 100644
--- a/hphp/test/slow/traits/1962.php
+++ b/hphp/test/slow/traits/1962.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   public static function who() {
     echo "A: " . __CLASS__;
@@ -9,7 +8,8 @@ class A {
 }
 trait T {
   public static function test() {
-    static::who(); // Here comes Late Static Bindings
+    static::who();
+ // Here comes Late Static Bindings
   }
 }
 class B extends A {
diff --git a/hphp/test/slow/traits/1963.php b/hphp/test/slow/traits/1963.php
index 93354a1be..79bb417a9 100644
--- a/hphp/test/slow/traits/1963.php
+++ b/hphp/test/slow/traits/1963.php
@@ -1,8 +1,9 @@
 <?php
 
-
 trait T1 {
-  private function Func1() { echo "Hello"; }
+  private function Func1() {
+ echo "Hello";
+ }
 }
 class C {
   use T1 {
diff --git a/hphp/test/slow/traits/1964.php b/hphp/test/slow/traits/1964.php
index 23aa8252c..3b066ba1b 100644
--- a/hphp/test/slow/traits/1964.php
+++ b/hphp/test/slow/traits/1964.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   public $y = 3;
 }
diff --git a/hphp/test/slow/traits/1965.php b/hphp/test/slow/traits/1965.php
index eaabeaa81..75663118b 100644
--- a/hphp/test/slow/traits/1965.php
+++ b/hphp/test/slow/traits/1965.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T1 {
   public $y = 3;
 }
diff --git a/hphp/test/slow/traits/1966.php b/hphp/test/slow/traits/1966.php
index 277448722..0e3a2dea2 100644
--- a/hphp/test/slow/traits/1966.php
+++ b/hphp/test/slow/traits/1966.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T1 {
   var $x = 1977;
 }
diff --git a/hphp/test/slow/traits/1967.php b/hphp/test/slow/traits/1967.php
index e2b882c60..3c09ce716 100644
--- a/hphp/test/slow/traits/1967.php
+++ b/hphp/test/slow/traits/1967.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T1 {
   public $x = 3;
 }
diff --git a/hphp/test/slow/traits/1968.php b/hphp/test/slow/traits/1968.php
index 4f16a3b62..7cd740a37 100644
--- a/hphp/test/slow/traits/1968.php
+++ b/hphp/test/slow/traits/1968.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class MY_BASE {
   static public $x = 3;
 }
diff --git a/hphp/test/slow/traits/1969.php b/hphp/test/slow/traits/1969.php
index 0cc4bafcf..eaec931fa 100644
--- a/hphp/test/slow/traits/1969.php
+++ b/hphp/test/slow/traits/1969.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT {
   static public $x = 3;
 }
diff --git a/hphp/test/slow/traits/1970.php b/hphp/test/slow/traits/1970.php
index 4f26d503f..df0cfe7e7 100644
--- a/hphp/test/slow/traits/1970.php
+++ b/hphp/test/slow/traits/1970.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class MY_BASE {
   public $x = 3;
 }
diff --git a/hphp/test/slow/traits/1971.php b/hphp/test/slow/traits/1971.php
index f537393de..8cfdfba63 100644
--- a/hphp/test/slow/traits/1971.php
+++ b/hphp/test/slow/traits/1971.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class MY_BASE {
   public $x = "123";
 }
diff --git a/hphp/test/slow/traits/1972.php b/hphp/test/slow/traits/1972.php
index be325a3b3..aa072e8f5 100644
--- a/hphp/test/slow/traits/1972.php
+++ b/hphp/test/slow/traits/1972.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT {
   public $x;
 }
diff --git a/hphp/test/slow/traits/1973.php b/hphp/test/slow/traits/1973.php
index 37145ee4d..fad5de807 100644
--- a/hphp/test/slow/traits/1973.php
+++ b/hphp/test/slow/traits/1973.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait A {
   public function smallTalk() {
     echo "a\n";
diff --git a/hphp/test/slow/traits/1974.php b/hphp/test/slow/traits/1974.php
index 2360d006b..d7945d3ab 100644
--- a/hphp/test/slow/traits/1974.php
+++ b/hphp/test/slow/traits/1974.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait A {
   function p() {
     echo "A\n";
diff --git a/hphp/test/slow/traits/1975.php b/hphp/test/slow/traits/1975.php
index fd3d5e514..dac75f3c8 100644
--- a/hphp/test/slow/traits/1975.php
+++ b/hphp/test/slow/traits/1975.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   function foo() {
     echo "Foo";
diff --git a/hphp/test/slow/traits/1976.php b/hphp/test/slow/traits/1976.php
index 6288d649d..2bf418868 100644
--- a/hphp/test/slow/traits/1976.php
+++ b/hphp/test/slow/traits/1976.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Counter {
   public function inc() {
     static $c = 0;
diff --git a/hphp/test/slow/traits/1977.php b/hphp/test/slow/traits/1977.php
index f1e85246d..beeb7d084 100644
--- a/hphp/test/slow/traits/1977.php
+++ b/hphp/test/slow/traits/1977.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   public static function F() {
     echo "Hello from static function!\n";
diff --git a/hphp/test/slow/traits/1978.php b/hphp/test/slow/traits/1978.php
index bd56449ca..d96395520 100644
--- a/hphp/test/slow/traits/1978.php
+++ b/hphp/test/slow/traits/1978.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T1 {
   static function hello() {
     echo "Hello ";
diff --git a/hphp/test/slow/traits/1979.php b/hphp/test/slow/traits/1979.php
index 4bb79096b..e6e633953 100644
--- a/hphp/test/slow/traits/1979.php
+++ b/hphp/test/slow/traits/1979.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T1 {
   static function hello() {
     echo "Hello ";
diff --git a/hphp/test/slow/traits/1980.php b/hphp/test/slow/traits/1980.php
index 3ef31cd47..be894101e 100644
--- a/hphp/test/slow/traits/1980.php
+++ b/hphp/test/slow/traits/1980.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   function foo() {
     echo "Foo";
diff --git a/hphp/test/slow/traits/1981.php b/hphp/test/slow/traits/1981.php
index 41e35853d..25e057130 100644
--- a/hphp/test/slow/traits/1981.php
+++ b/hphp/test/slow/traits/1981.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait HelloWorld {
   private function sayHello() {
     echo "Hello World!\n";
diff --git a/hphp/test/slow/traits/1982.php b/hphp/test/slow/traits/1982.php
index b58c758dc..4d61896b0 100644
--- a/hphp/test/slow/traits/1982.php
+++ b/hphp/test/slow/traits/1982.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 trait THello1 {
   public $hello = "Hello";
diff --git a/hphp/test/slow/traits/1983.php b/hphp/test/slow/traits/1983.php
index f222b8f8d..2bdb7713d 100644
--- a/hphp/test/slow/traits/1983.php
+++ b/hphp/test/slow/traits/1983.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Base {
   public function sayHello() {
     echo 'Hello ';
diff --git a/hphp/test/slow/traits/1984.php b/hphp/test/slow/traits/1984.php
index dd9d0dcd0..5c259e187 100644
--- a/hphp/test/slow/traits/1984.php
+++ b/hphp/test/slow/traits/1984.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Hello {
   public function say() {
     echo 'Hello ';
diff --git a/hphp/test/slow/traits/1985.php b/hphp/test/slow/traits/1985.php
index d8708c8cc..da1850728 100644
--- a/hphp/test/slow/traits/1985.php
+++ b/hphp/test/slow/traits/1985.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Hello {
   public function sayHello() {
     echo "Hello\n";
diff --git a/hphp/test/slow/traits/1986.php b/hphp/test/slow/traits/1986.php
index 61f123aa3..12485063c 100644
--- a/hphp/test/slow/traits/1986.php
+++ b/hphp/test/slow/traits/1986.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Hello {
   public function sayHello() {
     echo "Hello\n";
diff --git a/hphp/test/slow/traits/1987.php b/hphp/test/slow/traits/1987.php
index f90da0f0f..92f20f046 100644
--- a/hphp/test/slow/traits/1987.php
+++ b/hphp/test/slow/traits/1987.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Hello1 {
   public function sayNum() {
     echo "1\n";
diff --git a/hphp/test/slow/traits/1988.php b/hphp/test/slow/traits/1988.php
index 3a99e3e32..6b4c5e20e 100644
--- a/hphp/test/slow/traits/1988.php
+++ b/hphp/test/slow/traits/1988.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MyTrait {
   public function say_meth() {
     echo "meth: MyTrait\n";
diff --git a/hphp/test/slow/traits/1989.php b/hphp/test/slow/traits/1989.php
index 17d5abe2f..a9f049468 100644
--- a/hphp/test/slow/traits/1989.php
+++ b/hphp/test/slow/traits/1989.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait A {
   public function say() {
     echo "Hello";
diff --git a/hphp/test/slow/traits/1990.php b/hphp/test/slow/traits/1990.php
index 75968cc88..ebefecc59 100644
--- a/hphp/test/slow/traits/1990.php
+++ b/hphp/test/slow/traits/1990.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Direct {
   use TestTrait;
 }
diff --git a/hphp/test/slow/traits/1991.php b/hphp/test/slow/traits/1991.php
index 0b1297cdd..759b62ac3 100644
--- a/hphp/test/slow/traits/1991.php
+++ b/hphp/test/slow/traits/1991.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait HelloWorld {
   private function sayHello() {
     echo "Hello World 1!\n";
diff --git a/hphp/test/slow/traits/1992.php b/hphp/test/slow/traits/1992.php
index 6af201b0d..e81f7a78d 100644
--- a/hphp/test/slow/traits/1992.php
+++ b/hphp/test/slow/traits/1992.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MY_TRAIT {
   public function sayHello() {
     echo "Hello World!\n";
diff --git a/hphp/test/slow/traits/1993.php b/hphp/test/slow/traits/1993.php
index 208609ab1..c2faee2f4 100644
--- a/hphp/test/slow/traits/1993.php
+++ b/hphp/test/slow/traits/1993.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function get_declared_user_traits() {
   $ret = array();
   foreach (get_declared_traits() as $v) {
@@ -11,12 +10,16 @@ function get_declared_user_traits() {
   }
   return $ret;
 }
-class this_is_a_class { }
+class this_is_a_class {
+ }
 interface this_is_an_interface {
   public function this_is_an_interface_method();
 }
-trait this_is_a_trait { }
-abstract class this_is_an_abstract_class { }
-final class this_is_a_final_class { }
+trait this_is_a_trait {
+ }
+abstract class this_is_an_abstract_class {
+ }
+final class this_is_a_final_class {
+ }
 var_dump(get_declared_user_traits());
 ?>
diff --git a/hphp/test/slow/traits/1994.php b/hphp/test/slow/traits/1994.php
index 01576f47a..c57f53780 100644
--- a/hphp/test/slow/traits/1994.php
+++ b/hphp/test/slow/traits/1994.php
@@ -1,11 +1,12 @@
 <?php
 
-
 class this_is_a_class {
-  function class_func() {}
+  function class_func() {
+}
 }
 trait this_is_a_trait {
-  function trait_func() {}
+  function trait_func() {
+}
 }
 interface this_is_an_interface {
   function interface_func();
diff --git a/hphp/test/slow/traits/1995.php b/hphp/test/slow/traits/1995.php
index abda009cd..977e094a9 100644
--- a/hphp/test/slow/traits/1995.php
+++ b/hphp/test/slow/traits/1995.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function get_declared_user_traits() {
   $ret = array();
   foreach (get_declared_traits() as $v) {
@@ -11,10 +10,15 @@ function get_declared_user_traits() {
   }
   return $ret;
 }
-class MY_CLASS { }
-interface MY_INTERFACE { }
-trait MY_TRAIT { }
-abstract class MY_ABSTRCT_CLASS { }
-final class MY_FINAL_CLASS { }
+class MY_CLASS {
+ }
+interface MY_INTERFACE {
+ }
+trait MY_TRAIT {
+ }
+abstract class MY_ABSTRCT_CLASS {
+ }
+final class MY_FINAL_CLASS {
+ }
 var_dump(get_declared_user_traits());
 ?>
diff --git a/hphp/test/slow/traits/1996.php b/hphp/test/slow/traits/1996.php
index 79ec81155..eecc562e4 100644
--- a/hphp/test/slow/traits/1996.php
+++ b/hphp/test/slow/traits/1996.php
@@ -1,9 +1,11 @@
 <?php
 
-
-class MY_CLASS {}
-trait MY_TRAIT {}
-interface MY_INTERFACE {}
+class MY_CLASS {
+}
+trait MY_TRAIT {
+}
+interface MY_INTERFACE {
+}
 var_dump(trait_exists('MY_CLASS'));
 var_dump(trait_exists('MY_INTERFACE'));
 var_dump(trait_exists('MY_TRAIT'));
diff --git a/hphp/test/slow/traits/1997.php b/hphp/test/slow/traits/1997.php
index 170f5927b..15d5fd3c1 100644
--- a/hphp/test/slow/traits/1997.php
+++ b/hphp/test/slow/traits/1997.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Foo {
     public function Foo() {
     }
diff --git a/hphp/test/slow/traits/1998.php b/hphp/test/slow/traits/1998.php
index e4d721800..cd97167d3 100644
--- a/hphp/test/slow/traits/1998.php
+++ b/hphp/test/slow/traits/1998.php
@@ -1,10 +1,12 @@
 <?php
 
-
 trait Test {
-  public function __construct() { }
-  public function __destruct() { }
-  public function func() { }
+  public function __construct() {
+ }
+  public function __destruct() {
+ }
+  public function func() {
+ }
 }
 $rconstr = new ReflectionMethod('Test::__construct');
 $rdestr = new ReflectionMethod('Test::__destruct');
diff --git a/hphp/test/slow/traits/1999.php b/hphp/test/slow/traits/1999.php
index d6db75f2e..ec15518fc 100644
--- a/hphp/test/slow/traits/1999.php
+++ b/hphp/test/slow/traits/1999.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function get_declared_user_traits() {
   $ret = array();
   foreach (get_declared_traits() as $v) {
diff --git a/hphp/test/slow/traits/2000.php b/hphp/test/slow/traits/2000.php
index 2a1d03afb..046d3b399 100644
--- a/hphp/test/slow/traits/2000.php
+++ b/hphp/test/slow/traits/2000.php
@@ -1,8 +1,10 @@
 <?php
 
-
-trait MY_TRAIT { }
-class MY_CLASS { use MY_TRAIT; }
+trait MY_TRAIT {
+ }
+class MY_CLASS {
+ use MY_TRAIT;
+ }
 $r = new ReflectionClass('MY_CLASS');
 var_dump($r->getTraitNames());
 ?>
diff --git a/hphp/test/slow/traits/2001.php b/hphp/test/slow/traits/2001.php
index 17c9e1bdf..ee81482bb 100644
--- a/hphp/test/slow/traits/2001.php
+++ b/hphp/test/slow/traits/2001.php
@@ -1,15 +1,27 @@
 <?php
 
-
-trait T1 {}
-trait T2 {}
-trait T3 { use T2; }
-class C1 {}
-class C2 { use T1; }
-class C3 { use T1, T2; }
-class C4 { use T3; }
-class C5 extends C4 {}
-interface I1 {}
+trait T1 {
+}
+trait T2 {
+}
+trait T3 {
+ use T2;
+ }
+class C1 {
+}
+class C2 {
+ use T1;
+ }
+class C3 {
+ use T1, T2;
+ }
+class C4 {
+ use T3;
+ }
+class C5 extends C4 {
+}
+interface I1 {
+}
 echo "T1:\n";
 var_dump(class_uses('T1'));
 $rt1 = new ReflectionClass('T1');
diff --git a/hphp/test/slow/traits/2002.php b/hphp/test/slow/traits/2002.php
index 5d18553fe..d1c127e2f 100644
--- a/hphp/test/slow/traits/2002.php
+++ b/hphp/test/slow/traits/2002.php
@@ -1,12 +1,20 @@
 <?php
 
-
-trait T2 {}
-trait T3 { use T2; }
-trait T1 {}
-class C1 { }
-class C2 { use T2; }
-class C3 { use T3, T1; }
+trait T2 {
+}
+trait T3 {
+ use T2;
+ }
+trait T1 {
+}
+class C1 {
+ }
+class C2 {
+ use T2;
+ }
+class C3 {
+ use T3, T1;
+ }
 var_dump(class_uses(new C1));
 var_dump(class_uses(new C2));
 var_dump(class_uses(new C3));
diff --git a/hphp/test/slow/traits/2003.php b/hphp/test/slow/traits/2003.php
index d374b6245..91ffa8277 100644
--- a/hphp/test/slow/traits/2003.php
+++ b/hphp/test/slow/traits/2003.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Hello1 {
   public function sayNum() {
     echo "1\n";
diff --git a/hphp/test/slow/traits/2004.php b/hphp/test/slow/traits/2004.php
index 27cf8528e..4beb9239e 100644
--- a/hphp/test/slow/traits/2004.php
+++ b/hphp/test/slow/traits/2004.php
@@ -1,9 +1,18 @@
 <?php
 
-
-trait T1 { function F() {} }
-trait T2 { function F() {} }
-trait T3 { use T2 { F as G; } }
+trait T1 {
+ function F() {
+}
+ }
+trait T2 {
+ function F() {
+}
+ }
+trait T3 {
+ use T2 {
+ F as G;
+ }
+ }
 class C1 {
   use T1, T2 {
     T1::F insteadof T2;
diff --git a/hphp/test/slow/traits/2005.php b/hphp/test/slow/traits/2005.php
index 721e134bb..7a8c47d67 100644
--- a/hphp/test/slow/traits/2005.php
+++ b/hphp/test/slow/traits/2005.php
@@ -1,9 +1,11 @@
 <?php
 
-
-class C1 {}
-trait T1 {}
-interface I1 {}
+class C1 {
+}
+trait T1 {
+}
+interface I1 {
+}
 var_dump(class_implements('C1'));
 var_dump(class_parents('C1'));
 var_dump(class_uses('C1'));
diff --git a/hphp/test/slow/traits/2006.php b/hphp/test/slow/traits/2006.php
index 1649473f5..b04c821e5 100644
--- a/hphp/test/slow/traits/2006.php
+++ b/hphp/test/slow/traits/2006.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   function F(&$a, $b="default") {
     $a .= " = " . $b;
diff --git a/hphp/test/slow/traits/2007.php b/hphp/test/slow/traits/2007.php
index e01a9500c..54d3addaf 100644
--- a/hphp/test/slow/traits/2007.php
+++ b/hphp/test/slow/traits/2007.php
@@ -1,23 +1,33 @@
 <?php
 
-
 echo "*** Testing class_uses() : basic ***\n";
 
 
-trait foo { }
-class fooUser { use foo; }
+trait foo {
+ }
+class fooUser {
+ use foo;
+ }
 
-trait bar { }
-class barUser { use bar; }
+trait bar {
+ }
+class barUser {
+ use bar;
+ }
 
-class foobarUser { use foo, bar; }
+class foobarUser {
+ use foo, bar;
+ }
 
 /** There is no semantics for traits in the inheritance chain.
     Traits are flattend into a class, and that semantics is nothing
     like a type, or interface, and thus, not propergated. */
-class fooViaBarUser extends barUser { use foo; }
+class fooViaBarUser extends barUser {
+ use foo;
+ }
 
-class fooExtended extends fooUser {}
+class fooExtended extends fooUser {
+}
 
 s_var_dump(class_uses(new foobarUser));
 s_var_dump(class_uses('foobarUser'));
diff --git a/hphp/test/slow/traits/2008.php b/hphp/test/slow/traits/2008.php
index 5968ba9f3..7cdf5ceca 100644
--- a/hphp/test/slow/traits/2008.php
+++ b/hphp/test/slow/traits/2008.php
@@ -1,14 +1,16 @@
 <?php
 
+interface a {
+ }
 
+abstract class b {
+ }
 
-interface a { }
+final class c {
+ }
 
-abstract class b { }
-
-final class c { }
-
-trait d {}
+trait d {
+}
 
 var_dump(class_exists('a'));
 var_dump(class_exists('b'));
diff --git a/hphp/test/slow/traits/2009.php b/hphp/test/slow/traits/2009.php
index 2ee6274e4..703be238a 100644
--- a/hphp/test/slow/traits/2009.php
+++ b/hphp/test/slow/traits/2009.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait Hello {
diff --git a/hphp/test/slow/traits/2010.php b/hphp/test/slow/traits/2010.php
index 885d648fd..c470e58e9 100644
--- a/hphp/test/slow/traits/2010.php
+++ b/hphp/test/slow/traits/2010.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 trait Singleton {
   protected static $instances=array();
   abstract protected function __construct($config);
diff --git a/hphp/test/slow/traits/2011.php b/hphp/test/slow/traits/2011.php
index 9bed51bfa..3e0562274 100644
--- a/hphp/test/slow/traits/2011.php
+++ b/hphp/test/slow/traits/2011.php
@@ -1,8 +1,7 @@
 <?php
 
-
-
-trait foo {	
+trait foo {
+	
 	public function __construct() {
 		var_dump(__FUNCTION__);
 	}
diff --git a/hphp/test/slow/traits/2012.php b/hphp/test/slow/traits/2012.php
index ab4ec9ea2..ef4338588 100644
--- a/hphp/test/slow/traits/2012.php
+++ b/hphp/test/slow/traits/2012.php
@@ -1,8 +1,6 @@
 <?php
 
-
-
-	trait TestTrait {
+trait TestTrait {
 		public static function test() {
 			return 'Test';
 		}
diff --git a/hphp/test/slow/traits/2013.php b/hphp/test/slow/traits/2013.php
index 2a125b2fb..edd31bd87 100644
--- a/hphp/test/slow/traits/2013.php
+++ b/hphp/test/slow/traits/2013.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait Hello {
diff --git a/hphp/test/slow/traits/2014.php b/hphp/test/slow/traits/2014.php
index ec1b1c26a..94cab05ce 100644
--- a/hphp/test/slow/traits/2014.php
+++ b/hphp/test/slow/traits/2014.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait Counter {
diff --git a/hphp/test/slow/traits/2015.php b/hphp/test/slow/traits/2015.php
index 5c73ab3d9..761f5e5fb 100644
--- a/hphp/test/slow/traits/2015.php
+++ b/hphp/test/slow/traits/2015.php
@@ -1,14 +1,32 @@
 <?php
 
+trait T1 {
+ function m1() {
+ }
+ function m2() {
+ }
+ }
 
-trait T1 { function m1() { } function m2() { } }
+class C1 {
+ }
+class C2 {
+ use T1;
+ }
+class C3 {
+ use T1 {
+ m1 as a1;
+ }
+ }
+class C4 {
+ use T1 {
+ m1 as a1;
+ m2 as a2;
+ }
+ }
 
-class C1 { }
-class C2 { use T1; }
-class C3 { use T1 { m1 as a1; } }
-class C4 { use T1 { m1 as a1; m2 as a2; } }
-
-for ($c = "C1"; $c <= "C4"; $c++) {
+for ($c = "C1";
+ $c <= "C4";
+ $c++) {
     echo "class $c:\n";
     $r = new ReflectionClass($c);
     var_dump($r->getTraitAliases());
diff --git a/hphp/test/slow/traits/2016.php b/hphp/test/slow/traits/2016.php
index 98f3f00e5..02c139382 100644
--- a/hphp/test/slow/traits/2016.php
+++ b/hphp/test/slow/traits/2016.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait Hello {
diff --git a/hphp/test/slow/traits/2017.php b/hphp/test/slow/traits/2017.php
index b6c521730..62ffe9a3a 100644
--- a/hphp/test/slow/traits/2017.php
+++ b/hphp/test/slow/traits/2017.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait THello1 {
diff --git a/hphp/test/slow/traits/2018.php b/hphp/test/slow/traits/2018.php
index df7a36b35..053fdb5e1 100644
--- a/hphp/test/slow/traits/2018.php
+++ b/hphp/test/slow/traits/2018.php
@@ -1,14 +1,16 @@
 <?php
 
+interface a {
+ }
 
+abstract class b {
+ }
 
-interface a { }
+final class c {
+ }
 
-abstract class b { }
-
-final class c { }
-
-trait d {}
+trait d {
+}
 
 var_dump(trait_exists('a'));
 var_dump(trait_exists('b'));
diff --git a/hphp/test/slow/traits/2019.php b/hphp/test/slow/traits/2019.php
index e350949ab..4279b92d1 100644
--- a/hphp/test/slow/traits/2019.php
+++ b/hphp/test/slow/traits/2019.php
@@ -1,8 +1,6 @@
 <?php
 
-
-
-	trait TestTrait {
+trait TestTrait {
 		public static function test() {
 			return get_called_class();
 		}
@@ -12,7 +10,8 @@
 		use TestTrait;
 	}
 
-	class B extends A { }
+	class B extends A {
+ }
 
 	echo B::test();
 
diff --git a/hphp/test/slow/traits/2020.php b/hphp/test/slow/traits/2020.php
index eb35cf542..f5b154fb8 100644
--- a/hphp/test/slow/traits/2020.php
+++ b/hphp/test/slow/traits/2020.php
@@ -1,8 +1,7 @@
 <?php
 
-
-
-trait foo {	
+trait foo {
+	
 	public function __toString() {
 		return '123';
 	}
diff --git a/hphp/test/slow/traits/2021.php b/hphp/test/slow/traits/2021.php
index 335a8a7d2..80a913430 100644
--- a/hphp/test/slow/traits/2021.php
+++ b/hphp/test/slow/traits/2021.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait HelloWorld {
@@ -17,6 +16,7 @@ class TheWorldIsNotEnough {
 }
 
 $o = new TheWorldIsNotEnough();
-$o->sayHello(); // echos Hello Universe!
+$o->sayHello();
+ // echos Hello Universe!
 ?>
 
diff --git a/hphp/test/slow/traits/2022.php b/hphp/test/slow/traits/2022.php
index df37df015..149b6c093 100644
--- a/hphp/test/slow/traits/2022.php
+++ b/hphp/test/slow/traits/2022.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function get_declared_user_traits() {
   $ret = array();
   foreach (get_declared_traits() as $v) {
@@ -20,7 +19,8 @@ function get_declared_user_traits() {
 
 echo "*** Testing get_declared_traits() : basic functionality ***\n";
 
-trait MyTrait {}
+trait MyTrait {
+}
 
 // Zero arguments
 echo "\n-- Testing get_declared_traits() function with Zero arguments --\n";
@@ -28,7 +28,8 @@ var_dump(get_declared_user_traits());
 
 foreach (get_declared_user_traits() as $trait) {
 	if (!trait_exists($trait)) {
-		echo "Error: $trait is not a valid trait.\n"; 
+		echo "Error: $trait is not a valid trait.\n";
+
 	}
 }
 
@@ -36,11 +37,13 @@ echo "\n-- Ensure trait is listed --\n";
 var_dump(in_array('MyTrait', get_declared_user_traits()));
 
 echo "\n-- Ensure userspace interfaces are not listed --\n";
-interface I {}
+interface I {
+}
 var_dump(in_array( 'I', get_declared_user_traits()));
 
 echo "\n-- Ensure userspace classes are not listed --\n";
-class MyClass {}
+class MyClass {
+}
 var_dump(in_array( 'MyClass', get_declared_user_traits()));
 
 
diff --git a/hphp/test/slow/traits/2023.php b/hphp/test/slow/traits/2023.php
index ba246445b..f7aee09ca 100644
--- a/hphp/test/slow/traits/2023.php
+++ b/hphp/test/slow/traits/2023.php
@@ -1,8 +1,6 @@
 <?php
 
-
-
-	class MyClass {
+class MyClass {
 		static function test() {
 		  return __TRAIT__;
 		}
diff --git a/hphp/test/slow/traits/2024.php b/hphp/test/slow/traits/2024.php
index ebdca0203..6d5bf66a6 100644
--- a/hphp/test/slow/traits/2024.php
+++ b/hphp/test/slow/traits/2024.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 class Base {
diff --git a/hphp/test/slow/traits/2025.php b/hphp/test/slow/traits/2025.php
index 6ad4a96e8..849cc8891 100644
--- a/hphp/test/slow/traits/2025.php
+++ b/hphp/test/slow/traits/2025.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait THello {
diff --git a/hphp/test/slow/traits/2026.php b/hphp/test/slow/traits/2026.php
index bd986b547..d8ba2aac5 100644
--- a/hphp/test/slow/traits/2026.php
+++ b/hphp/test/slow/traits/2026.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Foo {
     public function Foo() {
     }
diff --git a/hphp/test/slow/traits/2027.php b/hphp/test/slow/traits/2027.php
index b1c460298..88c7477cb 100644
--- a/hphp/test/slow/traits/2027.php
+++ b/hphp/test/slow/traits/2027.php
@@ -1,13 +1,13 @@
 <?php
 
-
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
  * Description: Checks if the trait exists 
  * Source code: Zend/zend_builtin_functions.c
  * Alias to functions: 
  */
 
-trait caseSensitivityTest {}
+trait caseSensitivityTest {
+}
 var_dump(trait_exists('casesensitivitytest'));
 
 echo "Done"
diff --git a/hphp/test/slow/traits/2028.php b/hphp/test/slow/traits/2028.php
index 76a7eace8..2f5300169 100644
--- a/hphp/test/slow/traits/2028.php
+++ b/hphp/test/slow/traits/2028.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 abstract class Base {
diff --git a/hphp/test/slow/traits/2029.php b/hphp/test/slow/traits/2029.php
index c5e78fde3..ca6c4f87d 100644
--- a/hphp/test/slow/traits/2029.php
+++ b/hphp/test/slow/traits/2029.php
@@ -1,8 +1,6 @@
 <?php
 
-
-
-	trait TestTrait {
+trait TestTrait {
 		public static function test() {
 			return 'Test';
 		}
diff --git a/hphp/test/slow/traits/2030.php b/hphp/test/slow/traits/2030.php
index 9211c8959..0bea7dacf 100644
--- a/hphp/test/slow/traits/2030.php
+++ b/hphp/test/slow/traits/2030.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 trait ATrait {
   public static function get_class_name() {
     return __CLASS__;
diff --git a/hphp/test/slow/traits/2031.php b/hphp/test/slow/traits/2031.php
index 9bfb8600b..7122bf36c 100644
--- a/hphp/test/slow/traits/2031.php
+++ b/hphp/test/slow/traits/2031.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait Hello {
diff --git a/hphp/test/slow/traits/2032.php b/hphp/test/slow/traits/2032.php
index 7fe074e1c..b1e965840 100644
--- a/hphp/test/slow/traits/2032.php
+++ b/hphp/test/slow/traits/2032.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait Hello {
diff --git a/hphp/test/slow/traits/2033.php b/hphp/test/slow/traits/2033.php
index a25aeab16..d9f3b5b44 100644
--- a/hphp/test/slow/traits/2033.php
+++ b/hphp/test/slow/traits/2033.php
@@ -1,8 +1,6 @@
 <?php
 
-
-
-	trait TestTrait {
+trait TestTrait {
 		public static function test() {
 			return static::$test;
 		}
diff --git a/hphp/test/slow/traits/2034.php b/hphp/test/slow/traits/2034.php
index f5fa5585e..5227f949d 100644
--- a/hphp/test/slow/traits/2034.php
+++ b/hphp/test/slow/traits/2034.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
  * Description: Checks if the trait exists 
  * Source code: Zend/zend_builtin_functions.c
@@ -13,7 +12,8 @@ function __autoload($traitName) {
 	echo "In __autoload($traitName)\n";
 }
 
-trait MyTrait {}
+trait MyTrait {
+}
 
 echo "Calling trait_exists() on non-existent trait with autoload explicitly enabled:\n";
 var_dump( trait_exists('C', true) );
diff --git a/hphp/test/slow/traits/2035.php b/hphp/test/slow/traits/2035.php
index 698552acf..be9525481 100644
--- a/hphp/test/slow/traits/2035.php
+++ b/hphp/test/slow/traits/2035.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 trait TestTrait {
 	public static function test() {
 		return __TRAIT__;
diff --git a/hphp/test/slow/traits/2036.php b/hphp/test/slow/traits/2036.php
index 81fcc56b1..4d59f063f 100644
--- a/hphp/test/slow/traits/2036.php
+++ b/hphp/test/slow/traits/2036.php
@@ -1,8 +1,6 @@
 <?php
 
-
-
-	trait TestTrait {
+trait TestTrait {
 		public static function test() {
 			return 'Forwarded '.forward_static_call(array('A', 'test'));
 		}
diff --git a/hphp/test/slow/traits/2037.php b/hphp/test/slow/traits/2037.php
index 37adec0f8..23cb61a45 100644
--- a/hphp/test/slow/traits/2037.php
+++ b/hphp/test/slow/traits/2037.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 trait foo {
 	public function abc() {
 	}
diff --git a/hphp/test/slow/traits/2038.php b/hphp/test/slow/traits/2038.php
index 1d0c6fd23..85a0726e3 100644
--- a/hphp/test/slow/traits/2038.php
+++ b/hphp/test/slow/traits/2038.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait Counter {
diff --git a/hphp/test/slow/traits/2039.php b/hphp/test/slow/traits/2039.php
index b75863588..5558c25d6 100644
--- a/hphp/test/slow/traits/2039.php
+++ b/hphp/test/slow/traits/2039.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 trait foo {
 	public function serialize() {
 		return 'foobar';
diff --git a/hphp/test/slow/traits/2040.php b/hphp/test/slow/traits/2040.php
index 594ea3e9a..63f9e0f4d 100644
--- a/hphp/test/slow/traits/2040.php
+++ b/hphp/test/slow/traits/2040.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait A {
@@ -23,7 +22,8 @@ trait B {
 
 class Talker {
     use A, B {
-		B::smallTalk insteadof A; 
+		B::smallTalk insteadof A;
+
 		A::bigTalk insteadof B;
 		B::bigTalk as talk;
 	}
diff --git a/hphp/test/slow/traits/2041.php b/hphp/test/slow/traits/2041.php
index f5fa1bb8a..90596f942 100644
--- a/hphp/test/slow/traits/2041.php
+++ b/hphp/test/slow/traits/2041.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait HelloWorld {
@@ -25,6 +24,7 @@ class TheWorldIsNotEnough {
 }
 
 $o = new TheWorldIsNotEnough();
-$o->sayHello(); // echos Hello Universe!
+$o->sayHello();
+ // echos Hello Universe!
 ?>
 
diff --git a/hphp/test/slow/traits/2042.php b/hphp/test/slow/traits/2042.php
index 6ba976f28..0b1ea62a9 100644
--- a/hphp/test/slow/traits/2042.php
+++ b/hphp/test/slow/traits/2042.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function get_declared_user_traits() {
   $ret = array();
   foreach (get_declared_traits() as $v) {
@@ -12,11 +11,16 @@ function get_declared_user_traits() {
   return $ret;
 }
 
-class a { }
-interface b { }
-trait c { }
-abstract class d { }
-final class e { }
+class a {
+ }
+interface b {
+ }
+trait c {
+ }
+abstract class d {
+ }
+final class e {
+ }
 
 var_dump(get_declared_user_traits());
 
diff --git a/hphp/test/slow/traits/2043.php b/hphp/test/slow/traits/2043.php
index 0501081e9..c8531ffd3 100644
--- a/hphp/test/slow/traits/2043.php
+++ b/hphp/test/slow/traits/2043.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 abstract class foo {
 }
 
diff --git a/hphp/test/slow/traits/2044.php b/hphp/test/slow/traits/2044.php
index 95830f228..7e3a7e67a 100644
--- a/hphp/test/slow/traits/2044.php
+++ b/hphp/test/slow/traits/2044.php
@@ -1,10 +1,12 @@
 <?php
 
-
-
 trait A {
-   protected static function foo() { echo "abc\n"; }
-   private static function bar() { echo "def\n"; }
+   protected static function foo() {
+ echo "abc\n";
+ }
+   private static function bar() {
+ echo "def\n";
+ }
 }
 
 
diff --git a/hphp/test/slow/traits/2045.php b/hphp/test/slow/traits/2045.php
index 8eaeb86ba..0a2f13adb 100644
--- a/hphp/test/slow/traits/2045.php
+++ b/hphp/test/slow/traits/2045.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /* Prototype  : array class_uses(mixed what [, bool autoload ])
  * Description: Return all traits used by a class
  * Source code: ext/spl/php_spl.c
@@ -10,8 +9,11 @@
 echo "*** Testing class_uses() : basic ***\n";
 
 
-trait foo { }
-class bar { use foo; }
+trait foo {
+ }
+class bar {
+ use foo;
+ }
 
 var_dump(class_uses(new bar));
 var_dump(class_uses('bar'));
diff --git a/hphp/test/slow/traits/2046.php b/hphp/test/slow/traits/2046.php
index c603b0d99..803d156d3 100644
--- a/hphp/test/slow/traits/2046.php
+++ b/hphp/test/slow/traits/2046.php
@@ -1,8 +1,6 @@
 <?php
 
-
-
-	trait TestTrait {
+trait TestTrait {
 		public static function __callStatic($name, $arguments) {
 			return $name;
 		}
diff --git a/hphp/test/slow/traits/2047.php b/hphp/test/slow/traits/2047.php
index 7d547555b..bed56a3a6 100644
--- a/hphp/test/slow/traits/2047.php
+++ b/hphp/test/slow/traits/2047.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 class Base {
diff --git a/hphp/test/slow/traits/2048.php b/hphp/test/slow/traits/2048.php
index d4492eedb..6a3534175 100644
--- a/hphp/test/slow/traits/2048.php
+++ b/hphp/test/slow/traits/2048.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait A {
@@ -23,7 +22,8 @@ trait C {
 
 class Foo {
     use C, A, B {
-		B::foo insteadof A, C; 
+		B::foo insteadof A, C;
+
 	}
 }
 
diff --git a/hphp/test/slow/traits/2049.php b/hphp/test/slow/traits/2049.php
index db5118157..bd94e0cb3 100644
--- a/hphp/test/slow/traits/2049.php
+++ b/hphp/test/slow/traits/2049.php
@@ -1,6 +1,5 @@
 <?php
 
-
 error_reporting(E_ALL);
 
 trait T1 {
diff --git a/hphp/test/slow/traits/2050.php b/hphp/test/slow/traits/2050.php
index da0d10a0b..cc1913ee9 100644
--- a/hphp/test/slow/traits/2050.php
+++ b/hphp/test/slow/traits/2050.php
@@ -1,14 +1,21 @@
 <?php
 
-
 trait T {
   static function foo() {
-    echo "I'm in class " . get_class() . "\n";  }
+    echo "I'm in class " . get_class() . "\n";
+  }
 }
-class C { use T; }
-class D extends C {}
-trait T2 { use T; }
-trait T3 { use T2; }
+class C {
+ use T;
+ }
+class D extends C {
+}
+trait T2 {
+ use T;
+ }
+trait T3 {
+ use T2;
+ }
 $x = new D();
 $x->foo();
 C::foo();
@@ -16,4 +23,4 @@ D::foo();
 T::foo();
 T2::foo();
 T3::foo();
-?>
\ No newline at end of file
+?>
diff --git a/hphp/test/slow/traits/2051.php b/hphp/test/slow/traits/2051.php
index 7f52fe2c5..0ae88eeee 100644
--- a/hphp/test/slow/traits/2051.php
+++ b/hphp/test/slow/traits/2051.php
@@ -1,7 +1,7 @@
 <?php
 
-
-class Base {}
+class Base {
+}
 trait T {
   public function sayClass() {
     echo get_class() . "\n";
@@ -10,9 +10,13 @@ trait T {
     echo get_parent_class();
   }
 }
-class Cls extends Base { use T; }
+class Cls extends Base {
+ use T;
+ }
 $o = new Cls();
-$o->sayClass();  // echo Cls
-$o->sayParent(); // echos Base
+$o->sayClass();
+  // echo Cls
+$o->sayParent();
+ // echos Base
 ?>
 
diff --git a/hphp/test/slow/traits/2052.php b/hphp/test/slow/traits/2052.php
index 6a2a45a89..7e1ce87d0 100644
--- a/hphp/test/slow/traits/2052.php
+++ b/hphp/test/slow/traits/2052.php
@@ -1,12 +1,17 @@
 <?php
 
-
 trait T {
   public static $x=1;
-  public function printX() { var_dump(self::$x); }
+  public function printX() {
+ var_dump(self::$x);
+ }
 }
-class C1 { use T; }
-class C2 { use T; }
+class C1 {
+ use T;
+ }
+class C2 {
+ use T;
+ }
 $o1 = new C1;
 $o2 = new C2;
 var_dump(T::$x);
diff --git a/hphp/test/slow/traits/2053.php b/hphp/test/slow/traits/2053.php
index c51838ccb..5e5bf1a35 100644
--- a/hphp/test/slow/traits/2053.php
+++ b/hphp/test/slow/traits/2053.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait MyTrait {
   public static function callNew() {
     new self("called via SELF");
diff --git a/hphp/test/slow/traits/2054.php b/hphp/test/slow/traits/2054.php
index 4ba9396f3..a089691cb 100644
--- a/hphp/test/slow/traits/2054.php
+++ b/hphp/test/slow/traits/2054.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait my_trait {
   abstract function foo();
   public function bar() {
diff --git a/hphp/test/slow/traits/2055.php b/hphp/test/slow/traits/2055.php
index 7b7ad8ba7..92d36e382 100644
--- a/hphp/test/slow/traits/2055.php
+++ b/hphp/test/slow/traits/2055.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T1 {
   public function inc($who) {
     static $x=0;
@@ -8,9 +7,14 @@ trait T1 {
     echo $who . " (" . __class__ . "): " . $x . "\n";
   }
 }
-class B { use T1; }
-class C { use T1; }
-class D extends C {}
+class B {
+ use T1;
+ }
+class C {
+ use T1;
+ }
+class D extends C {
+}
 $c1 = new C;
 $c2 = new C;
 $d1 = new D;
diff --git a/hphp/test/slow/traits/2056.php b/hphp/test/slow/traits/2056.php
index 1b6449cfc..43e74eebd 100644
--- a/hphp/test/slow/traits/2056.php
+++ b/hphp/test/slow/traits/2056.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   abstract public function bar();
   public function foo() {
diff --git a/hphp/test/slow/traits/2057.php b/hphp/test/slow/traits/2057.php
index 7f6ad7bbe..841d0fdeb 100644
--- a/hphp/test/slow/traits/2057.php
+++ b/hphp/test/slow/traits/2057.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 trait T1 {
   abstract function bar();
   public function foo() {
diff --git a/hphp/test/slow/traits/2058.php b/hphp/test/slow/traits/2058.php
index 127e1824b..6b91b52e1 100644
--- a/hphp/test/slow/traits/2058.php
+++ b/hphp/test/slow/traits/2058.php
@@ -1,4 +1,23 @@
 <?php
 
-
-error_reporting(E_ALL | E_STRICT);trait T {  protected function f() {    return 1;  }  private function p() {    return 2;  }  function g() {    return $this->f();  }  function h() {    return $this->p();  }}class C {  use T;}$c = new C;echo $c->g();echo $c->h();
\ No newline at end of file
+error_reporting(E_ALL | E_STRICT);
+trait T {
+  protected function f() {
+    return 1;
+  }
+  private function p() {
+    return 2;
+  }
+  function g() {
+    return $this->f();
+  }
+  function h() {
+    return $this->p();
+  }
+}
+class C {
+  use T;
+}
+$c = new C;
+echo $c->g();
+echo $c->h();
diff --git a/hphp/test/slow/traits/2059.php b/hphp/test/slow/traits/2059.php
index c0a63e53e..24e24503a 100644
--- a/hphp/test/slow/traits/2059.php
+++ b/hphp/test/slow/traits/2059.php
@@ -1,4 +1,54 @@
 <?php
 
-
-trait A {  function test() {    static $x;    return ++$x;  }  function test8($a, $b, $c, $d, $e, $f, $g, $h) {    static $x;    return ++$x;  }}trait X {  use A;}trait Y {  use A;}class T {  use X, Y {    X::test insteadof Y;    X::test as test1;    Y::test as test2;    X::test8 insteadof Y;    X::test8 as test81;    Y::test8 as test82;  }}var_dump(T::test());var_dump(T::test1());var_dump(T::test2());var_dump(call_user_func("T::test"));var_dump(call_user_func("T::test1"));var_dump(call_user_func("T::test2"));$obj = new T;var_dump($obj->test());var_dump($obj->test1());var_dump($obj->test2());var_dump(call_user_func(array($obj, "test")));var_dump(call_user_func(array($obj, "test1")));var_dump(call_user_func(array($obj, "test2")));var_dump(T::test8(1, 2, 3, 4, 5, 6, 7, 8));var_dump(T::test81(1, 2, 3, 4, 5, 6, 7, 8));var_dump(T::test82(1, 2, 3, 4, 5, 6, 7, 8));var_dump(call_user_func("T::test8", 1, 2, 3, 4, 5, 6, 7, 8));var_dump(call_user_func("T::test81", 1, 2, 3, 4, 5, 6, 7, 8));var_dump(call_user_func("T::test82", 1, 2, 3, 4, 5, 6, 7, 8));$obj = new T;var_dump($obj->test8(1, 2, 3, 4, 5, 6, 7, 8));var_dump($obj->test81(1, 2, 3, 4, 5, 6, 7, 8));var_dump($obj->test82(1, 2, 3, 4, 5, 6, 7, 8));var_dump(call_user_func(array($obj, "test8"), 1, 2, 3, 4, 5, 6, 7, 8));var_dump(call_user_func(array($obj, "test81"), 1, 2, 3, 4, 5, 6, 7, 8));var_dump(call_user_func(array($obj, "test82"), 1, 2, 3, 4, 5, 6, 7, 8));
\ No newline at end of file
+trait A {
+  function test() {
+    static $x;
+    return ++$x;
+  }
+  function test8($a, $b, $c, $d, $e, $f, $g, $h) {
+    static $x;
+    return ++$x;
+  }
+}
+trait X {
+  use A;
+}
+trait Y {
+  use A;
+}
+class T {
+  use X, Y {
+    X::test insteadof Y;
+    X::test as test1;
+    Y::test as test2;
+    X::test8 insteadof Y;
+    X::test8 as test81;
+    Y::test8 as test82;
+  }
+}
+var_dump(T::test());
+var_dump(T::test1());
+var_dump(T::test2());
+var_dump(call_user_func("T::test"));
+var_dump(call_user_func("T::test1"));
+var_dump(call_user_func("T::test2"));
+$obj = new T;
+var_dump($obj->test());
+var_dump($obj->test1());
+var_dump($obj->test2());
+var_dump(call_user_func(array($obj, "test")));
+var_dump(call_user_func(array($obj, "test1")));
+var_dump(call_user_func(array($obj, "test2")));
+var_dump(T::test8(1, 2, 3, 4, 5, 6, 7, 8));
+var_dump(T::test81(1, 2, 3, 4, 5, 6, 7, 8));
+var_dump(T::test82(1, 2, 3, 4, 5, 6, 7, 8));
+var_dump(call_user_func("T::test8", 1, 2, 3, 4, 5, 6, 7, 8));
+var_dump(call_user_func("T::test81", 1, 2, 3, 4, 5, 6, 7, 8));
+var_dump(call_user_func("T::test82", 1, 2, 3, 4, 5, 6, 7, 8));
+$obj = new T;
+var_dump($obj->test8(1, 2, 3, 4, 5, 6, 7, 8));
+var_dump($obj->test81(1, 2, 3, 4, 5, 6, 7, 8));
+var_dump($obj->test82(1, 2, 3, 4, 5, 6, 7, 8));
+var_dump(call_user_func(array($obj, "test8"), 1, 2, 3, 4, 5, 6, 7, 8));
+var_dump(call_user_func(array($obj, "test81"), 1, 2, 3, 4, 5, 6, 7, 8));
+var_dump(call_user_func(array($obj, "test82"), 1, 2, 3, 4, 5, 6, 7, 8));
diff --git a/hphp/test/slow/traits/2060.php b/hphp/test/slow/traits/2060.php
index f7ba0efb9..a2f0fdae2 100644
--- a/hphp/test/slow/traits/2060.php
+++ b/hphp/test/slow/traits/2060.php
@@ -1,3 +1,21 @@
 <?php
 
- define('MUST_PREPARE', 0);function must_prepare($x) {  if ($x == MUST_PREPARE) {     $x = 2;  }  return $x;}trait EntWithViewerComments {  public $entCanComment = 1;  public function canViewerComment() {    var_dump($this->entCanComment);    var_dump(must_prepare($this->entCanComment));  }}class EntShare {  use EntWithViewerComments;}$obj1 = new EntShare;$obj1->canViewerComment();
\ No newline at end of file
+define('MUST_PREPARE', 0);
+function must_prepare($x) {
+  if ($x == MUST_PREPARE) {
+     $x = 2;
+  }
+  return $x;
+}
+trait EntWithViewerComments {
+  public $entCanComment = 1;
+  public function canViewerComment() {
+    var_dump($this->entCanComment);
+    var_dump(must_prepare($this->entCanComment));
+  }
+}
+class EntShare {
+  use EntWithViewerComments;
+}
+$obj1 = new EntShare;
+$obj1->canViewerComment();
diff --git a/hphp/test/slow/traits/2061.php b/hphp/test/slow/traits/2061.php
index dd78a2821..907d39caf 100644
--- a/hphp/test/slow/traits/2061.php
+++ b/hphp/test/slow/traits/2061.php
@@ -1,4 +1,46 @@
 <?php
 
-
-trait T {  private $x = 'init from T';  function useT() { $this->x = 'set from trait'; } }class A {  function useA() { $this->x = 'set from A'; }}class B extends A {  use T;  function useB() { $this->x = 'set from B'; }}class C extends B {  function useC() { $this->x = 'set from C'; }}class D extends C {  function useD() { $this->x = 'set from D'; }}$x = new D(); echo serialize($x), "\n";$x = new D(); $x->useT(); echo serialize($x), "\n";$x = new D(); $x->useA(); echo serialize($x), "\n";$x = new D(); $x->useB(); echo serialize($x), "\n";$x = new D(); $x->useC(); echo serialize($x), "\n";$x = new D(); $x->useD(); echo serialize($x), "\n";
\ No newline at end of file
+trait T {
+  private $x = 'init from T';
+  function useT() {
+ $this->x = 'set from trait';
+ }
+ }
+class A {
+  function useA() {
+ $this->x = 'set from A';
+ }
+}
+class B extends A {
+  use T;
+  function useB() {
+ $this->x = 'set from B';
+ }
+}
+class C extends B {
+  function useC() {
+ $this->x = 'set from C';
+ }
+}
+class D extends C {
+  function useD() {
+ $this->x = 'set from D';
+ }
+}
+$x = new D();
+ echo serialize($x), "\n";
+$x = new D();
+ $x->useT();
+ echo serialize($x), "\n";
+$x = new D();
+ $x->useA();
+ echo serialize($x), "\n";
+$x = new D();
+ $x->useB();
+ echo serialize($x), "\n";
+$x = new D();
+ $x->useC();
+ echo serialize($x), "\n";
+$x = new D();
+ $x->useD();
+ echo serialize($x), "\n";
diff --git a/hphp/test/slow/traits/2062.php b/hphp/test/slow/traits/2062.php
index b347fbfc6..10369a5ee 100644
--- a/hphp/test/slow/traits/2062.php
+++ b/hphp/test/slow/traits/2062.php
@@ -1,9 +1,14 @@
 <?php
 
-
-trait T1 { public $xT1 = 'xT1'; }
-trait T2 { public $xT2 = 'xT2'; }
-trait T3 { public $xT3 = 'xT3'; }
+trait T1 {
+ public $xT1 = 'xT1';
+ }
+trait T2 {
+ public $xT2 = 'xT2';
+ }
+trait T3 {
+ public $xT3 = 'xT3';
+ }
 class B {
   use T1;
   public $xB = 'xB';
diff --git a/hphp/test/slow/traits/2063.php b/hphp/test/slow/traits/2063.php
index 9709ff7be..9f9bfc55d 100644
--- a/hphp/test/slow/traits/2063.php
+++ b/hphp/test/slow/traits/2063.php
@@ -1,4 +1,24 @@
 <?php
 
-
-trait T { private $x = 0;}class X { use T; function x() { return ++$this->x; } }class Y extends X { use T; function y() { return ++$this->x; } }class Z extends Y { function z() { return ++$this->x; } }$a = new Z();echo join(" ", array($a->x(), $a->x(), $a->y(), $a->y(), $a->z(), $a->z())), "\n";
\ No newline at end of file
+trait T {
+ private $x = 0;
+}
+class X {
+ use T;
+ function x() {
+ return ++$this->x;
+ }
+ }
+class Y extends X {
+ use T;
+ function y() {
+ return ++$this->x;
+ }
+ }
+class Z extends Y {
+ function z() {
+ return ++$this->x;
+ }
+ }
+$a = new Z();
+echo join(" ", array($a->x(), $a->x(), $a->y(), $a->y(), $a->z(), $a->z())), "\n";
diff --git a/hphp/test/slow/traits/2064.php b/hphp/test/slow/traits/2064.php
index 44a760f87..4c1cbd5e3 100644
--- a/hphp/test/slow/traits/2064.php
+++ b/hphp/test/slow/traits/2064.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   public function goo() {
     return get_called_class();
@@ -9,6 +8,8 @@ trait T {
      return self::goo();
   }
 }
-class A { use T; }
+class A {
+ use T;
+ }
 var_dump(A::goo());
 var_dump(A::foo());
diff --git a/hphp/test/slow/traits/2065.php b/hphp/test/slow/traits/2065.php
index 803026f71..9f6dfbccd 100644
--- a/hphp/test/slow/traits/2065.php
+++ b/hphp/test/slow/traits/2065.php
@@ -1,4 +1,28 @@
 <?php
 
-
-trait TraitFoo {  public function getStringThroughProtectedMethod() {    return $this->protectedMethod();  }  protected function protectedMethod() {    return 'fallback protected method';  }  public function getStringThroughPrivateMethod() {    return $this->privateMethod();  }  private function privateMethod() {    return 'fallback private method';  }}class A {  use TraitFoo;  protected function protectedMethod() {    return 'in a protectedMethod';  }  private function privateMethod() {    return 'in a privateMethod';  }}$a = new A();echo $a->getStringThroughProtectedMethod()."\n";echo $a->getStringThroughPrivateMethod()."\n";
\ No newline at end of file
+trait TraitFoo {
+  public function getStringThroughProtectedMethod() {
+    return $this->protectedMethod();
+  }
+  protected function protectedMethod() {
+    return 'fallback protected method';
+  }
+  public function getStringThroughPrivateMethod() {
+    return $this->privateMethod();
+  }
+  private function privateMethod() {
+    return 'fallback private method';
+  }
+}
+class A {
+  use TraitFoo;
+  protected function protectedMethod() {
+    return 'in a protectedMethod';
+  }
+  private function privateMethod() {
+    return 'in a privateMethod';
+  }
+}
+$a = new A();
+echo $a->getStringThroughProtectedMethod()."\n";
+echo $a->getStringThroughPrivateMethod()."\n";
diff --git a/hphp/test/slow/traits/2066.php b/hphp/test/slow/traits/2066.php
index 518c982f7..47b09d5cf 100644
--- a/hphp/test/slow/traits/2066.php
+++ b/hphp/test/slow/traits/2066.php
@@ -1,14 +1,17 @@
 <?php
 
-
 trait T {
   function fruit() {
     yield 'apple';
     yield 'banana';
   }
 }
-class C1 { use T; }
-class C2 { use T; }
+class C1 {
+ use T;
+ }
+class C2 {
+ use T;
+ }
 $o = new C1;
 foreach ($o->fruit() as $fruit) {
   var_dump($fruit);
diff --git a/hphp/test/slow/traits/2067.php b/hphp/test/slow/traits/2067.php
index 9b5f12b83..083376052 100644
--- a/hphp/test/slow/traits/2067.php
+++ b/hphp/test/slow/traits/2067.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T1 {
   function fruit() {
     yield 'apple';
diff --git a/hphp/test/slow/traits/2068.php b/hphp/test/slow/traits/2068.php
index fb57a6a9e..54cfdddd1 100644
--- a/hphp/test/slow/traits/2068.php
+++ b/hphp/test/slow/traits/2068.php
@@ -1,4 +1,15 @@
 <?php
 
- trait T { function fruit() { yield 'apple'; yield 'banana';} }class F { use T; }
-foreach (F::fruit() as $fruit) { var_dump($fruit);} 
\ No newline at end of file
+trait T {
+ function fruit() {
+ yield 'apple';
+ yield 'banana';
+}
+ }
+class F {
+ use T;
+ }
+foreach (F::fruit() as $fruit) {
+ var_dump($fruit);
+}
+
diff --git a/hphp/test/slow/traits/2069.php b/hphp/test/slow/traits/2069.php
index 8821babf8..6904d0121 100644
--- a/hphp/test/slow/traits/2069.php
+++ b/hphp/test/slow/traits/2069.php
@@ -1,20 +1,24 @@
 <?php
 
-
 trait T {
   public function doIt() {
     throw new Exception('foobar');
   }
 }
-class X { use T; }
+class X {
+ use T;
+ }
 function f($obj) {
   $res = null;
   try {
     $res = $obj->doIt();
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     $res = $e->getMessage();
   }
   yield $res;
 }
 $x = new X;
-foreach (f($x) as $i) { var_dump($i); }
+foreach (f($x) as $i) {
+ var_dump($i);
+ }
diff --git a/hphp/test/slow/traits/2070.php b/hphp/test/slow/traits/2070.php
index 4cabe26c9..df6d27c16 100644
--- a/hphp/test/slow/traits/2070.php
+++ b/hphp/test/slow/traits/2070.php
@@ -1,12 +1,15 @@
 <?php
 
-
 trait T {
   function foo($t) {
     $$t = 5;
     yield $this;
   }
 }
-class X { use T; }
+class X {
+ use T;
+ }
 $x = new X;
-foreach ($x->foo('this') as $v) { var_dump($v); }
+foreach ($x->foo('this') as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/traits/2071.php b/hphp/test/slow/traits/2071.php
index a38546acc..612807b52 100644
--- a/hphp/test/slow/traits/2071.php
+++ b/hphp/test/slow/traits/2071.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x) {
   yield $x;
 }
@@ -8,14 +7,21 @@ $c = f(32);
 var_dump($c->getOrigFuncName());
 var_dump($c->getCalledClass());
 trait T {
-  function f($x) { yield get_called_class(); }
+  function f($x) {
+ yield get_called_class();
+ }
 }
-class X { use T; }
+class X {
+ use T;
+ }
 $x = new X;
 $c = $x->f(32);
 var_dump($c->getOrigFuncName());
 var_dump($c->getCalledClass());
-$fcn = function ($x) { yield $x; };
+$fcn = function ($x) {
+ yield $x;
+ }
+;
 $c = $fcn(32);
 var_dump($c->getOrigFuncName());
 var_dump($c->getCalledClass());
diff --git a/hphp/test/slow/traits/2072.php b/hphp/test/slow/traits/2072.php
index 525eeb059..55888ab31 100644
--- a/hphp/test/slow/traits/2072.php
+++ b/hphp/test/slow/traits/2072.php
@@ -1,4 +1,17 @@
 <?php
 
- trait T {  public static function gen() {    static $x;    yield ++$x;    yield 2;    yield ++$x;  }}class X { use T; }
-class Y extends X {}$g = X::gen();foreach ($g as $i) var_dump($i);
\ No newline at end of file
+trait T {
+  public static function gen() {
+    static $x;
+    yield ++$x;
+    yield 2;
+    yield ++$x;
+  }
+}
+class X {
+ use T;
+ }
+class Y extends X {
+}
+$g = X::gen();
+foreach ($g as $i) var_dump($i);
diff --git a/hphp/test/slow/traits/2073.php b/hphp/test/slow/traits/2073.php
index 004499445..a48182bfd 100644
--- a/hphp/test/slow/traits/2073.php
+++ b/hphp/test/slow/traits/2073.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   function info() {
     yield __METHOD__;
@@ -8,8 +7,12 @@ trait T {
     yield __TRAIT__;
   }
 }
-class C1 { use T; }
-class C2 { use T; }
+class C1 {
+ use T;
+ }
+class C2 {
+ use T;
+ }
 $o1 = new C1;
 foreach ($o1->info() as $info) {
   var_dump($info);
diff --git a/hphp/test/slow/traits/2074.php b/hphp/test/slow/traits/2074.php
index 9792cf276..b459abd48 100644
--- a/hphp/test/slow/traits/2074.php
+++ b/hphp/test/slow/traits/2074.php
@@ -1,13 +1,20 @@
 <?php
 
-
 trait T {
   function f() {
-    $a = function() { yield 1; yield 2; };
+    $a = function() {
+ yield 1;
+ yield 2;
+ }
+;
     return $a;
   }
 }
-class A { use T; }
+class A {
+ use T;
+ }
 $a = new A;
 $f = $a->f();
-foreach ($f() as $v) { var_dump($v); }
+foreach ($f() as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/traits/2075.php b/hphp/test/slow/traits/2075.php
index a74b5fafc..352578832 100644
--- a/hphp/test/slow/traits/2075.php
+++ b/hphp/test/slow/traits/2075.php
@@ -1,4 +1,23 @@
 <?php
 
-
-trait T {  public function foo() {    $this->bar(function() {yield 1; yield 2; yield 3;});  }  public function bar(Closure $c) {    $a = $c();    foreach ($a as $b) {      echo $b."\n";    }  }}class A { use T; }$a = new A();$a->foo();
\ No newline at end of file
+trait T {
+  public function foo() {
+    $this->bar(function() {
+yield 1;
+ yield 2;
+ yield 3;
+}
+);
+  }
+  public function bar(Closure $c) {
+    $a = $c();
+    foreach ($a as $b) {
+      echo $b."\n";
+    }
+  }
+}
+class A {
+ use T;
+ }
+$a = new A();
+$a->foo();
diff --git a/hphp/test/slow/traits/2076.php b/hphp/test/slow/traits/2076.php
index 874b3411d..a89717742 100644
--- a/hphp/test/slow/traits/2076.php
+++ b/hphp/test/slow/traits/2076.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait U {
   public function test() {
     echo __CLASS__ . "\n";
@@ -16,4 +15,5 @@ class D {
 }
 $obj = new D;
 $x = $obj->test();
-foreach ($x as $v) {}
+foreach ($x as $v) {
+}
diff --git a/hphp/test/slow/traits/2077.php b/hphp/test/slow/traits/2077.php
index 5fb10680e..13afb9618 100644
--- a/hphp/test/slow/traits/2077.php
+++ b/hphp/test/slow/traits/2077.php
@@ -1,3 +1,12 @@
 <?php
 
-trait baz  {  public function bar() { yield 1; }}class foo {  use baz;  public function bar() {}}
\ No newline at end of file
+trait baz  {
+  public function bar() {
+ yield 1;
+ }
+}
+class foo {
+  use baz;
+  public function bar() {
+}
+}
diff --git a/hphp/test/slow/traits/2078.php b/hphp/test/slow/traits/2078.php
index 91828c8f9..459f4f7fa 100644
--- a/hphp/test/slow/traits/2078.php
+++ b/hphp/test/slow/traits/2078.php
@@ -1,16 +1,24 @@
 <?php
 
-
 trait T {
-  public function m() { echo "original
-"; }
+  public function m() {
+ echo "original
+";
+ }
 }
-class A { use T; }
-class B { use T; }
+class A {
+ use T;
+ }
+class B {
+ use T;
+ }
 $a1 = new A;
 $a1->m();
-fb_intercept("A::m", function() { echo "new
-"; });
+fb_intercept("A::m", function() {
+ echo "new
+";
+ }
+);
 $a2 = new A;
 $a2->m();
 $b1 = new B;
diff --git a/hphp/test/slow/traits/2079.php b/hphp/test/slow/traits/2079.php
index 6d7e2faf5..f240d394d 100644
--- a/hphp/test/slow/traits/2079.php
+++ b/hphp/test/slow/traits/2079.php
@@ -1,17 +1,25 @@
 <?php
 
-
 trait T {
-  public function m() { echo "original
-"; }
+  public function m() {
+ echo "original
+";
+ }
 }
-class A { use T; }
-class B { use T; }
+class A {
+ use T;
+ }
+class B {
+ use T;
+ }
 T::m();
 $a1 = new A;
 $a1->m();
-fb_intercept("T::m", function() { echo "new
-"; });
+fb_intercept("T::m", function() {
+ echo "new
+";
+ }
+);
 $a2 = new A;
 $a2->m();
 $b1 = new B;
diff --git a/hphp/test/slow/traits/2080.php b/hphp/test/slow/traits/2080.php
index 8c462c86d..0fc20b509 100644
--- a/hphp/test/slow/traits/2080.php
+++ b/hphp/test/slow/traits/2080.php
@@ -1,3 +1,12 @@
 <?php
 
- trait T1 { function foo() { yield 1; } }class C { use T1 { T1::foo as static; } }
\ No newline at end of file
+trait T1 {
+ function foo() {
+ yield 1;
+ }
+ }
+class C {
+ use T1 {
+ T1::foo as static;
+ }
+ }
diff --git a/hphp/test/slow/traits/2080.php.expectf b/hphp/test/slow/traits/2080.php.expectf
index 78c1ffddb..e15d24478 100644
--- a/hphp/test/slow/traits/2080.php.expectf
+++ b/hphp/test/slow/traits/2080.php.expectf
@@ -1 +1 @@
-HipHop Fatal error: cannot use 'static' as access modifier in %s/hphp/test/slow/traits/2080.php on line 3
+HipHop Fatal error: cannot use 'static' as access modifier in %s/hphp/test/slow/traits/2080.php on line 8
diff --git a/hphp/test/slow/traits/2081.php b/hphp/test/slow/traits/2081.php
index f78a18213..afae7ab93 100644
--- a/hphp/test/slow/traits/2081.php
+++ b/hphp/test/slow/traits/2081.php
@@ -1,3 +1,19 @@
 <?php
 
-trait T1 { function foo() { yield 1; } }trait T2 {  use T1 {    foo as bar;  }  function foo() { return bar(); }}class C { use T2; }foreach (C::bar() as $x) var_dump($x);
\ No newline at end of file
+trait T1 {
+ function foo() {
+ yield 1;
+ }
+ }
+trait T2 {
+  use T1 {
+    foo as bar;
+  }
+  function foo() {
+ return bar();
+ }
+}
+class C {
+ use T2;
+ }
+foreach (C::bar() as $x) var_dump($x);
diff --git a/hphp/test/slow/traits/2082.php b/hphp/test/slow/traits/2082.php
index 44bd2a0c6..1c5274e6b 100644
--- a/hphp/test/slow/traits/2082.php
+++ b/hphp/test/slow/traits/2082.php
@@ -1,15 +1,17 @@
 <?php
 
-
 trait Too {
   function bar() {
     $abc = 123;
     $a = function ($abc) use ($abc) {
       var_dump($abc);
-    };
+    }
+;
     return $a;
   }
 }
-class Foo { use Too; }
+class Foo {
+ use Too;
+ }
 $a = Foo::bar();
 $a(456);
diff --git a/hphp/test/slow/traits/2083.php b/hphp/test/slow/traits/2083.php
index ad7a7d060..21a626eab 100644
--- a/hphp/test/slow/traits/2083.php
+++ b/hphp/test/slow/traits/2083.php
@@ -1,15 +1,17 @@
 <?php
 
-
 trait Too {
   function bar() {
     $abc = 123;
     $a = function ($abc) use ($abc, $abc) {
       var_dump($abc);
-    };
+    }
+;
     return $a;
   }
 }
-class Foo { use Too; }
+class Foo {
+ use Too;
+ }
 $a = Foo::bar();
 $a(456);
diff --git a/hphp/test/slow/traits/2084.php b/hphp/test/slow/traits/2084.php
index e4e80a023..979c81989 100644
--- a/hphp/test/slow/traits/2084.php
+++ b/hphp/test/slow/traits/2084.php
@@ -1,15 +1,17 @@
 <?php
 
-
 trait Too {
   function bar() {
     $abc = 123;
     $a = function ($abc) use (&$abc, &$abc) {
       var_dump($abc);
-    };
+    }
+;
     return $a;
   }
 }
-class Foo { use Too; }
+class Foo {
+ use Too;
+ }
 $a = Foo::bar();
 $a(456);
diff --git a/hphp/test/slow/traits/2085.php b/hphp/test/slow/traits/2085.php
index bd77e6e6f..ba5b49542 100644
--- a/hphp/test/slow/traits/2085.php
+++ b/hphp/test/slow/traits/2085.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Too {
   function bar() {
     $abc = 123;
@@ -8,7 +7,8 @@ trait Too {
       $n = func_num_args();
       $args = func_get_args();
       var_dump($n, $args);
-    };
+    }
+;
     return $a;
   }
 
@@ -17,6 +17,8 @@ trait Too {
     $obj(789);
   }
 }
-class Foo { use Too; }
+class Foo {
+ use Too;
+ }
 $a = Foo::bar();
 Foo::baz($a);
diff --git a/hphp/test/slow/traits/2086.php b/hphp/test/slow/traits/2086.php
index c8c36555b..2be209139 100644
--- a/hphp/test/slow/traits/2086.php
+++ b/hphp/test/slow/traits/2086.php
@@ -1,11 +1,15 @@
 <?php
 
-
 trait Too {
   function bar() {
-    $a = function () { var_dump(__CLASS__, __FUNCTION__);};
+    $a = function () {
+ var_dump(__CLASS__, __FUNCTION__);
+}
+;
     $a();
   }
 }
-class Foo { use Too; }
+class Foo {
+ use Too;
+ }
 Foo::bar();
diff --git a/hphp/test/slow/traits/2087.php b/hphp/test/slow/traits/2087.php
index 137cf02b9..8b2e606e4 100644
--- a/hphp/test/slow/traits/2087.php
+++ b/hphp/test/slow/traits/2087.php
@@ -1,5 +1,24 @@
 <?php
 
-
-trait T {  public function foo() {    $values = array(1, 2, 3);    $values = array_map(function($p) use ($this) {      return $this->goo($p);    }, $values);    var_dump($values);  }  public function bar() { return $this; }  public function goo($p) { return $p; }}class A { use T;}
-$obj = new A;var_dump($obj->bar());$obj->foo();
\ No newline at end of file
+trait T {
+  public function foo() {
+    $values = array(1, 2, 3);
+    $values = array_map(function($p) use ($this) {
+      return $this->goo($p);
+    }
+, $values);
+    var_dump($values);
+  }
+  public function bar() {
+ return $this;
+ }
+  public function goo($p) {
+ return $p;
+ }
+}
+class A {
+ use T;
+}
+$obj = new A;
+var_dump($obj->bar());
+$obj->foo();
diff --git a/hphp/test/slow/traits/2088.php b/hphp/test/slow/traits/2088.php
index c45aaacb0..53575183f 100644
--- a/hphp/test/slow/traits/2088.php
+++ b/hphp/test/slow/traits/2088.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait Too {
   function gen() {
     $abc = $this->input();
@@ -8,21 +7,34 @@ trait Too {
       var_dump($arg);
       var_dump($abc);
       return $this->output();
-    };
+    }
+;
     return $a;
   }
-  function input() { return 1; }
-  function output() { return 2; }
+  function input() {
+ return 1;
+ }
+  function output() {
+ return 2;
+ }
 }
 class Foo {
   use Too;
-  function input() { return "str1"; }
-  function output() { return "str2"; }
+  function input() {
+ return "str1";
+ }
+  function output() {
+ return "str2";
+ }
 }
 class Goo {
   use Too;
-  function input() { return false; }
-  function output() { return true; }
+  function input() {
+ return false;
+ }
+  function output() {
+ return true;
+ }
 }
 $of = new Foo;
 $f = $of->gen();
diff --git a/hphp/test/slow/traits/2089.php b/hphp/test/slow/traits/2089.php
index d2c42ea05..e2554ff48 100644
--- a/hphp/test/slow/traits/2089.php
+++ b/hphp/test/slow/traits/2089.php
@@ -1,8 +1,11 @@
 <?php
 
-
 define('INIT1', 123);
-trait t1 { public $x = INIT1; }
-class c { use t1; }
+trait t1 {
+ public $x = INIT1;
+ }
+class c {
+ use t1;
+ }
 $obj = new c;
 var_dump($obj->x);
diff --git a/hphp/test/slow/traits/2090.php b/hphp/test/slow/traits/2090.php
index 258700b83..b78164823 100644
--- a/hphp/test/slow/traits/2090.php
+++ b/hphp/test/slow/traits/2090.php
@@ -1,12 +1,19 @@
 <?php
 
-
 define('INIT1', "1");
 define('INIT2', "2");
-trait t1 { public $x = INIT1; }
-trait t2 { public $y = INIT2; }
-trait t { use t1, t2; }
-class c { use t; }
+trait t1 {
+ public $x = INIT1;
+ }
+trait t2 {
+ public $y = INIT2;
+ }
+trait t {
+ use t1, t2;
+ }
+class c {
+ use t;
+ }
 $obj = new c;
 var_dump($obj->x);
 var_dump($obj->y);
diff --git a/hphp/test/slow/traits/2091.php b/hphp/test/slow/traits/2091.php
index ac5c42126..dc480a8e1 100644
--- a/hphp/test/slow/traits/2091.php
+++ b/hphp/test/slow/traits/2091.php
@@ -1,8 +1,11 @@
 <?php
 
-
 define('INIT1', 123);
-trait t1 {}
-class c { use t1; public $x = INIT1; }
+trait t1 {
+}
+class c {
+ use t1;
+ public $x = INIT1;
+ }
 $obj = new c;
 var_dump($obj->x);
diff --git a/hphp/test/slow/traits/2092.php b/hphp/test/slow/traits/2092.php
index c80598403..9613ceeed 100644
--- a/hphp/test/slow/traits/2092.php
+++ b/hphp/test/slow/traits/2092.php
@@ -1,10 +1,14 @@
 <?php
 
-
 define('INIT1', 123);
 define('INIT2', 456);
-trait t1 { public $x = INIT1; }
-class c { use t1; public $y = INIT2; }
+trait t1 {
+ public $x = INIT1;
+ }
+class c {
+ use t1;
+ public $y = INIT2;
+ }
 $obj = new c;
 var_dump($obj->x);
 var_dump($obj->y);
diff --git a/hphp/test/slow/traits/2093.php b/hphp/test/slow/traits/2093.php
index 272840556..b5945b290 100644
--- a/hphp/test/slow/traits/2093.php
+++ b/hphp/test/slow/traits/2093.php
@@ -1,9 +1,14 @@
 <?php
 
-
 define('INIT1', 123);
-trait t2 { public $x = INIT1; }
-trait t1 { use t2; }
-class c { use t1; }
+trait t2 {
+ public $x = INIT1;
+ }
+trait t1 {
+ use t2;
+ }
+class c {
+ use t1;
+ }
 $obj = new c;
 var_dump($obj->x);
diff --git a/hphp/test/slow/traits/2094.php b/hphp/test/slow/traits/2094.php
index 4d5732153..2e7dec593 100644
--- a/hphp/test/slow/traits/2094.php
+++ b/hphp/test/slow/traits/2094.php
@@ -1,11 +1,17 @@
 <?php
 
-
 define('INIT1', 123);
 define('INIT2', 456);
-trait t2 { public $y = INIT2; }
-trait t1 { use t2; public $x = INIT1; }
-class c { use t1; }
+trait t2 {
+ public $y = INIT2;
+ }
+trait t1 {
+ use t2;
+ public $x = INIT1;
+ }
+class c {
+ use t1;
+ }
 $obj = new c;
 var_dump($obj->x);
 var_dump($obj->y);
diff --git a/hphp/test/slow/traits/2095.php b/hphp/test/slow/traits/2095.php
index 309e58e78..6cb05240a 100644
--- a/hphp/test/slow/traits/2095.php
+++ b/hphp/test/slow/traits/2095.php
@@ -1,7 +1,10 @@
 <?php
 
-
 define('INIT1', 123);
-trait t1 { static public $x = INIT1; }
-class c { use t1; }
+trait t1 {
+ static public $x = INIT1;
+ }
+class c {
+ use t1;
+ }
 var_dump(c::$x);
diff --git a/hphp/test/slow/traits/2096.php b/hphp/test/slow/traits/2096.php
index 9e411edea..2c31b51c5 100644
--- a/hphp/test/slow/traits/2096.php
+++ b/hphp/test/slow/traits/2096.php
@@ -1,9 +1,12 @@
 <?php
 
-
 define('INIT1', 123);
-trait t1 { static public $x = INIT1; }
-class c {  use t1; }
+trait t1 {
+ static public $x = INIT1;
+ }
+class c {
+  use t1;
+ }
 var_dump(c::$x++);
 var_dump(t1::$x++);
 var_dump(c::$x++);
diff --git a/hphp/test/slow/traits/2097.php b/hphp/test/slow/traits/2097.php
index 1aeebcb29..c8ea38e14 100644
--- a/hphp/test/slow/traits/2097.php
+++ b/hphp/test/slow/traits/2097.php
@@ -1,11 +1,18 @@
 <?php
 
-
 define('INIT1', "1");
 define('INIT2', "2");
-trait t1 { static public $x = INIT1; }
-trait t2 { static public $y = INIT2; }
-trait t { use t1, t2; }
-class c { use t; }
+trait t1 {
+ static public $x = INIT1;
+ }
+trait t2 {
+ static public $y = INIT2;
+ }
+trait t {
+ use t1, t2;
+ }
+class c {
+ use t;
+ }
 var_dump(c::$x);
 var_dump(c::$y);
diff --git a/hphp/test/slow/traits/2098.php b/hphp/test/slow/traits/2098.php
index 59ac44cb5..548e2cf04 100644
--- a/hphp/test/slow/traits/2098.php
+++ b/hphp/test/slow/traits/2098.php
@@ -1,7 +1,10 @@
 <?php
 
-
 define('INIT1', 123);
-trait t1 {}
-class c { use t1; static public $x = INIT1; }
+trait t1 {
+}
+class c {
+ use t1;
+ static public $x = INIT1;
+ }
 var_dump(c::$x);
diff --git a/hphp/test/slow/traits/2099.php b/hphp/test/slow/traits/2099.php
index c3aabaa10..7840757bd 100644
--- a/hphp/test/slow/traits/2099.php
+++ b/hphp/test/slow/traits/2099.php
@@ -1,9 +1,13 @@
 <?php
 
-
 define('INIT1', 123);
 define('INIT2', 456);
-trait t1 { static public $x = INIT1; }
-class c { use t1; static public $y = INIT2; }
+trait t1 {
+ static public $x = INIT1;
+ }
+class c {
+ use t1;
+ static public $y = INIT2;
+ }
 var_dump(c::$x);
 var_dump(c::$y);
diff --git a/hphp/test/slow/traits/2100.php b/hphp/test/slow/traits/2100.php
index 4cf5e7754..426aa80fb 100644
--- a/hphp/test/slow/traits/2100.php
+++ b/hphp/test/slow/traits/2100.php
@@ -1,8 +1,13 @@
 <?php
 
-
 define('INIT1', 123);
-trait t2 { static public $x = INIT1; }
-trait t1 { use t2; }
-class c { use t1; }
+trait t2 {
+ static public $x = INIT1;
+ }
+trait t1 {
+ use t2;
+ }
+class c {
+ use t1;
+ }
 var_dump(c::$x);
diff --git a/hphp/test/slow/traits/2101.php b/hphp/test/slow/traits/2101.php
index 9dc44edc5..e66e1975c 100644
--- a/hphp/test/slow/traits/2101.php
+++ b/hphp/test/slow/traits/2101.php
@@ -1,10 +1,16 @@
 <?php
 
-
 define('INIT1', 123);
 define('INIT2', 456);
-trait t2 { static public $y = INIT2; }
-trait t1 { use t2; static public $x = INIT1; }
-class c { use t1; }
+trait t2 {
+ static public $y = INIT2;
+ }
+trait t1 {
+ use t2;
+ static public $x = INIT1;
+ }
+class c {
+ use t1;
+ }
 var_dump(c::$x);
 var_dump(c::$y);
diff --git a/hphp/test/slow/traits/2102.php b/hphp/test/slow/traits/2102.php
index 4a1b2bf32..25e8ff36f 100644
--- a/hphp/test/slow/traits/2102.php
+++ b/hphp/test/slow/traits/2102.php
@@ -1,9 +1,16 @@
 <?
 define('INIT1', 1000);
-trait t { static public $x = INIT1; }
-class c { use t; }
-class d { use t; }
-class e extends d {}
+trait t {
+ static public $x = INIT1;
+ }
+class c {
+ use t;
+ }
+class d {
+ use t;
+ }
+class e extends d {
+}
 var_dump(t::$x++);
 var_dump(c::$x++);
 var_dump(d::$x++);
diff --git a/hphp/test/slow/traits/2103.php b/hphp/test/slow/traits/2103.php
index a923d6789..4d70efb81 100644
--- a/hphp/test/slow/traits/2103.php
+++ b/hphp/test/slow/traits/2103.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait TraitFoo {
   public function testDoSomethingInTrait() {
     return call_user_func(array($this, 'doSomethingInTrait'));
diff --git a/hphp/test/slow/traits/2104.php b/hphp/test/slow/traits/2104.php
index 8380afe94..983fa2360 100644
--- a/hphp/test/slow/traits/2104.php
+++ b/hphp/test/slow/traits/2104.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
    public $x=1;
    function dump_vars() {
diff --git a/hphp/test/slow/traits/2105.php b/hphp/test/slow/traits/2105.php
index c7bf85d3a..a9acfd7af 100644
--- a/hphp/test/slow/traits/2105.php
+++ b/hphp/test/slow/traits/2105.php
@@ -1,4 +1,17 @@
 <?php
 
-
-trait T {  public function foo() {  $this->bar();  }  private function bar() {    echo "in bar...\n";  }}class B { use T; }class C extends B { }$obj = new C;$obj->foo();
\ No newline at end of file
+trait T {
+  public function foo() {
+  $this->bar();
+  }
+  private function bar() {
+    echo "in bar...\n";
+  }
+}
+class B {
+ use T;
+ }
+class C extends B {
+ }
+$obj = new C;
+$obj->foo();
diff --git a/hphp/test/slow/traits/2106.php b/hphp/test/slow/traits/2106.php
index ec5031853..51a4527f4 100644
--- a/hphp/test/slow/traits/2106.php
+++ b/hphp/test/slow/traits/2106.php
@@ -1,4 +1,21 @@
 <?php
 
-
-trait PrivateState {  private $foo = 2;  public function getFoo() {    return $this->foo;  }}class Base {  public static function create() {    return new static();  }}class UsePrivateState extends Base {  use PrivateState;}class DerivedUsePrivateState extends UsePrivateState {}$state = new DerivedUsePrivateState();$method = new ReflectionMethod('DerivedUsePrivateState', 'getFoo');echo $method->invoke($state)."\n";
\ No newline at end of file
+trait PrivateState {
+  private $foo = 2;
+  public function getFoo() {
+    return $this->foo;
+  }
+}
+class Base {
+  public static function create() {
+    return new static();
+  }
+}
+class UsePrivateState extends Base {
+  use PrivateState;
+}
+class DerivedUsePrivateState extends UsePrivateState {
+}
+$state = new DerivedUsePrivateState();
+$method = new ReflectionMethod('DerivedUsePrivateState', 'getFoo');
+echo $method->invoke($state)."\n";
diff --git a/hphp/test/slow/traits/2107.php b/hphp/test/slow/traits/2107.php
index 7c0e2df5d..b6b824037 100644
--- a/hphp/test/slow/traits/2107.php
+++ b/hphp/test/slow/traits/2107.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   public static function foo() {
     $bt = debug_backtrace();
diff --git a/hphp/test/slow/traits/2108.php b/hphp/test/slow/traits/2108.php
index 10ae42145..8b1867aeb 100644
--- a/hphp/test/slow/traits/2108.php
+++ b/hphp/test/slow/traits/2108.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   abstract public function foo($x);
 }
@@ -11,7 +10,9 @@ abstract class B implements I {
   use T;
 }
 class C extends B {
-  public function foo($x){ echo "$x \n";}
+  public function foo($x){
+ echo "$x \n";
+}
 }
 $obj = new C;
 $obj->foo(1);
diff --git a/hphp/test/slow/traits/2109.php b/hphp/test/slow/traits/2109.php
index 950284b5d..b602d93e5 100644
--- a/hphp/test/slow/traits/2109.php
+++ b/hphp/test/slow/traits/2109.php
@@ -1,4 +1,22 @@
 <?php
 
-
-trait T {  public function init() {    parent::init();  }}class A {  public function init() {    echo 'A::init';  }}class B extends A {  use T;}class C extends B {  public function init() {    parent::init();  }}$obj = new C;$obj->init();
\ No newline at end of file
+trait T {
+  public function init() {
+    parent::init();
+  }
+}
+class A {
+  public function init() {
+    echo 'A::init';
+  }
+}
+class B extends A {
+  use T;
+}
+class C extends B {
+  public function init() {
+    parent::init();
+  }
+}
+$obj = new C;
+$obj->init();
diff --git a/hphp/test/slow/traits/2110.php b/hphp/test/slow/traits/2110.php
index ead517079..4c1969fec 100644
--- a/hphp/test/slow/traits/2110.php
+++ b/hphp/test/slow/traits/2110.php
@@ -1,15 +1,17 @@
 <?php
 
-
 trait T {
-  private function foo() {}
+  private function foo() {
+}
 }
 class C {
-  protected function foo() {}
+  protected function foo() {
+}
 }
 class D extends C {
   use T;
-  protected function foo() {}
+  protected function foo() {
+}
 }
 class E extends C {
   public static function test($obj) {
diff --git a/hphp/test/slow/traits/2111.php b/hphp/test/slow/traits/2111.php
index 4842a501e..cb4201966 100644
--- a/hphp/test/slow/traits/2111.php
+++ b/hphp/test/slow/traits/2111.php
@@ -1,11 +1,14 @@
 <?php
 
-
 class C {
-  protected function foo() { echo "C::foo\n"; }
+  protected function foo() {
+ echo "C::foo\n";
+ }
 }
 trait T {
-  protected function foo() { echo "T::foo\n"; }
+  protected function foo() {
+ echo "T::foo\n";
+ }
 }
 class D extends C {
   use T;
diff --git a/hphp/test/slow/traits/2112.php b/hphp/test/slow/traits/2112.php
index 48e5e836d..84c23658f 100644
--- a/hphp/test/slow/traits/2112.php
+++ b/hphp/test/slow/traits/2112.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   private static function blarg() {
     echo "T::blarg\n";
diff --git a/hphp/test/slow/traits/2113.php b/hphp/test/slow/traits/2113.php
index 947c53c7e..d66268d87 100644
--- a/hphp/test/slow/traits/2113.php
+++ b/hphp/test/slow/traits/2113.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   final public function foo() {
     return 'Bar';
diff --git a/hphp/test/slow/traits/2114.php b/hphp/test/slow/traits/2114.php
index 5c88f0a42..d347f2fbe 100644
--- a/hphp/test/slow/traits/2114.php
+++ b/hphp/test/slow/traits/2114.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Foo {
   protected function f() {
     return 'Foo';
diff --git a/hphp/test/slow/traits/2115.php b/hphp/test/slow/traits/2115.php
index 124d9b63e..f35566154 100644
--- a/hphp/test/slow/traits/2115.php
+++ b/hphp/test/slow/traits/2115.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Foo {
   private function f() {
     return 'Foo';
diff --git a/hphp/test/slow/traits/2116.php b/hphp/test/slow/traits/2116.php
index 6e0aeb031..43e12cc71 100644
--- a/hphp/test/slow/traits/2116.php
+++ b/hphp/test/slow/traits/2116.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Foo {
   private function f() {
     return 'Foo';
diff --git a/hphp/test/slow/traits/2117.php b/hphp/test/slow/traits/2117.php
index 5b86f8ef3..0299afec0 100644
--- a/hphp/test/slow/traits/2117.php
+++ b/hphp/test/slow/traits/2117.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Foo {
   protected function f() {
     return 'Foo';
diff --git a/hphp/test/slow/traits/2118.php b/hphp/test/slow/traits/2118.php
index d1a475861..edf259dc1 100644
--- a/hphp/test/slow/traits/2118.php
+++ b/hphp/test/slow/traits/2118.php
@@ -1,6 +1,5 @@
 <?php
 
-
 trait T {
   abstract static function f();
 }
diff --git a/hphp/test/slow/traits/2119.php b/hphp/test/slow/traits/2119.php
index 378611860..ba11866fc 100644
--- a/hphp/test/slow/traits/2119.php
+++ b/hphp/test/slow/traits/2119.php
@@ -1,17 +1,22 @@
 <?php
 
-
 trait T {
-  function hello() { echo "Hello from T!
-"; }
+  function hello() {
+ echo "Hello from T!
+";
+ }
 }
 class B {
   use T;
-  function hello() { echo "Hello from B!
-"; }
+  function hello() {
+ echo "Hello from B!
+";
+ }
+}
+class C extends B {
+}
+class D extends C {
 }
-class C extends B {}
-class D extends C {}
 $ob = new B();
 $ob->hello();
 $oc = new C();
diff --git a/hphp/test/slow/traits/2120.php b/hphp/test/slow/traits/2120.php
index c4f47d9f9..1dc43aeb2 100644
--- a/hphp/test/slow/traits/2120.php
+++ b/hphp/test/slow/traits/2120.php
@@ -1,10 +1,15 @@
 <?php
 
-
-trait T1 { abstract function foo(); }
-trait T2 { abstract function foo(); }
+trait T1 {
+ abstract function foo();
+ }
+trait T2 {
+ abstract function foo();
+ }
 class B {
-  function foo() { return "hello\n"; }
+  function foo() {
+ return "hello\n";
+ }
 }
 class C extends B {
   use T1, T2;
diff --git a/hphp/test/slow/traits/2121.php b/hphp/test/slow/traits/2121.php
index 762d699c7..30388f5e5 100644
--- a/hphp/test/slow/traits/2121.php
+++ b/hphp/test/slow/traits/2121.php
@@ -1,13 +1,18 @@
 <?php
 
-
-trait T1 { abstract function foo(); }
-trait T2 { abstract function foo(); }
+trait T1 {
+ abstract function foo();
+ }
+trait T2 {
+ abstract function foo();
+ }
 abstract class B {
   use T1, T2;
 }
 class C extends B {
-  function foo() { return "hello\n"; }
+  function foo() {
+ return "hello\n";
+ }
 }
 $o = new C;
 echo $o->foo();
diff --git a/hphp/test/slow/traits/2122.php b/hphp/test/slow/traits/2122.php
index 2ffbc232f..59f13f895 100644
--- a/hphp/test/slow/traits/2122.php
+++ b/hphp/test/slow/traits/2122.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   static public $bp = "hello\n";
 }
@@ -9,6 +8,8 @@ trait T {
     echo A::$bp;
   }
 }
-class C { use T; }
+class C {
+ use T;
+ }
 $o = new C;
 $o->foo();
diff --git a/hphp/test/slow/traits/2123.php b/hphp/test/slow/traits/2123.php
index 415ad7046..17d4b9acc 100644
--- a/hphp/test/slow/traits/2123.php
+++ b/hphp/test/slow/traits/2123.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class B {
   static public $bp = "B::hello\n";
 }
diff --git a/hphp/test/slow/traits/2124.php b/hphp/test/slow/traits/2124.php
index ab38bd66f..7f3c8468e 100644
--- a/hphp/test/slow/traits/2124.php
+++ b/hphp/test/slow/traits/2124.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class B {
   static public $bp = "B::hello\n";
 }
diff --git a/hphp/test/slow/traits/2125.php b/hphp/test/slow/traits/2125.php
index 2d278a1fb..f5c1ffede 100644
--- a/hphp/test/slow/traits/2125.php
+++ b/hphp/test/slow/traits/2125.php
@@ -1,3 +1,23 @@
 <?php
 
- class A {  function foo() { var_dump('fail'); }  function bar() { $this->foo(); }}trait BT {  function foo() { var_dump('ok'); }}class B extends A {  use BT;}function test() {  $b = new B;  $b->bar();}test();
\ No newline at end of file
+class A {
+  function foo() {
+ var_dump('fail');
+ }
+  function bar() {
+ $this->foo();
+ }
+}
+trait BT {
+  function foo() {
+ var_dump('ok');
+ }
+}
+class B extends A {
+  use BT;
+}
+function test() {
+  $b = new B;
+  $b->bar();
+}
+test();
diff --git a/hphp/test/slow/traits/2126.php b/hphp/test/slow/traits/2126.php
index 7fda94446..c268ff675 100644
--- a/hphp/test/slow/traits/2126.php
+++ b/hphp/test/slow/traits/2126.php
@@ -1,9 +1,15 @@
 <?php
 
-
-trait T { public function y() {} }
-interface I { public function y();}
-class C { use T ; }
+trait T {
+ public function y() {
+}
+ }
+interface I {
+ public function y();
+}
+class C {
+ use T ;
+ }
 var_dump(method_exists('T', 'y'));
 var_dump(method_exists('C', 'y'));
 var_dump(method_exists('I', 'y'));
diff --git a/hphp/test/slow/traits/2127.php b/hphp/test/slow/traits/2127.php
index 2939ac8ab..982619b37 100644
--- a/hphp/test/slow/traits/2127.php
+++ b/hphp/test/slow/traits/2127.php
@@ -1,8 +1,13 @@
 <?php
 
-
 if (true) {
-  trait T { public static function foo() { echo "Foo\n"; } }
-  class C { use T; }
+  trait T {
+ public static function foo() {
+ echo "Foo\n";
+ }
+ }
+  class C {
+ use T;
+ }
 }
 C::foo();
diff --git a/hphp/test/slow/traits/2128.php b/hphp/test/slow/traits/2128.php
index 7df52a146..1b08b60d7 100644
--- a/hphp/test/slow/traits/2128.php
+++ b/hphp/test/slow/traits/2128.php
@@ -1,6 +1,5 @@
 <?php
 
-
 final class Foo {
   use Bar;
   private static $a = 3;
diff --git a/hphp/test/slow/traits/2129.php b/hphp/test/slow/traits/2129.php
index 860e15277..163f39d99 100644
--- a/hphp/test/slow/traits/2129.php
+++ b/hphp/test/slow/traits/2129.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function show_without_extra_vardump_nonsense($arr) {
   echo 'array (' . count($arr) . ") {\n";
   foreach ($arr as $val) {
@@ -34,21 +33,29 @@ trait T {
   protected static $prot_st;
   public static $pub_st;
 
-  private function fpriv() {}
-  protected function fprot() {}
-  public function fpub() {}
+  private function fpriv() {
+}
+  protected function fprot() {
+}
+  public function fpub() {
+}
 
-  private static function fpriv_st() {}
-  protected static function fprot_st() {}
-  public static function fpub_st() {}
+  private static function fpriv_st() {
+}
+  protected static function fprot_st() {
+}
+  public static function fpub_st() {
+}
 }
 
 trait U {
   public $foo;
   public static $static;
 
-  public function ffoo() {}
-  public static function fstatic() {}
+  public function ffoo() {
+}
+  public static function fstatic() {
+}
 }
 
 class C {
@@ -61,7 +68,8 @@ class D extends C {
   use U;
 
   public $class_prop;
-  public function class_method() {}
+  public function class_method() {
+}
 
 }
 
diff --git a/hphp/test/slow/traits/sys_trait.php b/hphp/test/slow/traits/sys_trait.php
index 5f63a4824..d4267acac 100644
--- a/hphp/test/slow/traits/sys_trait.php
+++ b/hphp/test/slow/traits/sys_trait.php
@@ -1,5 +1,8 @@
 <?php
-class X { use IterableTrait; }
+
+class X {
+ use IterableTrait;
+ }
 function test() {
   $x = new X;
   var_dump($x->view());
diff --git a/hphp/test/slow/type_assertions/1853.php b/hphp/test/slow/type_assertions/1853.php
index 055a9729a..50698d042 100644
--- a/hphp/test/slow/type_assertions/1853.php
+++ b/hphp/test/slow/type_assertions/1853.php
@@ -1,14 +1,17 @@
 <?php
 
-
-function g(&$x) { var_dump($x); }
+function g(&$x) {
+ var_dump($x);
+ }
 function f($x) {
-  if (is_array($x)) { 
+  if (is_array($x)) {
+
     var_dump($x);
     var_dump($x[0]);
     var_dump($x[0][1]);
   }
-  if (is_array($x) && $x) { 
+  if (is_array($x) && $x) {
+
     g($x);
     g($x[0]);
     g($x[0][1]);
diff --git a/hphp/test/slow/type_assertions/1854.php b/hphp/test/slow/type_assertions/1854.php
index 94a1a71f7..84a68a5b8 100644
--- a/hphp/test/slow/type_assertions/1854.php
+++ b/hphp/test/slow/type_assertions/1854.php
@@ -1,10 +1,15 @@
 <?php
 
-
 function f($x) {
-  if (is_array($x) && isset($x[0])) { var_dump($x[0]); }
-  else if (is_string($x) && $x && $x[0]) { var_dump($x[0]); }
-  else if (is_integer($x)) { var_dump($x); }
+  if (is_array($x) && isset($x[0])) {
+ var_dump($x[0]);
+ }
+  else if (is_string($x) && $x && $x[0]) {
+ var_dump($x[0]);
+ }
+  else if (is_integer($x)) {
+ var_dump($x);
+ }
 }
 f(array(32));
 f('foobar');
diff --git a/hphp/test/slow/type_assertions/1855.php b/hphp/test/slow/type_assertions/1855.php
index e25ca25b9..d0ba5a37e 100644
--- a/hphp/test/slow/type_assertions/1855.php
+++ b/hphp/test/slow/type_assertions/1855.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x) {
   $r = is_array($x) ? $x[0] : false;
   var_dump($r);
diff --git a/hphp/test/slow/type_assertions/1856.php b/hphp/test/slow/type_assertions/1856.php
index 0be363714..bb86f267f 100644
--- a/hphp/test/slow/type_assertions/1856.php
+++ b/hphp/test/slow/type_assertions/1856.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class X {
   public $x = 'foo';
 }
diff --git a/hphp/test/slow/type_assertions/1857.php b/hphp/test/slow/type_assertions/1857.php
index f3ac00715..890c5db36 100644
--- a/hphp/test/slow/type_assertions/1857.php
+++ b/hphp/test/slow/type_assertions/1857.php
@@ -1,19 +1,21 @@
 <?php
 
-
 function f($x) {
   while (is_array($x) && isset($x[0])) $x = $x[0];
   var_dump($x);
 }
 function g($x) {
-  for (; is_array($x) && isset($x[0]); $x = $x[0]);
+  for (;
+ is_array($x) && isset($x[0]);
+ $x = $x[0]);
   var_dump($x);
 }
 function h($x) {
   if (!is_array($x) || !isset($x[0])) return;
   do {
     $x = $x[0];
-  } while (is_array($x) && isset($x[0]));
+  }
+ while (is_array($x) && isset($x[0]));
   var_dump($x);
 }
 f(array(array(array(array('hello')))));
diff --git a/hphp/test/slow/type_assertions/1858.php b/hphp/test/slow/type_assertions/1858.php
index 9f6f66c4e..5fc103368 100644
--- a/hphp/test/slow/type_assertions/1858.php
+++ b/hphp/test/slow/type_assertions/1858.php
@@ -1,7 +1,7 @@
 <?php
 
-
-function block() {}
+function block() {
+}
 function f($x) {
   if (is_int($x) || is_array($x)) {
     var_dump($x[0]);
diff --git a/hphp/test/slow/type_assertions/1859.php b/hphp/test/slow/type_assertions/1859.php
index dfda3d319..07dd33e13 100644
--- a/hphp/test/slow/type_assertions/1859.php
+++ b/hphp/test/slow/type_assertions/1859.php
@@ -1,15 +1,16 @@
 <?php
 
-
 function f($x) {
   if (!is_array($x)) {
     var_dump($x[0]);
-  } else if (isset($x[0])) {
+  }
+ else if (isset($x[0])) {
     var_dump($x[0]);
   }
   if (!!!is_array($x)) {
     var_dump($x[0]);
-  } else if (isset($x[0])) {
+  }
+ else if (isset($x[0])) {
     var_dump($x[0]);
   }
 }
@@ -20,7 +21,8 @@ function g($x) {
 function h($x) {
   if (!is_array($x) && !is_string($x)) {
     var_dump('1');
-  } else {
+  }
+ else {
     var_dump($x[0]);
   }
 }
@@ -35,9 +37,11 @@ class X implements arrayaccess {
   public function offsetSet($offset, $value) {
     if (is_null($offset)) {
       $this->container[] = $value;
-    } else {
+    }
+ else {
       $this->container[$offset] = $value;
-    }   
+    }
+
   }
   public function offsetExists($offset) {
     return isset($this->container[$offset]);
diff --git a/hphp/test/slow/type_assertions/1860.php b/hphp/test/slow/type_assertions/1860.php
index 67e881ba3..ccbbd0cd9 100644
--- a/hphp/test/slow/type_assertions/1860.php
+++ b/hphp/test/slow/type_assertions/1860.php
@@ -1,26 +1,29 @@
 <?php
 
-
 class Base {
   public function f() {
     var_dump('Base::f');
   }
 }
-function get() { return true; }
+function get() {
+ return true;
+ }
 if (get()) {
   class X {
     public function f() {
       var_dump('X1::f');
     }
   }
-} else {
+}
+ else {
   class X {
     public function f() {
       var_dump('X2::f');
     }
   }
 }
-class Y extends X {}
+class Y extends X {
+}
 function f($x) {
   if ($x instanceof Base) {
     $x->f();
diff --git a/hphp/test/slow/type_assertions/1861.php b/hphp/test/slow/type_assertions/1861.php
index e6df794e9..986760dfd 100644
--- a/hphp/test/slow/type_assertions/1861.php
+++ b/hphp/test/slow/type_assertions/1861.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x) {
   var_dump(is_array($x), $x[0]);
 }
diff --git a/hphp/test/slow/type_assertions/1862.php b/hphp/test/slow/type_assertions/1862.php
index 277200f1d..43e8133d4 100644
--- a/hphp/test/slow/type_assertions/1862.php
+++ b/hphp/test/slow/type_assertions/1862.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class X {
   public $propX;
   function baz() {
@@ -35,13 +34,16 @@ class A1 {
     if ($this instanceof D1) {
       var_dump($this->d1prop);
       var_dump($this->d1method());
-    } else if ($this instanceof C1) {
+    }
+ else if ($this instanceof C1) {
       var_dump($this->c1prop);
       var_dump($this->c1method());
-    } else if ($this instanceof B1) {
+    }
+ else if ($this instanceof B1) {
       var_dump($this->b1prop);
       var_dump($this->b1method());
-    } else if ($this instanceof A1) {
+    }
+ else if ($this instanceof A1) {
       var_dump($this->a1prop);
       var_dump($this->a1method());
     }
@@ -60,7 +62,8 @@ if (rand(0, 1)) {
       return 2;
     }
   }
-} else {
+}
+ else {
   class C1 extends B1 {
     public $c1prop;
     function c1method() {
diff --git a/hphp/test/slow/type_assertions/1863.php b/hphp/test/slow/type_assertions/1863.php
index 3d2efb893..ff73cdc79 100644
--- a/hphp/test/slow/type_assertions/1863.php
+++ b/hphp/test/slow/type_assertions/1863.php
@@ -1,7 +1,6 @@
 <?php
 
-
-    function foo() {
+function foo() {
     }
     function main() {
       var_dump(is_null(foo()));
diff --git a/hphp/test/slow/types/1746.php b/hphp/test/slow/types/1746.php
index a1b8d101e..ce159c23d 100644
--- a/hphp/test/slow/types/1746.php
+++ b/hphp/test/slow/types/1746.php
@@ -1,3 +1,8 @@
 <?php
 
- function foo($m, $n) {  $offset_change = 10;  $offset_change -= strlen($m) - strlen($n);  var_dump($offset_change);}foo('abc', 'efg');
\ No newline at end of file
+function foo($m, $n) {
+  $offset_change = 10;
+  $offset_change -= strlen($m) - strlen($n);
+  var_dump($offset_change);
+}
+foo('abc', 'efg');
diff --git a/hphp/test/slow/types/1747.php b/hphp/test/slow/types/1747.php
index 48f6e973f..849280701 100644
--- a/hphp/test/slow/types/1747.php
+++ b/hphp/test/slow/types/1747.php
@@ -1,3 +1,10 @@
 <?php
 
- function p(array $i = null) {  var_dump($i);  $i = array();}p();function q() {  p(null);}
\ No newline at end of file
+function p(array $i = null) {
+  var_dump($i);
+  $i = array();
+}
+p();
+function q() {
+  p(null);
+}
diff --git a/hphp/test/slow/types/1748.php b/hphp/test/slow/types/1748.php
index ae4646ce9..3efaf2b69 100644
--- a/hphp/test/slow/types/1748.php
+++ b/hphp/test/slow/types/1748.php
@@ -1,3 +1,9 @@
 <?php
 
- function foo($p) {  if ($p) {    $a = array();  }  var_dump((string)$a);}foo(false);
\ No newline at end of file
+function foo($p) {
+  if ($p) {
+    $a = array();
+  }
+  var_dump((string)$a);
+}
+foo(false);
diff --git a/hphp/test/slow/types/1749.php b/hphp/test/slow/types/1749.php
index fdc69d381..5837508e5 100644
--- a/hphp/test/slow/types/1749.php
+++ b/hphp/test/slow/types/1749.php
@@ -1,3 +1,12 @@
 <?php
 
- class X {};function bug() {  if (!$GLOBALS['x']) {    return;  }  return new X;}var_dump(bug());
\ No newline at end of file
+class X {
+}
+;
+function bug() {
+  if (!$GLOBALS['x']) {
+    return;
+  }
+  return new X;
+}
+var_dump(bug());
diff --git a/hphp/test/slow/types/1750.php b/hphp/test/slow/types/1750.php
index 02309b3e9..b0e538e41 100644
--- a/hphp/test/slow/types/1750.php
+++ b/hphp/test/slow/types/1750.php
@@ -1,3 +1,9 @@
 <?php
 
- function foo($a) {  return (int)$a;}function test() {  var_dump(foo(false));}test();
\ No newline at end of file
+function foo($a) {
+  return (int)$a;
+}
+function test() {
+  var_dump(foo(false));
+}
+test();
diff --git a/hphp/test/slow/types/1751.php b/hphp/test/slow/types/1751.php
index df44cada1..faac46143 100644
--- a/hphp/test/slow/types/1751.php
+++ b/hphp/test/slow/types/1751.php
@@ -1,4 +1,5 @@
 <?php
+
 // Copyright 2004-present Facebook. All Rights Reserved.
 
 function main($a, $b) {
diff --git a/hphp/test/slow/types/ref_type_fail.php b/hphp/test/slow/types/ref_type_fail.php
index f697047ae..d1e020ac7 100644
--- a/hphp/test/slow/types/ref_type_fail.php
+++ b/hphp/test/slow/types/ref_type_fail.php
@@ -1,9 +1,14 @@
 <?php
 
-function handler() { var_dump(__METHOD__); return true; }
+function handler() {
+ var_dump(__METHOD__);
+ return true;
+ }
 set_error_handler('handler');
 
-function foo(array &$a) { var_dump($a); }
+function foo(array &$a) {
+ var_dump($a);
+ }
 
 function test($a) {
   foo($a);
diff --git a/hphp/test/slow/u_converter/2130.php b/hphp/test/slow/u_converter/2130.php
index b1d271a1a..2fb8bad14 100644
--- a/hphp/test/slow/u_converter/2130.php
+++ b/hphp/test/slow/u_converter/2130.php
@@ -1,3 +1,9 @@
 <?php
 
- $avail = UConverter::getAvailable();var_dump(count($avail) > 100);var_dump(in_array('UTF-7', $avail));var_dump(in_array('CESU-8', $avail));var_dump(in_array('ISO-8859-1', $avail));$latin1 = UConverter::getAliases('latin1');var_dump(in_array('ISO-8859-1', $latin1));
\ No newline at end of file
+$avail = UConverter::getAvailable();
+var_dump(count($avail) > 100);
+var_dump(in_array('UTF-7', $avail));
+var_dump(in_array('CESU-8', $avail));
+var_dump(in_array('ISO-8859-1', $avail));
+$latin1 = UConverter::getAliases('latin1');
+var_dump(in_array('ISO-8859-1', $latin1));
diff --git a/hphp/test/slow/u_converter/2131.php b/hphp/test/slow/u_converter/2131.php
index 39421a065..6a66930d2 100644
--- a/hphp/test/slow/u_converter/2131.php
+++ b/hphp/test/slow/u_converter/2131.php
@@ -1,3 +1,6 @@
 <?php
 
- var_dump(UConverter::transcode("This is an ascii string", 'utf-8', 'latin1'));var_dump(urlencode(UConverter::transcode("Espa\xF1ol", 'utf-8', 'latin1')));var_dump(urlencode(UConverter::transcode("Stra\xDFa",  'utf-8', 'latin1')));var_dump(bin2hex(UConverter::transcode("\xE4", 'utf-8', 'koi8-r')));
\ No newline at end of file
+var_dump(UConverter::transcode("This is an ascii string", 'utf-8', 'latin1'));
+var_dump(urlencode(UConverter::transcode("Espa\xF1ol", 'utf-8', 'latin1')));
+var_dump(urlencode(UConverter::transcode("Stra\xDFa",  'utf-8', 'latin1')));
+var_dump(bin2hex(UConverter::transcode("\xE4", 'utf-8', 'koi8-r')));
diff --git a/hphp/test/slow/u_converter/2132.php b/hphp/test/slow/u_converter/2132.php
index 7ac6b773a..a080cfc8d 100644
--- a/hphp/test/slow/u_converter/2132.php
+++ b/hphp/test/slow/u_converter/2132.php
@@ -1,3 +1,19 @@
 <?php
 
- foreach(array('?','','??') as $subst) {  $opts = array('to_subst' => $subst);  $ret = UConverter::transcode("This is an ascii string", 'ascii', 'utf-8', $opts);  if ($ret === NULL) {    echo "Error: ", intl_get_error_message(), "\n";  } else {    var_dump($ret);  }  $ret = UConverter::transcode("Snowman: (\xE2\x98\x83)", 'ascii', 'utf-8', $opts);  if ($ret === NULL) {    echo "Error: ", intl_get_error_message(), "\n";  } else {    var_dump($ret);  }}
\ No newline at end of file
+foreach(array('?','','??') as $subst) {
+  $opts = array('to_subst' => $subst);
+  $ret = UConverter::transcode("This is an ascii string", 'ascii', 'utf-8', $opts);
+  if ($ret === NULL) {
+    echo "Error: ", intl_get_error_message(), "\n";
+  }
+ else {
+    var_dump($ret);
+  }
+  $ret = UConverter::transcode("Snowman: (\xE2\x98\x83)", 'ascii', 'utf-8', $opts);
+  if ($ret === NULL) {
+    echo "Error: ", intl_get_error_message(), "\n";
+  }
+ else {
+    var_dump($ret);
+  }
+}
diff --git a/hphp/test/slow/u_converter/2133.php b/hphp/test/slow/u_converter/2133.php
index 22c531f7e..fb27a2a61 100644
--- a/hphp/test/slow/u_converter/2133.php
+++ b/hphp/test/slow/u_converter/2133.php
@@ -1,3 +1,8 @@
 <?php
 
- $c = new UConverter('utf-8', 'latin1');var_dump(UConverter::LATIN_1 === $c->getSourceType());var_dump(UConverter::UTF8    === $c->getDestinationType());$c = new UConverter('koi8-r', 'utf-32be');var_dump(UConverter::UTF32_BigEndian === $c->getSourceType());var_dump(UConverter::SBCS            === $c->getDestinationType());
\ No newline at end of file
+$c = new UConverter('utf-8', 'latin1');
+var_dump(UConverter::LATIN_1 === $c->getSourceType());
+var_dump(UConverter::UTF8    === $c->getDestinationType());
+$c = new UConverter('koi8-r', 'utf-32be');
+var_dump(UConverter::UTF32_BigEndian === $c->getSourceType());
+var_dump(UConverter::SBCS            === $c->getDestinationType());
diff --git a/hphp/test/slow/u_converter/2134.php b/hphp/test/slow/u_converter/2134.php
index 163504061..fb2af3ee2 100644
--- a/hphp/test/slow/u_converter/2134.php
+++ b/hphp/test/slow/u_converter/2134.php
@@ -1,3 +1,9 @@
 <?php
 
- $c = new UConverter('utf-8', 'latin1');var_dump($c->convert("This is an ascii string"));var_dump(urlencode($c->convert("Espa\xF1ol")));var_dump(urlencode($c->convert("Stra\xDFa")));var_dump(urlencode($c->convert("Stra\xC3\x9Fa", true)));$k = new UConverter('utf-8', 'koi8-r');var_dump(bin2hex($k->convert("\xE4")));
\ No newline at end of file
+$c = new UConverter('utf-8', 'latin1');
+var_dump($c->convert("This is an ascii string"));
+var_dump(urlencode($c->convert("Espa\xF1ol")));
+var_dump(urlencode($c->convert("Stra\xDFa")));
+var_dump(urlencode($c->convert("Stra\xC3\x9Fa", true)));
+$k = new UConverter('utf-8', 'koi8-r');
+var_dump(bin2hex($k->convert("\xE4")));
diff --git a/hphp/test/slow/u_converter/2135.php b/hphp/test/slow/u_converter/2135.php
index c8c287559..a3c86d7fd 100644
--- a/hphp/test/slow/u_converter/2135.php
+++ b/hphp/test/slow/u_converter/2135.php
@@ -1,3 +1,17 @@
 <?php
 
- class MyConverter extends UConverter {  public function toUCallback($reason, $source, $codeUnits, &$error) {    echo "toUCallback(", UConverter::reasonText($reason), ", ...)\n";    return parent::toUCallback($reason, $source, $codeUnits, $error);  }  public function fromUCallback($reason, $source, $codePoint, &$error) {    echo "fromUCallback(", UConverter::reasonText($reason), ", ...)\n";    return parent::fromUCallback($reason, $source, $codePoint, $error);  }}$c = new MyConverter('ascii', 'utf-8');foreach(array("regular", "irregul\xC1\xA1r", "\xC2\xA1unsupported!") as $word) {  $c->convert($word);}unset($c);
\ No newline at end of file
+class MyConverter extends UConverter {
+  public function toUCallback($reason, $source, $codeUnits, &$error) {
+    echo "toUCallback(", UConverter::reasonText($reason), ", ...)\n";
+    return parent::toUCallback($reason, $source, $codeUnits, $error);
+  }
+  public function fromUCallback($reason, $source, $codePoint, &$error) {
+    echo "fromUCallback(", UConverter::reasonText($reason), ", ...)\n";
+    return parent::fromUCallback($reason, $source, $codePoint, $error);
+  }
+}
+$c = new MyConverter('ascii', 'utf-8');
+foreach(array("regular", "irregul\xC1\xA1r", "\xC2\xA1unsupported!") as $word) {
+  $c->convert($word);
+}
+unset($c);
diff --git a/hphp/test/slow/u_converter/2136.php b/hphp/test/slow/u_converter/2136.php
index 89322bb2b..6d8ea6412 100644
--- a/hphp/test/slow/u_converter/2136.php
+++ b/hphp/test/slow/u_converter/2136.php
@@ -1,3 +1,25 @@
 <?php
 
- class MyConverter extends UConverter {  public function toUCallback($reason, $source, $codeUnits, &$error) {    $error = U_ZERO_ERROR;    switch ($codeUnits) {      case "\x80": return NULL;      case "\x81": return 'a';      case "\x82": return ord('b');      case "\x83": return array('c');    }  }  public function fromUCallback($reason, $source, $codePoint, &$error) {    $error = U_ZERO_ERROR;    switch ($codePoint) {      case 0x00F1: return "A";      case 0x00F2: return ord("B");      case 0x00F3: return array("C");      case 0x00F4: return NULL;    }  }}$c = new MyConverter('ascii', 'utf-8');var_dump($c->convert("\x80\x81\x82\x83"));var_dump($c->convert("\xC3\xB1\xC3\xB2\xC3\xB3\xC3\xB4"));
\ No newline at end of file
+class MyConverter extends UConverter {
+  public function toUCallback($reason, $source, $codeUnits, &$error) {
+    $error = U_ZERO_ERROR;
+    switch ($codeUnits) {
+      case "\x80": return NULL;
+      case "\x81": return 'a';
+      case "\x82": return ord('b');
+      case "\x83": return array('c');
+    }
+  }
+  public function fromUCallback($reason, $source, $codePoint, &$error) {
+    $error = U_ZERO_ERROR;
+    switch ($codePoint) {
+      case 0x00F1: return "A";
+      case 0x00F2: return ord("B");
+      case 0x00F3: return array("C");
+      case 0x00F4: return NULL;
+    }
+  }
+}
+$c = new MyConverter('ascii', 'utf-8');
+var_dump($c->convert("\x80\x81\x82\x83"));
+var_dump($c->convert("\xC3\xB1\xC3\xB2\xC3\xB3\xC3\xB4"));
diff --git a/hphp/test/slow/u_converter/2137.php b/hphp/test/slow/u_converter/2137.php
index eb181f437..114079fb0 100644
--- a/hphp/test/slow/u_converter/2137.php
+++ b/hphp/test/slow/u_converter/2137.php
@@ -1,3 +1,11 @@
 <?php
 
- $c = new UConverter('ascii', 'utf-8');foreach(array('?','','<unknown>') as $subst) {  if (!$c->setSubstChars($subst)) {    echo "**Disallowed\n";    continue;  }  var_dump($c->convert("This is an ascii string"));  var_dump($c->convert("Snowman: (\xE2\x98\x83)"));}
\ No newline at end of file
+$c = new UConverter('ascii', 'utf-8');
+foreach(array('?','','<unknown>') as $subst) {
+  if (!$c->setSubstChars($subst)) {
+    echo "**Disallowed\n";
+    continue;
+  }
+  var_dump($c->convert("This is an ascii string"));
+  var_dump($c->convert("Snowman: (\xE2\x98\x83)"));
+}
diff --git a/hphp/test/slow/u_converter/2138.php b/hphp/test/slow/u_converter/2138.php
index 328352380..9b963fb49 100644
--- a/hphp/test/slow/u_converter/2138.php
+++ b/hphp/test/slow/u_converter/2138.php
@@ -1,3 +1,5 @@
 <?php
 
- $standards = UConverter::getStandards();var_dump(in_array('IANA', $standards));var_dump(in_array('MIME', $standards));
\ No newline at end of file
+$standards = UConverter::getStandards();
+var_dump(in_array('IANA', $standards));
+var_dump(in_array('MIME', $standards));
diff --git a/hphp/test/slow/u_converter/2139.php b/hphp/test/slow/u_converter/2139.php
index 7f9a7a622..bc3aed76d 100644
--- a/hphp/test/slow/u_converter/2139.php
+++ b/hphp/test/slow/u_converter/2139.php
@@ -1,3 +1,5 @@
 <?php
 
- var_dump(UConverter::getStandardName('latin1', 'MIME'));var_dump(UConverter::getStandardName('latin1', 'IANA'));var_dump(UConverter::getStandardName('blergh', 'blergh'));
\ No newline at end of file
+var_dump(UConverter::getStandardName('latin1', 'MIME'));
+var_dump(UConverter::getStandardName('latin1', 'IANA'));
+var_dump(UConverter::getStandardName('blergh', 'blergh'));
diff --git a/hphp/test/slow/u_converter/2140.php b/hphp/test/slow/u_converter/2140.php
index 767479954..fa311f552 100644
--- a/hphp/test/slow/u_converter/2140.php
+++ b/hphp/test/slow/u_converter/2140.php
@@ -1,3 +1,4 @@
 <?php
 
- var_dump(UConverter::getMIMEName('latin1'));var_dump(UConverter::getMIMEName('blergh'));
\ No newline at end of file
+var_dump(UConverter::getMIMEName('latin1'));
+var_dump(UConverter::getMIMEName('blergh'));
diff --git a/hphp/test/slow/unary_operators/1436.php b/hphp/test/slow/unary_operators/1436.php
index e634e2297..7d8dc9760 100644
--- a/hphp/test/slow/unary_operators/1436.php
+++ b/hphp/test/slow/unary_operators/1436.php
@@ -1,3 +1,287 @@
 <?php
 
- var_dump(!null);var_dump(!true);var_dump(!false);var_dump(!0);var_dump(!1);var_dump(!1.2);var_dump(!"");var_dump(!"0");var_dump(!"1");var_dump(!"1.2");var_dump(!'');var_dump(!'0');var_dump(!'1');var_dump(!'1.2');var_dump(!__LINE__);var_dump(!__FUNCTION__);var_dump(!0x10);var_dump(!010);var_dump(!"0x10");var_dump(!"010");var_dump(+null);var_dump(+true);var_dump(+false);var_dump(+0);var_dump(+1);var_dump(+1.2);var_dump(+"");var_dump(+"0");var_dump(+"1");var_dump(+"1.2");var_dump(+'');var_dump(+'0');var_dump(+'1');var_dump(+'1.2');var_dump(+__LINE__);var_dump(+__FUNCTION__);var_dump(+0x10);var_dump(+010);var_dump(+"0x10");var_dump(+"010");var_dump(-null);var_dump(-true);var_dump(-false);var_dump(-0);var_dump(-1);var_dump(-1.2);var_dump(-"");var_dump(-"0");var_dump(-"1");var_dump(-"1.2");var_dump(-'');var_dump(-'0');var_dump(-'1');var_dump(-'1.2');var_dump(-__LINE__);var_dump(-__FUNCTION__);var_dump(-0x10);var_dump(-010);var_dump(-"0x10");var_dump(-"010");var_dump(~0);var_dump(~1);var_dump(~1.2);var_dump(~"");var_dump(~"0");var_dump(~"1");var_dump(~"1.2");var_dump(~'');var_dump(~'0');var_dump(~'1');var_dump(~'1.2');var_dump(~__LINE__);var_dump(~__FUNCTION__);var_dump(~0x10);var_dump(~010);var_dump(~"0x10");var_dump(~"010");var_dump((null));var_dump((true));var_dump((false));var_dump((0));var_dump((1));var_dump((1.2));var_dump((""));var_dump(("0"));var_dump(("1"));var_dump(("1.2"));var_dump((''));var_dump(('0'));var_dump(('1'));var_dump(('1.2'));var_dump((__LINE__));var_dump((__FUNCTION__));var_dump((0x10));var_dump((010));var_dump(("0x10"));var_dump(("010"));var_dump((int)null);var_dump((int)true);var_dump((int)false);var_dump((int)0);var_dump((int)1);var_dump((int)1.2);var_dump((int)"");var_dump((int)"0");var_dump((int)"1");var_dump((int)"1.2");var_dump((int)'');var_dump((int)'0');var_dump((int)'1');var_dump((int)'1.2');var_dump((int)__LINE__);var_dump((int)__FUNCTION__);var_dump((int)0x10);var_dump((int)010);var_dump((int)"0x10");var_dump((int)"010");var_dump((integer)null);var_dump((integer)true);var_dump((integer)false);var_dump((integer)0);var_dump((integer)1);var_dump((integer)1.2);var_dump((integer)"");var_dump((integer)"0");var_dump((integer)"1");var_dump((integer)"1.2");var_dump((integer)'');var_dump((integer)'0');var_dump((integer)'1');var_dump((integer)'1.2');var_dump((integer)__LINE__);var_dump((integer)__FUNCTION__);var_dump((integer)0x10);var_dump((integer)010);var_dump((integer)"0x10");var_dump((integer)"010");var_dump((bool)null);var_dump((bool)true);var_dump((bool)false);var_dump((bool)0);var_dump((bool)1);var_dump((bool)1.2);var_dump((bool)"");var_dump((bool)"0");var_dump((bool)"1");var_dump((bool)"1.2");var_dump((bool)'');var_dump((bool)'0');var_dump((bool)'1');var_dump((bool)'1.2');var_dump((bool)__LINE__);var_dump((bool)__FUNCTION__);var_dump((bool)0x10);var_dump((bool)010);var_dump((bool)"0x10");var_dump((bool)"010");var_dump((boolean)null);var_dump((boolean)true);var_dump((boolean)false);var_dump((boolean)0);var_dump((boolean)1);var_dump((boolean)1.2);var_dump((boolean)"");var_dump((boolean)"0");var_dump((boolean)"1");var_dump((boolean)"1.2");var_dump((boolean)'');var_dump((boolean)'0');var_dump((boolean)'1');var_dump((boolean)'1.2');var_dump((boolean)__LINE__);var_dump((boolean)__FUNCTION__);var_dump((boolean)0x10);var_dump((boolean)010);var_dump((boolean)"0x10");var_dump((boolean)"010");var_dump((float)null);var_dump((float)true);var_dump((float)false);var_dump((float)0);var_dump((float)1);var_dump((float)1.2);var_dump((float)"");var_dump((float)"0");var_dump((float)"1");var_dump((float)"1.2");var_dump((float)'');var_dump((float)'0');var_dump((float)'1');var_dump((float)'1.2');var_dump((float)__LINE__);var_dump((float)__FUNCTION__);var_dump((float)0x10);var_dump((float)010);var_dump((float)"0x10");var_dump((float)"010");var_dump((double)null);var_dump((double)true);var_dump((double)false);var_dump((double)0);var_dump((double)1);var_dump((double)1.2);var_dump((double)"");var_dump((double)"0");var_dump((double)"1");var_dump((double)"1.2");var_dump((double)'');var_dump((double)'0');var_dump((double)'1');var_dump((double)'1.2');var_dump((double)__LINE__);var_dump((double)__FUNCTION__);var_dump((double)0x10);var_dump((double)010);var_dump((double)"0x10");var_dump((double)"010");var_dump((real)null);var_dump((real)true);var_dump((real)false);var_dump((real)0);var_dump((real)1);var_dump((real)1.2);var_dump((real)"");var_dump((real)"0");var_dump((real)"1");var_dump((real)"1.2");var_dump((real)'');var_dump((real)'0');var_dump((real)'1');var_dump((real)'1.2');var_dump((real)__LINE__);var_dump((real)__FUNCTION__);var_dump((real)0x10);var_dump((real)010);var_dump((real)"0x10");var_dump((real)"010");var_dump((string)null);var_dump((string)true);var_dump((string)false);var_dump((string)0);var_dump((string)1);var_dump((string)1.2);var_dump((string)"");var_dump((string)"0");var_dump((string)"1");var_dump((string)"1.2");var_dump((string)'');var_dump((string)'0');var_dump((string)'1');var_dump((string)'1.2');var_dump((string)__LINE__);var_dump((string)__FUNCTION__);var_dump((string)0x10);var_dump((string)010);var_dump((string)"0x10");var_dump((string)"010");var_dump(1.7e+319);var_dump(!1.7e+319);var_dump(+1.7e+319);var_dump(-1.7e+319);var_dump(~1.7e+319);var_dump((1.7e+319));var_dump((int)1.7e+319);var_dump((integer)1.7e+319);var_dump((bool)1.7e+319);var_dump((boolean)1.7e+319);var_dump((float)1.7e+319);var_dump((double)1.7e+319);var_dump((real)1.7e+319);var_dump((string)1.7e+319);var_dump("1.7e+319");var_dump(!"1.7e+319");var_dump(+"1.7e+319");var_dump(-"1.7e+319");var_dump(~"1.7e+319");var_dump(("1.7e+319"));var_dump((int)"1.7e+319");var_dump((integer)"1.7e+319");var_dump((bool)"1.7e+319");var_dump((boolean)"1.7e+319");var_dump((float)"1.7e+319");var_dump((double)"1.7e+319");var_dump((real)"1.7e+319");var_dump((string)"1.7e+319");
\ No newline at end of file
+var_dump(!null);
+var_dump(!true);
+var_dump(!false);
+var_dump(!0);
+var_dump(!1);
+var_dump(!1.2);
+var_dump(!"");
+var_dump(!"0");
+var_dump(!"1");
+var_dump(!"1.2");
+var_dump(!'');
+var_dump(!'0');
+var_dump(!'1');
+var_dump(!'1.2');
+var_dump(!__LINE__);
+var_dump(!__FUNCTION__);
+var_dump(!0x10);
+var_dump(!010);
+var_dump(!"0x10");
+var_dump(!"010");
+var_dump(+null);
+var_dump(+true);
+var_dump(+false);
+var_dump(+0);
+var_dump(+1);
+var_dump(+1.2);
+var_dump(+"");
+var_dump(+"0");
+var_dump(+"1");
+var_dump(+"1.2");
+var_dump(+'');
+var_dump(+'0');
+var_dump(+'1');
+var_dump(+'1.2');
+var_dump(+__LINE__);
+var_dump(+__FUNCTION__);
+var_dump(+0x10);
+var_dump(+010);
+var_dump(+"0x10");
+var_dump(+"010");
+var_dump(-null);
+var_dump(-true);
+var_dump(-false);
+var_dump(-0);
+var_dump(-1);
+var_dump(-1.2);
+var_dump(-"");
+var_dump(-"0");
+var_dump(-"1");
+var_dump(-"1.2");
+var_dump(-'');
+var_dump(-'0');
+var_dump(-'1');
+var_dump(-'1.2');
+var_dump(-__LINE__);
+var_dump(-__FUNCTION__);
+var_dump(-0x10);
+var_dump(-010);
+var_dump(-"0x10");
+var_dump(-"010");
+var_dump(~0);
+var_dump(~1);
+var_dump(~1.2);
+var_dump(~"");
+var_dump(~"0");
+var_dump(~"1");
+var_dump(~"1.2");
+var_dump(~'');
+var_dump(~'0');
+var_dump(~'1');
+var_dump(~'1.2');
+var_dump(~__LINE__);
+var_dump(~__FUNCTION__);
+var_dump(~0x10);
+var_dump(~010);
+var_dump(~"0x10");
+var_dump(~"010");
+var_dump((null));
+var_dump((true));
+var_dump((false));
+var_dump((0));
+var_dump((1));
+var_dump((1.2));
+var_dump((""));
+var_dump(("0"));
+var_dump(("1"));
+var_dump(("1.2"));
+var_dump((''));
+var_dump(('0'));
+var_dump(('1'));
+var_dump(('1.2'));
+var_dump((__LINE__));
+var_dump((__FUNCTION__));
+var_dump((0x10));
+var_dump((010));
+var_dump(("0x10"));
+var_dump(("010"));
+var_dump((int)null);
+var_dump((int)true);
+var_dump((int)false);
+var_dump((int)0);
+var_dump((int)1);
+var_dump((int)1.2);
+var_dump((int)"");
+var_dump((int)"0");
+var_dump((int)"1");
+var_dump((int)"1.2");
+var_dump((int)'');
+var_dump((int)'0');
+var_dump((int)'1');
+var_dump((int)'1.2');
+var_dump((int)__LINE__);
+var_dump((int)__FUNCTION__);
+var_dump((int)0x10);
+var_dump((int)010);
+var_dump((int)"0x10");
+var_dump((int)"010");
+var_dump((integer)null);
+var_dump((integer)true);
+var_dump((integer)false);
+var_dump((integer)0);
+var_dump((integer)1);
+var_dump((integer)1.2);
+var_dump((integer)"");
+var_dump((integer)"0");
+var_dump((integer)"1");
+var_dump((integer)"1.2");
+var_dump((integer)'');
+var_dump((integer)'0');
+var_dump((integer)'1');
+var_dump((integer)'1.2');
+var_dump((integer)__LINE__);
+var_dump((integer)__FUNCTION__);
+var_dump((integer)0x10);
+var_dump((integer)010);
+var_dump((integer)"0x10");
+var_dump((integer)"010");
+var_dump((bool)null);
+var_dump((bool)true);
+var_dump((bool)false);
+var_dump((bool)0);
+var_dump((bool)1);
+var_dump((bool)1.2);
+var_dump((bool)"");
+var_dump((bool)"0");
+var_dump((bool)"1");
+var_dump((bool)"1.2");
+var_dump((bool)'');
+var_dump((bool)'0');
+var_dump((bool)'1');
+var_dump((bool)'1.2');
+var_dump((bool)__LINE__);
+var_dump((bool)__FUNCTION__);
+var_dump((bool)0x10);
+var_dump((bool)010);
+var_dump((bool)"0x10");
+var_dump((bool)"010");
+var_dump((boolean)null);
+var_dump((boolean)true);
+var_dump((boolean)false);
+var_dump((boolean)0);
+var_dump((boolean)1);
+var_dump((boolean)1.2);
+var_dump((boolean)"");
+var_dump((boolean)"0");
+var_dump((boolean)"1");
+var_dump((boolean)"1.2");
+var_dump((boolean)'');
+var_dump((boolean)'0');
+var_dump((boolean)'1');
+var_dump((boolean)'1.2');
+var_dump((boolean)__LINE__);
+var_dump((boolean)__FUNCTION__);
+var_dump((boolean)0x10);
+var_dump((boolean)010);
+var_dump((boolean)"0x10");
+var_dump((boolean)"010");
+var_dump((float)null);
+var_dump((float)true);
+var_dump((float)false);
+var_dump((float)0);
+var_dump((float)1);
+var_dump((float)1.2);
+var_dump((float)"");
+var_dump((float)"0");
+var_dump((float)"1");
+var_dump((float)"1.2");
+var_dump((float)'');
+var_dump((float)'0');
+var_dump((float)'1');
+var_dump((float)'1.2');
+var_dump((float)__LINE__);
+var_dump((float)__FUNCTION__);
+var_dump((float)0x10);
+var_dump((float)010);
+var_dump((float)"0x10");
+var_dump((float)"010");
+var_dump((double)null);
+var_dump((double)true);
+var_dump((double)false);
+var_dump((double)0);
+var_dump((double)1);
+var_dump((double)1.2);
+var_dump((double)"");
+var_dump((double)"0");
+var_dump((double)"1");
+var_dump((double)"1.2");
+var_dump((double)'');
+var_dump((double)'0');
+var_dump((double)'1');
+var_dump((double)'1.2');
+var_dump((double)__LINE__);
+var_dump((double)__FUNCTION__);
+var_dump((double)0x10);
+var_dump((double)010);
+var_dump((double)"0x10");
+var_dump((double)"010");
+var_dump((real)null);
+var_dump((real)true);
+var_dump((real)false);
+var_dump((real)0);
+var_dump((real)1);
+var_dump((real)1.2);
+var_dump((real)"");
+var_dump((real)"0");
+var_dump((real)"1");
+var_dump((real)"1.2");
+var_dump((real)'');
+var_dump((real)'0');
+var_dump((real)'1');
+var_dump((real)'1.2');
+var_dump((real)__LINE__);
+var_dump((real)__FUNCTION__);
+var_dump((real)0x10);
+var_dump((real)010);
+var_dump((real)"0x10");
+var_dump((real)"010");
+var_dump((string)null);
+var_dump((string)true);
+var_dump((string)false);
+var_dump((string)0);
+var_dump((string)1);
+var_dump((string)1.2);
+var_dump((string)"");
+var_dump((string)"0");
+var_dump((string)"1");
+var_dump((string)"1.2");
+var_dump((string)'');
+var_dump((string)'0');
+var_dump((string)'1');
+var_dump((string)'1.2');
+var_dump((string)__LINE__);
+var_dump((string)__FUNCTION__);
+var_dump((string)0x10);
+var_dump((string)010);
+var_dump((string)"0x10");
+var_dump((string)"010");
+var_dump(1.7e+319);
+var_dump(!1.7e+319);
+var_dump(+1.7e+319);
+var_dump(-1.7e+319);
+var_dump(~1.7e+319);
+var_dump((1.7e+319));
+var_dump((int)1.7e+319);
+var_dump((integer)1.7e+319);
+var_dump((bool)1.7e+319);
+var_dump((boolean)1.7e+319);
+var_dump((float)1.7e+319);
+var_dump((double)1.7e+319);
+var_dump((real)1.7e+319);
+var_dump((string)1.7e+319);
+var_dump("1.7e+319");
+var_dump(!"1.7e+319");
+var_dump(+"1.7e+319");
+var_dump(-"1.7e+319");
+var_dump(~"1.7e+319");
+var_dump(("1.7e+319"));
+var_dump((int)"1.7e+319");
+var_dump((integer)"1.7e+319");
+var_dump((bool)"1.7e+319");
+var_dump((boolean)"1.7e+319");
+var_dump((float)"1.7e+319");
+var_dump((double)"1.7e+319");
+var_dump((real)"1.7e+319");
+var_dump((string)"1.7e+319");
diff --git a/hphp/test/slow/unary_operators/1436.php.expect b/hphp/test/slow/unary_operators/1436.php.expect
index 49940f705..c965f38cc 100644
--- a/hphp/test/slow/unary_operators/1436.php.expect
+++ b/hphp/test/slow/unary_operators/1436.php.expect
@@ -32,7 +32,7 @@ int(0)
 int(0)
 int(1)
 float(1.2)
-int(3)
+int(37)
 int(0)
 int(16)
 int(8)
@@ -52,7 +52,7 @@ int(0)
 int(0)
 int(-1)
 float(-1.2)
-int(-3)
+int(-57)
 int(0)
 int(-16)
 int(-8)
@@ -69,7 +69,7 @@ string(0) ""
 string(1) "Ï"
 string(1) "Î"
 string(3) "ÎÑÍ"
-int(-4)
+int(-75)
 string(0) ""
 int(-17)
 int(-9)
@@ -89,7 +89,7 @@ string(0) ""
 string(1) "0"
 string(1) "1"
 string(3) "1.2"
-int(3)
+int(94)
 string(0) ""
 int(16)
 int(8)
@@ -109,7 +109,7 @@ int(0)
 int(0)
 int(1)
 int(1)
-int(3)
+int(114)
 int(0)
 int(16)
 int(8)
@@ -129,7 +129,7 @@ int(0)
 int(0)
 int(1)
 int(1)
-int(3)
+int(134)
 int(0)
 int(16)
 int(8)
@@ -189,7 +189,7 @@ float(0)
 float(0)
 float(1)
 float(1.2)
-float(3)
+float(194)
 float(0)
 float(16)
 float(8)
@@ -209,7 +209,7 @@ float(0)
 float(0)
 float(1)
 float(1.2)
-float(3)
+float(214)
 float(0)
 float(16)
 float(8)
@@ -229,7 +229,7 @@ float(0)
 float(0)
 float(1)
 float(1.2)
-float(3)
+float(234)
 float(0)
 float(16)
 float(8)
@@ -249,7 +249,7 @@ string(0) ""
 string(1) "0"
 string(1) "1"
 string(3) "1.2"
-string(1) "3"
+string(3) "254"
 string(0) ""
 string(2) "16"
 string(1) "8"
diff --git a/hphp/test/slow/unary_operators/1437.php b/hphp/test/slow/unary_operators/1437.php
index 732dc527d..6970c0547 100644
--- a/hphp/test/slow/unary_operators/1437.php
+++ b/hphp/test/slow/unary_operators/1437.php
@@ -1,3 +1,54 @@
 <?php
 
- var_dump(array("\0" => 1));var_dump(array("\0" => "\0"));var_dump(array("\0" => "\\"));var_dump(array("\0" => "\'"));var_dump(array("\\" => 1));var_dump(array("\\" => "\0"));var_dump(array("\\" => "\\"));var_dump(array("\\" => "\'"));var_dump(array("\'" => 1));var_dump(array("\'" => "\0"));var_dump(array("\'" => "\\"));var_dump(array("\'" => "\'"));var_dump(array("\a" => "\a"));var_dump(!array("\0" => "\0"));var_dump((array("\0" => "\0")));var_dump((int)array("\0" => "\0"));var_dump((integer)array("\0" => "\0"));var_dump((bool)array("\0" => "\0"));var_dump((boolean)array("\0" => "\0"));var_dump((float)array("\0" => "\0"));var_dump((double)array("\0" => "\0"));var_dump((real)array("\0" => "\0"));var_dump((string)array("\0" => "\0"));$a = "0x10";var_dump($a);var_dump("\0");$a = array("\0" => 1);var_dump($a);$a = array("\0" => "\0");var_dump($a);$a = array("\0" => "\\");var_dump($a);$a = array("\0" => "\'");var_dump($a);$a = array("\\" => 1);var_dump($a);$a = array("\\" => "\0");var_dump($a);$a = array("\\" => "\\");var_dump($a);$a = array("\\" => "\'");var_dump($a);$a = array("\'" => 1);var_dump($a);$a = array("\'" => "\0");var_dump($a);$a = array("\'" => "\\");var_dump($a);$a = array("\'" => "\'");var_dump($a);$a = array("\a" => "\a");var_dump($a);
\ No newline at end of file
+var_dump(array("\0" => 1));
+var_dump(array("\0" => "\0"));
+var_dump(array("\0" => "\\"));
+var_dump(array("\0" => "\'"));
+var_dump(array("\\" => 1));
+var_dump(array("\\" => "\0"));
+var_dump(array("\\" => "\\"));
+var_dump(array("\\" => "\'"));
+var_dump(array("\'" => 1));
+var_dump(array("\'" => "\0"));
+var_dump(array("\'" => "\\"));
+var_dump(array("\'" => "\'"));
+var_dump(array("\a" => "\a"));
+var_dump(!array("\0" => "\0"));
+var_dump((array("\0" => "\0")));
+var_dump((int)array("\0" => "\0"));
+var_dump((integer)array("\0" => "\0"));
+var_dump((bool)array("\0" => "\0"));
+var_dump((boolean)array("\0" => "\0"));
+var_dump((float)array("\0" => "\0"));
+var_dump((double)array("\0" => "\0"));
+var_dump((real)array("\0" => "\0"));
+var_dump((string)array("\0" => "\0"));
+$a = "0x10";
+var_dump($a);
+var_dump("\0");
+$a = array("\0" => 1);
+var_dump($a);
+$a = array("\0" => "\0");
+var_dump($a);
+$a = array("\0" => "\\");
+var_dump($a);
+$a = array("\0" => "\'");
+var_dump($a);
+$a = array("\\" => 1);
+var_dump($a);
+$a = array("\\" => "\0");
+var_dump($a);
+$a = array("\\" => "\\");
+var_dump($a);
+$a = array("\\" => "\'");
+var_dump($a);
+$a = array("\'" => 1);
+var_dump($a);
+$a = array("\'" => "\0");
+var_dump($a);
+$a = array("\'" => "\\");
+var_dump($a);
+$a = array("\'" => "\'");
+var_dump($a);
+$a = array("\a" => "\a");
+var_dump($a);
diff --git a/hphp/test/slow/unary_operators/1438.php b/hphp/test/slow/unary_operators/1438.php
index b76ed2d98..b620087b9 100644
--- a/hphp/test/slow/unary_operators/1438.php
+++ b/hphp/test/slow/unary_operators/1438.php
@@ -1,3 +1,15 @@
 <?php
 
- function foo($x) {  if ($x) {    $a = array();    $s = 'hello';    $o = (object)null;  }  var_dump((array)$a, (array)$s, (array)$o);  var_dump((string)$a, (string)$s, (string)$o);  var_dump((object)$a);var_dump((object)$s);var_dump((object)$o);}foo(false);
\ No newline at end of file
+function foo($x) {
+  if ($x) {
+    $a = array();
+    $s = 'hello';
+    $o = (object)null;
+  }
+  var_dump((array)$a, (array)$s, (array)$o);
+  var_dump((string)$a, (string)$s, (string)$o);
+  var_dump((object)$a);
+var_dump((object)$s);
+var_dump((object)$o);
+}
+foo(false);
diff --git a/hphp/test/slow/unary_operators/1439.php b/hphp/test/slow/unary_operators/1439.php
index 34e0cd069..35c9a3a03 100644
--- a/hphp/test/slow/unary_operators/1439.php
+++ b/hphp/test/slow/unary_operators/1439.php
@@ -1,3 +1,9 @@
 <?php
 
- function test($x) {  switch ($x) {    case 1:      $y = true;    case 2:      var_dump(isset($y), $y);  }}test(2);
\ No newline at end of file
+function test($x) {
+  switch ($x) {
+    case 1:      $y = true;
+    case 2:      var_dump(isset($y), $y);
+  }
+}
+test(2);
diff --git a/hphp/test/slow/unset/1106.php b/hphp/test/slow/unset/1106.php
index eba0adfdc..5ea835a0c 100644
--- a/hphp/test/slow/unset/1106.php
+++ b/hphp/test/slow/unset/1106.php
@@ -1,3 +1,8 @@
 <?php
 
- class A { static $foo = array(123);} $a = 'A'; unset($a::$foo[0]); unset(A::$foo[0]);
\ No newline at end of file
+class A {
+ static $foo = array(123);
+}
+ $a = 'A';
+ unset($a::$foo[0]);
+ unset(A::$foo[0]);
diff --git a/hphp/test/slow/unset/1107.php b/hphp/test/slow/unset/1107.php
index 70854369b..1f08cdb62 100644
--- a/hphp/test/slow/unset/1107.php
+++ b/hphp/test/slow/unset/1107.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; unset($a); var_dump($a);
\ No newline at end of file
+$a = 10;
+ unset($a);
+ var_dump($a);
diff --git a/hphp/test/slow/unset/1108.php b/hphp/test/slow/unset/1108.php
index 50f9bb339..970a5d07e 100644
--- a/hphp/test/slow/unset/1108.php
+++ b/hphp/test/slow/unset/1108.php
@@ -1,3 +1,11 @@
 <?php
 
- $a = array(10); function test() { global $a; unset($a[0]); var_dump($a);}var_dump($a); test(); var_dump($a);
\ No newline at end of file
+$a = array(10);
+ function test() {
+ global $a;
+ unset($a[0]);
+ var_dump($a);
+}
+var_dump($a);
+ test();
+ var_dump($a);
diff --git a/hphp/test/slow/unset/1109.php b/hphp/test/slow/unset/1109.php
index ed31f79eb..0bc4263d3 100644
--- a/hphp/test/slow/unset/1109.php
+++ b/hphp/test/slow/unset/1109.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; unset($GLOBALS); var_dump($a);
\ No newline at end of file
+$a = 10;
+ unset($GLOBALS);
+ var_dump($a);
diff --git a/hphp/test/slow/unset/1110.php b/hphp/test/slow/unset/1110.php
index 50bb9b53e..3bd7b8f17 100644
--- a/hphp/test/slow/unset/1110.php
+++ b/hphp/test/slow/unset/1110.php
@@ -1,3 +1,26 @@
 <?php
 
- function f1() {  $x = array(1,2,3);  unset($x[0]);  var_dump($x);}function f2() {  $x = array(1,2,3);  unset($x[0][0]);  var_dump($x);}function f3() {  $x = array(array(4,5,6),2,3);  unset($x[0][0]);  var_dump($x);}function f4() {  $x = array(array(4,5,6),2,3);  unset($x[0][0][0]);  var_dump($x);}f1();f2();f3();f4();
\ No newline at end of file
+function f1() {
+  $x = array(1,2,3);
+  unset($x[0]);
+  var_dump($x);
+}
+function f2() {
+  $x = array(1,2,3);
+  unset($x[0][0]);
+  var_dump($x);
+}
+function f3() {
+  $x = array(array(4,5,6),2,3);
+  unset($x[0][0]);
+  var_dump($x);
+}
+function f4() {
+  $x = array(array(4,5,6),2,3);
+  unset($x[0][0][0]);
+  var_dump($x);
+}
+f1();
+f2();
+f3();
+f4();
diff --git a/hphp/test/slow/unset/1111.php b/hphp/test/slow/unset/1111.php
index ce2f806fc..fe57ca5ce 100644
--- a/hphp/test/slow/unset/1111.php
+++ b/hphp/test/slow/unset/1111.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { public $arr;} $obj = new A; $obj->arr[] = 'test';var_dump($obj->arr); unset($obj->arr); var_dump($obj->arr);
\ No newline at end of file
+class A {
+ public $arr;
+}
+ $obj = new A;
+ $obj->arr[] = 'test';
+var_dump($obj->arr);
+ unset($obj->arr);
+ var_dump($obj->arr);
diff --git a/hphp/test/slow/unset/1112.php b/hphp/test/slow/unset/1112.php
index 596197b05..ce5b4b961 100644
--- a/hphp/test/slow/unset/1112.php
+++ b/hphp/test/slow/unset/1112.php
@@ -1,3 +1,6 @@
 <?php
 
- function test() {$a=array(1,2,3); unset($a[0]);}
\ No newline at end of file
+function test() {
+$a=array(1,2,3);
+ unset($a[0]);
+}
diff --git a/hphp/test/slow/unset/1113.php b/hphp/test/slow/unset/1113.php
index 4e9bf03e3..a02920202 100644
--- a/hphp/test/slow/unset/1113.php
+++ b/hphp/test/slow/unset/1113.php
@@ -1,3 +1,10 @@
 <?php
 
- function foo() {  $a = 1;  $b = 2;  $c = 3;  unset($a, $b, $c);  var_dump($b);}foo();
\ No newline at end of file
+function foo() {
+  $a = 1;
+  $b = 2;
+  $c = 3;
+  unset($a, $b, $c);
+  var_dump($b);
+}
+foo();
diff --git a/hphp/test/slow/unset/1114.php b/hphp/test/slow/unset/1114.php
index 2b1e3a303..4f31efeec 100644
--- a/hphp/test/slow/unset/1114.php
+++ b/hphp/test/slow/unset/1114.php
@@ -1,3 +1,15 @@
 <?php
 
- $a = 1;function foo() {  $GLOBALS['foo'] = 1;  unset($GLOBALS['foo']);  var_dump(array_key_exists('foo', $GLOBALS));  $g['foo'] = 1;  unset($g['foo']);  var_dump(array_key_exists('foo', $g));  var_dump(array_key_exists('a', $GLOBALS));  unset($GLOBALS['a']);  var_dump(array_key_exists('a', $GLOBALS));}foo();
\ No newline at end of file
+$a = 1;
+function foo() {
+  $GLOBALS['foo'] = 1;
+  unset($GLOBALS['foo']);
+  var_dump(array_key_exists('foo', $GLOBALS));
+  $g['foo'] = 1;
+  unset($g['foo']);
+  var_dump(array_key_exists('foo', $g));
+  var_dump(array_key_exists('a', $GLOBALS));
+  unset($GLOBALS['a']);
+  var_dump(array_key_exists('a', $GLOBALS));
+}
+foo();
diff --git a/hphp/test/slow/unset/1115.php b/hphp/test/slow/unset/1115.php
index c3b47cb27..3cb064961 100644
--- a/hphp/test/slow/unset/1115.php
+++ b/hphp/test/slow/unset/1115.php
@@ -1,3 +1,25 @@
 <?php
 
- class A {  var $a;  public function __construct($p) {    $this->a = $p;  }};$obj = new A(1);var_dump($obj);unset($obj->a);var_dump($obj);$obj->a = 2;var_dump($obj);$obj->b = 3;var_dump($obj);unset($obj->b);var_dump($obj);$obj->a = 2;var_dump($obj);$obj->b = 3;var_dump($obj);unset($obj->a, $obj->b);var_dump($obj);
\ No newline at end of file
+class A {
+  var $a;
+  public function __construct($p) {
+    $this->a = $p;
+  }
+}
+;
+$obj = new A(1);
+var_dump($obj);
+unset($obj->a);
+var_dump($obj);
+$obj->a = 2;
+var_dump($obj);
+$obj->b = 3;
+var_dump($obj);
+unset($obj->b);
+var_dump($obj);
+$obj->a = 2;
+var_dump($obj);
+$obj->b = 3;
+var_dump($obj);
+unset($obj->a, $obj->b);
+var_dump($obj);
diff --git a/hphp/test/slow/unset/1116.php b/hphp/test/slow/unset/1116.php
index 7a7a171d8..175d97f98 100644
--- a/hphp/test/slow/unset/1116.php
+++ b/hphp/test/slow/unset/1116.php
@@ -1,7 +1,21 @@
 <?php
 
- class X {  function __construct() { echo 'construct
-'; }  function __destruct() { echo 'destruct
-'; }}function test() {  $a = new X;  echo 'before unset
-';  unset($a);  echo 'after unset
-';}test();
\ No newline at end of file
+class X {
+  function __construct() {
+ echo 'construct
+';
+ }
+  function __destruct() {
+ echo 'destruct
+';
+ }
+}
+function test() {
+  $a = new X;
+  echo 'before unset
+';
+  unset($a);
+  echo 'after unset
+';
+}
+test();
diff --git a/hphp/test/slow/unset/1117.php b/hphp/test/slow/unset/1117.php
index 0e4e8ed08..48626fc6a 100644
--- a/hphp/test/slow/unset/1117.php
+++ b/hphp/test/slow/unset/1117.php
@@ -1,3 +1,9 @@
 <?php
 
- function foo() { return 42; }$a = foo();var_dump((unset)foo());var_dump((unset)$a);var_dump($a);
\ No newline at end of file
+function foo() {
+ return 42;
+ }
+$a = foo();
+var_dump((unset)foo());
+var_dump((unset)$a);
+var_dump($a);
diff --git a/hphp/test/slow/unset/1118.php b/hphp/test/slow/unset/1118.php
index cf4a8b440..7477213b9 100644
--- a/hphp/test/slow/unset/1118.php
+++ b/hphp/test/slow/unset/1118.php
@@ -1,10 +1,14 @@
 <?php
 
- function return_true() { return true; }
+function return_true() {
+ return true;
+ }
 function f(&$x, $y) {
   $x = $y;
   if (return_true())
     unset($x);
   $x = 0;
 }
-$myvar = 10;f($myvar, 30);var_dump($myvar);
\ No newline at end of file
+$myvar = 10;
+f($myvar, 30);
+var_dump($myvar);
diff --git a/hphp/test/slow/unset/1119.php b/hphp/test/slow/unset/1119.php
index ab645517d..4b7a3c2cf 100644
--- a/hphp/test/slow/unset/1119.php
+++ b/hphp/test/slow/unset/1119.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array(0, 1);
 $b = array(0, 1);
 $a[0] =& $b;
diff --git a/hphp/test/slow/unset/1120.php b/hphp/test/slow/unset/1120.php
index dfb20b338..bf3f698c9 100644
--- a/hphp/test/slow/unset/1120.php
+++ b/hphp/test/slow/unset/1120.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   public function foo() {
     unset($this);
@@ -16,7 +15,8 @@ function goo() {
   var_dump($this);
 }
 $obj = new A;
-$obj->foo(); 
+$obj->foo();
+
 $obj->bar();
 A::bar();
 goo();
diff --git a/hphp/test/slow/unset/1121.php b/hphp/test/slow/unset/1121.php
index 4dbcf5de5..cfe176a2a 100644
--- a/hphp/test/slow/unset/1121.php
+++ b/hphp/test/slow/unset/1121.php
@@ -1,3 +1,9 @@
 <?php
 
- function rmv($a, $b) { unset($a[$b]); return $a; }$a = array('foo');$b = array();var_dump(rmv($a, $b));
\ No newline at end of file
+function rmv($a, $b) {
+ unset($a[$b]);
+ return $a;
+ }
+$a = array('foo');
+$b = array();
+var_dump(rmv($a, $b));
diff --git a/hphp/test/slow/unset/1122.php b/hphp/test/slow/unset/1122.php
index 6b5677792..9bd2fc426 100644
--- a/hphp/test/slow/unset/1122.php
+++ b/hphp/test/slow/unset/1122.php
@@ -1,7 +1,7 @@
 <?php
 
-
-class cls {}
+class cls {
+}
 $obj = new cls;
 $a = array(1,2);
 unset($a[$obj]);
diff --git a/hphp/test/slow/unset/1123.php b/hphp/test/slow/unset/1123.php
index 061efa53a..81ba34891 100644
--- a/hphp/test/slow/unset/1123.php
+++ b/hphp/test/slow/unset/1123.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array(1,2);
 unset($a[1.5]);
 var_dump($a);
diff --git a/hphp/test/slow/unset/1124.php b/hphp/test/slow/unset/1124.php
index 9f09d9aa2..0ce87d01b 100644
--- a/hphp/test/slow/unset/1124.php
+++ b/hphp/test/slow/unset/1124.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array(1,2);
 unset($a[false]);
 var_dump($a);
diff --git a/hphp/test/slow/unset/1125.php b/hphp/test/slow/unset/1125.php
index 3b5b6c767..12f53147a 100644
--- a/hphp/test/slow/unset/1125.php
+++ b/hphp/test/slow/unset/1125.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array(1,2);
 unset($a[true]);
 var_dump($a);
diff --git a/hphp/test/slow/unset/1126.php b/hphp/test/slow/unset/1126.php
index 920cfe71d..634f2fd18 100644
--- a/hphp/test/slow/unset/1126.php
+++ b/hphp/test/slow/unset/1126.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $a = array(1,2, '' => 'foo');
 unset($a[null]);
 var_dump($a);
diff --git a/hphp/test/slow/useless_assignment/1739.php b/hphp/test/slow/useless_assignment/1739.php
index 39d6bd7c1..a3285fa5a 100644
--- a/hphp/test/slow/useless_assignment/1739.php
+++ b/hphp/test/slow/useless_assignment/1739.php
@@ -1,3 +1,24 @@
 <?php
 
- class MyDestructableClass {   function __construct() {       print "In constructor\n";       $this->name = "MyDestructableClass";   }   function __destruct() {       print "Destroying " . $this->name . "\n";   }}function foo($a) {  if ($a) return new MyDestructableClass();  return false;}function bar($a) {  if ($a) {    $obj = foo(1);    $obj = 1;    var_dump(2);  }  var_dump(1);}bar(1);
\ No newline at end of file
+class MyDestructableClass {
+   function __construct() {
+       print "In constructor\n";
+       $this->name = "MyDestructableClass";
+   }
+   function __destruct() {
+       print "Destroying " . $this->name . "\n";
+   }
+}
+function foo($a) {
+  if ($a) return new MyDestructableClass();
+  return false;
+}
+function bar($a) {
+  if ($a) {
+    $obj = foo(1);
+    $obj = 1;
+    var_dump(2);
+  }
+  var_dump(1);
+}
+bar(1);
diff --git a/hphp/test/slow/useless_assignment/1740.php b/hphp/test/slow/useless_assignment/1740.php
index ceaacedf2..3a5f6059e 100644
--- a/hphp/test/slow/useless_assignment/1740.php
+++ b/hphp/test/slow/useless_assignment/1740.php
@@ -1,3 +1,24 @@
 <?php
 
- class MyDestructableClass {   function __construct() {       print "In constructor\n";       $this->name = "MyDestructableClass";   }   function __destruct() {       print "Destroying " . $this->name . "\n";   }}function foo(&$a) {  $a = new MyDestructableClass();}function bar($a) {  if ($a) {    $b = array(1, 2, 3);    var_dump($b);    foo($dummy = array(1, 2, 3));    $c = array(1, 2, 3);    var_dump($c);  }}bar(1);
\ No newline at end of file
+class MyDestructableClass {
+   function __construct() {
+       print "In constructor\n";
+       $this->name = "MyDestructableClass";
+   }
+   function __destruct() {
+       print "Destroying " . $this->name . "\n";
+   }
+}
+function foo(&$a) {
+  $a = new MyDestructableClass();
+}
+function bar($a) {
+  if ($a) {
+    $b = array(1, 2, 3);
+    var_dump($b);
+    foo($dummy = array(1, 2, 3));
+    $c = array(1, 2, 3);
+    var_dump($c);
+  }
+}
+bar(1);
diff --git a/hphp/test/slow/useless_assignment/1741.php b/hphp/test/slow/useless_assignment/1741.php
index 764b108e6..cba5cec1f 100644
--- a/hphp/test/slow/useless_assignment/1741.php
+++ b/hphp/test/slow/useless_assignment/1741.php
@@ -1,3 +1,20 @@
 <?php
 
- function out($a) {  echo $a,'\n';}function test($a) {  $a ? out('?a') : out(':a');  $a ? out('+a') : 0;  $a ? 0 : out('-a');  $a && out('&&a');  $a || out('||a');  $a and out('and a');  $a or out('or a');  $b = $c = 0;  $a || (($b = 5) + ($c = 6));  out($b); out($c);}test(0);test('foo');
\ No newline at end of file
+function out($a) {
+  echo $a,'\n';
+}
+function test($a) {
+  $a ? out('?a') : out(':a');
+  $a ? out('+a') : 0;
+  $a ? 0 : out('-a');
+  $a && out('&&a');
+  $a || out('||a');
+  $a and out('and a');
+  $a or out('or a');
+  $b = $c = 0;
+  $a || (($b = 5) + ($c = 6));
+  out($b);
+ out($c);
+}
+test(0);
+test('foo');
diff --git a/hphp/test/slow/useless_assignment/1742.php b/hphp/test/slow/useless_assignment/1742.php
index a0db1a414..131f04eda 100644
--- a/hphp/test/slow/useless_assignment/1742.php
+++ b/hphp/test/slow/useless_assignment/1742.php
@@ -1,3 +1,19 @@
 <?php
 
- class A {  function __destruct() {    var_dump('done');  }}function foo() {  $a = 10;  if ($a == 11) {    return null;  }  return new A();}function bar() {  $a = foo();  var_dump('doing');}bar();
\ No newline at end of file
+class A {
+  function __destruct() {
+    var_dump('done');
+  }
+}
+function foo() {
+  $a = 10;
+  if ($a == 11) {
+    return null;
+  }
+  return new A();
+}
+function bar() {
+  $a = foo();
+  var_dump('doing');
+}
+bar();
diff --git a/hphp/test/slow/useless_assignment/1743.php b/hphp/test/slow/useless_assignment/1743.php
index 5556248bf..405d047e3 100644
--- a/hphp/test/slow/useless_assignment/1743.php
+++ b/hphp/test/slow/useless_assignment/1743.php
@@ -1,3 +1,20 @@
 <?php
 
- function foo($p) {  global $b;  for ($i = 0; $i < 5; $i++) {    if ($i > $p) {      $a = 10;    } else {      $a = &$b;    }  }}function bar() {  $a = foo(2);  var_dump($GLOBALS['b']);}bar();
\ No newline at end of file
+function foo($p) {
+  global $b;
+  for ($i = 0;
+ $i < 5;
+ $i++) {
+    if ($i > $p) {
+      $a = 10;
+    }
+ else {
+      $a = &$b;
+    }
+  }
+}
+function bar() {
+  $a = foo(2);
+  var_dump($GLOBALS['b']);
+}
+bar();
diff --git a/hphp/test/slow/useless_assignment/1744.php b/hphp/test/slow/useless_assignment/1744.php
index ff99732dd..d8f0eef51 100644
--- a/hphp/test/slow/useless_assignment/1744.php
+++ b/hphp/test/slow/useless_assignment/1744.php
@@ -1,3 +1,9 @@
 <?php
 
- function bar() {}function foo() {  $foo = bar();  unset($foo);}foo();
\ No newline at end of file
+function bar() {
+}
+function foo() {
+  $foo = bar();
+  unset($foo);
+}
+foo();
diff --git a/hphp/test/slow/useless_assignment/1745.php b/hphp/test/slow/useless_assignment/1745.php
index ebf5d13bb..0977bf885 100644
--- a/hphp/test/slow/useless_assignment/1745.php
+++ b/hphp/test/slow/useless_assignment/1745.php
@@ -1,3 +1,12 @@
 <?php
 
- function bug( $flag ) {  $tag = '';  if ($flag) {    $tag .= 'x';  }  $tag='33';  if ( $flag ) ; else var_dump($tag);}bug(false);
\ No newline at end of file
+function bug( $flag ) {
+  $tag = '';
+  if ($flag) {
+    $tag .= 'x';
+  }
+  $tag='33';
+  if ( $flag ) ;
+ else var_dump($tag);
+}
+bug(false);
diff --git a/hphp/test/slow/user_attributes/2196.php b/hphp/test/slow/user_attributes/2196.php
index a8d2239d5..b79626821 100644
--- a/hphp/test/slow/user_attributes/2196.php
+++ b/hphp/test/slow/user_attributes/2196.php
@@ -1,14 +1,21 @@
 <?php
 
-
 final class B {
-  final public function foo() { echo "B::foo\n"; }
-  final public static function bar() { echo "B::bar\n"; }
+  final public function foo() {
+ echo "B::foo\n";
+ }
+  final public static function bar() {
+ echo "B::bar\n";
+ }
 }
 << __MockClass >>
 class C extends B {
-  public function foo() { echo "C::foo\n"; }
-  public static function bar() { echo "C::bar\n"; }
+  public function foo() {
+ echo "C::foo\n";
+ }
+  public static function bar() {
+ echo "C::bar\n";
+ }
 }
 function test() {
   $obj = new C;
diff --git a/hphp/test/slow/user_attributes/2197.php b/hphp/test/slow/user_attributes/2197.php
index 7e812ab17..260e086c4 100644
--- a/hphp/test/slow/user_attributes/2197.php
+++ b/hphp/test/slow/user_attributes/2197.php
@@ -1,15 +1,22 @@
 <?php
 
-
-<< Foo1, Bar1(), Baz1('blah',array(1,2)) >> interface I {}
-<< Foo2, Bar2(), Baz2('blah',array(1,2)) >> trait T {}
-<< Foo3, Bar3(), Baz3('blah',array(1,2)) >> function f() {}
+<< Foo1, Bar1(), Baz1('blah',array(1,2)) >> interface I {
+}
+<< Foo2, Bar2(), Baz2('blah',array(1,2)) >> trait T {
+}
+<< Foo3, Bar3(), Baz3('blah',array(1,2)) >> function f() {
+}
 << Foo4, Bar4(), Baz4('blah',array(1,2)) >>
-function g() { yield null; }
+function g() {
+ yield null;
+ }
 class C {
   << Foo5, Bar5(), Baz5('blah',array(1,2)) >>
-  public function f() {}
+  public function f() {
+}
   << Foo6, Bar6(), Baz6('blah',array(1,2)) >>
-  public function g() { yield null; }
+  public function g() {
+ yield null;
+ }
 }
 echo "Done\n";
diff --git a/hphp/test/slow/user_attributes/2198.php b/hphp/test/slow/user_attributes/2198.php
index 1daefe87e..fac64da31 100644
--- a/hphp/test/slow/user_attributes/2198.php
+++ b/hphp/test/slow/user_attributes/2198.php
@@ -1,10 +1,10 @@
 <?php
 
-
 <<A(1),B('foo',array(42,73))>>
 class C {
   <<A(2),B('bar',array(43,74))>>
-  function f() {}
+  function f() {
+}
 }
 $rc = new ReflectionClass('C');
 $attrs = $rc->getAttributes();
@@ -16,7 +16,8 @@ ksort($attrs);
 var_dump($attrs);
 
 <<A(3),B('bar',array(44,75))>>
-function f() {}
+function f() {
+}
 $rf = new ReflectionFunction('f');
 $attrs = $rf->getAttributes();
 ksort($attrs);
diff --git a/hphp/test/slow/user_attributes/2199.php b/hphp/test/slow/user_attributes/2199.php
index 352517a31..edc312d6f 100644
--- a/hphp/test/slow/user_attributes/2199.php
+++ b/hphp/test/slow/user_attributes/2199.php
@@ -1,8 +1,8 @@
 <?php
 
-
 <<A(1)>>
-function f() {}
+function f() {
+}
 $rf = new ReflectionFunction('f');
 var_dump($rf->getAttribute('A'));
 var_dump($rf->getAttribute('B'));
diff --git a/hphp/test/slow/user_attributes/2200.php b/hphp/test/slow/user_attributes/2200.php
index 1f2cf817e..422304718 100644
--- a/hphp/test/slow/user_attributes/2200.php
+++ b/hphp/test/slow/user_attributes/2200.php
@@ -1,21 +1,26 @@
 <?php
 
-
 class A {
   <<W(1),X(2)>>
-  private function foo() {}
+  private function foo() {
+}
+}
+class B extends A {
 }
-class B extends A {}
 class C extends B {
   <<X(3),Y(4)>>
-  protected function foo() {}
+  protected function foo() {
+}
+}
+class D extends C {
 }
-class D extends C {}
 class E extends D {
   <<Y(5),Z(6)>>
-  public function foo() {}
+  public function foo() {
+}
+}
+class F extends E {
 }
-class F extends E {}
 
 $rm = new ReflectionMethod('F', 'foo');
 
diff --git a/hphp/test/slow/user_attributes/2201.php b/hphp/test/slow/user_attributes/2201.php
index 616037d18..a0eee9315 100644
--- a/hphp/test/slow/user_attributes/2201.php
+++ b/hphp/test/slow/user_attributes/2201.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function get_rf_for_method($fn, $class) {
   $rc = new ReflectionClass($class);
   return $rc->getMethod($fn);
@@ -10,7 +9,8 @@ function show($fn, $class=null) {
   $rf = null;
   if ($class) {
     $rf = get_rf_for_method($fn, $class);
-  } else {
+  }
+ else {
     $rf = new ReflectionFunction($fn);
   }
   $params = $rf->getParameters();
@@ -50,33 +50,46 @@ function doboth($fn, $class=null) {
 
 //------------------------
 
-function no_attrs($p1, $p2) {}
-function simple_attr(<<Attribute>> $param) {}
-function two_attrs(<<Attr1>> $p1, <<Attr2>> $p2) {}
+function no_attrs($p1, $p2) {
+}
+function simple_attr(<<Attribute>> $param) {
+}
+function two_attrs(<<Attr1>> $p1, <<Attr2>> $p2) {
+}
 
 class C {
-  public static function m(<<Attr(1,2,3)>> $param) {}
-  public static function n(<<Foo, Bar>> $param) {}
-  public function o(<<Hi('bye')>> $param) {}
-  public function p(<<A('b', array('c', 'd')), E('fg')>> $param) {}
-  public function q(<<RS>> $tuv) {}
-  public function wxy(<<And_>> $z, <<NextTime>> $wont_you_sing_with_me) {}
+  public static function m(<<Attr(1,2,3)>> $param) {
+}
+  public static function n(<<Foo, Bar>> $param) {
+}
+  public function o(<<Hi('bye')>> $param) {
+}
+  public function p(<<A('b', array('c', 'd')), E('fg')>> $param) {
+}
+  public function q(<<RS>> $tuv) {
+}
+  public function wxy(<<And_>> $z, <<NextTime>> $wont_you_sing_with_me) {
+}
 }
 
 class D extends C {
   // Static functions shouldn't care about the parent class
-  public static function m($param) {}
+  public static function m($param) {
+}
 
   // TODO: should we include n, and should m's attrs inherit from C::m?
 
   // Changing the value of the attribute
-  public function o(<<Hi('hello')>> $param) {}
+  public function o(<<Hi('hello')>> $param) {
+}
 
   // Changing the name of the parameter
-  public function q($rstuv) {}
+  public function q($rstuv) {
+}
 
   // Adding an attribute and leaving one off
-  public function wxy(<<EnglishPeopleCallThisZed>> $z, $wont_you_sing_with_me) {}
+  public function wxy(<<EnglishPeopleCallThisZed>> $z, $wont_you_sing_with_me) {
+}
 }
 
 //------------------------
@@ -95,4 +108,4 @@ doboth('n', 'D');
 doboth('o', 'D');
 doboth('p', 'D');
 doboth('q', 'D');
-doboth('wxy', 'D');
\ No newline at end of file
+doboth('wxy', 'D');
diff --git a/hphp/test/slow/user_wrappers/1695.php b/hphp/test/slow/user_wrappers/1695.php
index fcfdd8869..399f087e8 100644
--- a/hphp/test/slow/user_wrappers/1695.php
+++ b/hphp/test/slow/user_wrappers/1695.php
@@ -1,3 +1,14 @@
 <?php
 
- class MyWrapper {  private $ctorRan = false;  public function __construct() {    $this->ctorRan = true;  }  public function stream_open($fn, $mode, $opt, &$opened_path) {    var_dump($this->ctorRan);    return true;  }}stream_wrapper_register('wrap', 'MyWrapper');fclose(fopen('wrap://test', 'r'));
\ No newline at end of file
+class MyWrapper {
+  private $ctorRan = false;
+  public function __construct() {
+    $this->ctorRan = true;
+  }
+  public function stream_open($fn, $mode, $opt, &$opened_path) {
+    var_dump($this->ctorRan);
+    return true;
+  }
+}
+stream_wrapper_register('wrap', 'MyWrapper');
+fclose(fopen('wrap://test', 'r'));
diff --git a/hphp/test/slow/user_wrappers/1696.php b/hphp/test/slow/user_wrappers/1696.php
index 126bb9936..2d576ed49 100644
--- a/hphp/test/slow/user_wrappers/1696.php
+++ b/hphp/test/slow/user_wrappers/1696.php
@@ -1,3 +1,12 @@
 <?php
 
- class PrivateWrapper {  private function stream_open($fn, $mode, $opt, &$opened_path) {    return true;  }  public static function openme() {    return fopen('pw://foo', 'r');  }}stream_wrapper_register('pw', 'PrivateWrapper');var_dump(is_resource(PrivateWrapper::openme()));
\ No newline at end of file
+class PrivateWrapper {
+  private function stream_open($fn, $mode, $opt, &$opened_path) {
+    return true;
+  }
+  public static function openme() {
+    return fopen('pw://foo', 'r');
+  }
+}
+stream_wrapper_register('pw', 'PrivateWrapper');
+var_dump(is_resource(PrivateWrapper::openme()));
diff --git a/hphp/test/slow/user_wrappers/1697.php b/hphp/test/slow/user_wrappers/1697.php
index 08217f4eb..08c53bbcb 100644
--- a/hphp/test/slow/user_wrappers/1697.php
+++ b/hphp/test/slow/user_wrappers/1697.php
@@ -1,3 +1,13 @@
 <?php
 
- class MagicStream {  public function __call($fname, $args) {    echo "Method: $fname\n";    if ($fname == 'stream_open') $args[2] &= ~4;    var_dump($args);    return true;  }}stream_wrapper_register('magic', 'MagicStream');$fp = fopen('magic://stream-via-call', 'r');fclose($fp);
\ No newline at end of file
+class MagicStream {
+  public function __call($fname, $args) {
+    echo "Method: $fname\n";
+    if ($fname == 'stream_open') $args[2] &= ~4;
+    var_dump($args);
+    return true;
+  }
+}
+stream_wrapper_register('magic', 'MagicStream');
+$fp = fopen('magic://stream-via-call', 'r');
+fclose($fp);
diff --git a/hphp/test/slow/user_wrappers/1698.php b/hphp/test/slow/user_wrappers/1698.php
index 7cb98295f..4d01210a4 100644
--- a/hphp/test/slow/user_wrappers/1698.php
+++ b/hphp/test/slow/user_wrappers/1698.php
@@ -1,3 +1,21 @@
 <?php
 
- class TestStream {  private $s = 0;  function stream_open($path, $mode, $options, &$opened_path) {    return true;  }  function stream_read($count) {    if ($this->s++ == 0)      return "a\n";    return '';  }  function stream_eof() {    return $this->s >= 2;  }}stream_wrapper_register('test', 'TestStream');$f = fopen('test://', 'r');while (!feof($f)) {  $line = stream_get_line($f, 99, "\n");  var_dump($line);}
\ No newline at end of file
+class TestStream {
+  private $s = 0;
+  function stream_open($path, $mode, $options, &$opened_path) {
+    return true;
+  }
+  function stream_read($count) {
+    if ($this->s++ == 0)      return "a\n";
+    return '';
+  }
+  function stream_eof() {
+    return $this->s >= 2;
+  }
+}
+stream_wrapper_register('test', 'TestStream');
+$f = fopen('test://', 'r');
+while (!feof($f)) {
+  $line = stream_get_line($f, 99, "\n");
+  var_dump($line);
+}
diff --git a/hphp/test/slow/user_wrappers/1699.php b/hphp/test/slow/user_wrappers/1699.php
index 654215392..3a5f16836 100644
--- a/hphp/test/slow/user_wrappers/1699.php
+++ b/hphp/test/slow/user_wrappers/1699.php
@@ -1,3 +1,36 @@
 <?php
 
- class TestStream {  private $lines = array();  private $s = 0;  private $eofth = 3;  function stream_open($path, $mode, $options, &$opened_path) {    $this->lines[] = "a\n";    $this->lines[] = ($path == 'test://nonempty2nd' ? "b\n" : "\n");    if ($path == 'test://eofafter2nd')      $this->eofth = 2;    return true;  }  function stream_read($count) {    if (key_exists($this->s++, $this->lines))      return $this->lines[$this->s - 1];    return '';  }  function stream_eof() {    return $this->s >= $this->eofth;  }}stream_wrapper_register('test', 'TestStream');$f = fopen('test://nonempty2nd', 'r');while (!feof($f)) {  $line = stream_get_line($f, 99, "\n");  var_dump($line);}$f = fopen('test://', 'r');while (!feof($f)) {  $line = stream_get_line($f, 99, "\n");  var_dump($line);}$f = fopen('test://eofafter2nd', 'r');while (!feof($f)) {  $line = stream_get_line($f, 99, "\n");  var_dump($line);}
\ No newline at end of file
+class TestStream {
+  private $lines = array();
+  private $s = 0;
+  private $eofth = 3;
+  function stream_open($path, $mode, $options, &$opened_path) {
+    $this->lines[] = "a\n";
+    $this->lines[] = ($path == 'test://nonempty2nd' ? "b\n" : "\n");
+    if ($path == 'test://eofafter2nd')      $this->eofth = 2;
+    return true;
+  }
+  function stream_read($count) {
+    if (key_exists($this->s++, $this->lines))      return $this->lines[$this->s - 1];
+    return '';
+  }
+  function stream_eof() {
+    return $this->s >= $this->eofth;
+  }
+}
+stream_wrapper_register('test', 'TestStream');
+$f = fopen('test://nonempty2nd', 'r');
+while (!feof($f)) {
+  $line = stream_get_line($f, 99, "\n");
+  var_dump($line);
+}
+$f = fopen('test://', 'r');
+while (!feof($f)) {
+  $line = stream_get_line($f, 99, "\n");
+  var_dump($line);
+}
+$f = fopen('test://eofafter2nd', 'r');
+while (!feof($f)) {
+  $line = stream_get_line($f, 99, "\n");
+  var_dump($line);
+}
diff --git a/hphp/test/slow/user_wrappers/1700.php b/hphp/test/slow/user_wrappers/1700.php
index f1b7e8c4c..2602fcc6c 100644
--- a/hphp/test/slow/user_wrappers/1700.php
+++ b/hphp/test/slow/user_wrappers/1700.php
@@ -1,3 +1,37 @@
 <?php
 
- class FifoStream {  private $data;  function stream_open($filename, $mode, $options, &$opened_path) {    echo "Open\n";    var_dump($filename, $mode, $options & USE_INCLUDE_PATH);    return true;  }  function stream_write($buf) { $this->data .= $buf; }  function stream_read($count) {    $chunk = substr($this->data, 0, $count);    $this->data = substr($this->data, $count);    return $chunk;  }  function stream_eof() { return strlen($this->data) == 0; }  function stream_flush() { $this->data = ''; }  function stream_close() { echo "Close\n"; }}var_dump(stream_wrapper_register('fifo', 'FifoStream'));$fp = fopen('fifo://testing', 'w+');var_dump(fwrite($fp, "Data one...\n"));fflush($fp);var_dump(fwrite($fp, "Data two...\n"));var_dump(fwrite($fp, "Data three...\n"));while(!feof($fp)) {  var_dump(fgets($fp));}fclose($fp);
\ No newline at end of file
+class FifoStream {
+  private $data;
+  function stream_open($filename, $mode, $options, &$opened_path) {
+    echo "Open\n";
+    var_dump($filename, $mode, $options & USE_INCLUDE_PATH);
+    return true;
+  }
+  function stream_write($buf) {
+ $this->data .= $buf;
+ }
+  function stream_read($count) {
+    $chunk = substr($this->data, 0, $count);
+    $this->data = substr($this->data, $count);
+    return $chunk;
+  }
+  function stream_eof() {
+ return strlen($this->data) == 0;
+ }
+  function stream_flush() {
+ $this->data = '';
+ }
+  function stream_close() {
+ echo "Close\n";
+ }
+}
+var_dump(stream_wrapper_register('fifo', 'FifoStream'));
+$fp = fopen('fifo://testing', 'w+');
+var_dump(fwrite($fp, "Data one...\n"));
+fflush($fp);
+var_dump(fwrite($fp, "Data two...\n"));
+var_dump(fwrite($fp, "Data three...\n"));
+while(!feof($fp)) {
+  var_dump(fgets($fp));
+}
+fclose($fp);
diff --git a/hphp/test/slow/user_wrappers/1701.php b/hphp/test/slow/user_wrappers/1701.php
index 73976a693..51b4b019a 100644
--- a/hphp/test/slow/user_wrappers/1701.php
+++ b/hphp/test/slow/user_wrappers/1701.php
@@ -1,3 +1,37 @@
 <?php
 
- class MemoryStream {  private $data;  private $ofs = 0;  function stream_open($filename, $mode, $options, &$opened_path) {    if (strncmp($filename, "mem://", 6)) { return false; }    $this->data = substr($filename, 6);    return true;  }  function stream_read($count) {    $ret = substr($this->data, $this->ofs, $count);    $this->ofs += $count;    if ($this->ofs > strlen($this->data))      $this->ofs = strlen($this->data);    return $ret;  }  function stream_seek($ofs, $whence) {    if ($whence == SEEK_CUR) $this->ofs += $ofs;    if ($whence == SEEK_SET) $this->ofs  = $ofs;    if ($whence == SEEK_END) $this->ofs  = strlen($this->data) + $ofs;    if ($this->ofs < 0) $this->ofs = 0;    if ($this->ofs > strlen($this->data))      $this->ofs = strlen($this->data);    return true;  }  function stream_tell() { return $this->ofs; }}stream_wrapper_register('mem', 'MemoryStream');$fp = fopen('mem://abcdefghijklmnopqrstuvwxyz', 'r');var_dump(fgetc($fp), fgetc($fp));fseek($fp, 11, SEEK_CUR);var_dump(fgetc($fp), fgetc($fp));fseek($fp, 0, SEEK_END);var_dump(ftell($fp));
\ No newline at end of file
+class MemoryStream {
+  private $data;
+  private $ofs = 0;
+  function stream_open($filename, $mode, $options, &$opened_path) {
+    if (strncmp($filename, "mem://", 6)) {
+ return false;
+ }
+    $this->data = substr($filename, 6);
+    return true;
+  }
+  function stream_read($count) {
+    $ret = substr($this->data, $this->ofs, $count);
+    $this->ofs += $count;
+    if ($this->ofs > strlen($this->data))      $this->ofs = strlen($this->data);
+    return $ret;
+  }
+  function stream_seek($ofs, $whence) {
+    if ($whence == SEEK_CUR) $this->ofs += $ofs;
+    if ($whence == SEEK_SET) $this->ofs  = $ofs;
+    if ($whence == SEEK_END) $this->ofs  = strlen($this->data) + $ofs;
+    if ($this->ofs < 0) $this->ofs = 0;
+    if ($this->ofs > strlen($this->data))      $this->ofs = strlen($this->data);
+    return true;
+  }
+  function stream_tell() {
+ return $this->ofs;
+ }
+}
+stream_wrapper_register('mem', 'MemoryStream');
+$fp = fopen('mem://abcdefghijklmnopqrstuvwxyz', 'r');
+var_dump(fgetc($fp), fgetc($fp));
+fseek($fp, 11, SEEK_CUR);
+var_dump(fgetc($fp), fgetc($fp));
+fseek($fp, 0, SEEK_END);
+var_dump(ftell($fp));
diff --git a/hphp/test/slow/var_export/1449.php b/hphp/test/slow/var_export/1449.php
index a819de53d..fc0bf3ebc 100644
--- a/hphp/test/slow/var_export/1449.php
+++ b/hphp/test/slow/var_export/1449.php
@@ -1,3 +1,287 @@
 <?php
 
- var_export(!null);var_export(!true);var_export(!false);var_export(!0);var_export(!1);var_export(!1.2);var_export(!"");var_export(!"0");var_export(!"1");var_export(!"1.2");var_export(!'');var_export(!'0');var_export(!'1');var_export(!'1.2');var_export(!__LINE__);var_export(!__FUNCTION__);var_export(!0x10);var_export(!010);var_export(!"0x10");var_export(!"010");var_export(+null);var_export(+true);var_export(+false);var_export(+0);var_export(+1);var_export(+1.2);var_export(+"");var_export(+"0");var_export(+"1");var_export(+"1.2");var_export(+'');var_export(+'0');var_export(+'1');var_export(+'1.2');var_export(+__LINE__);var_export(+__FUNCTION__);var_export(+0x10);var_export(+010);var_export(+"0x10");var_export(+"010");var_export(-null);var_export(-true);var_export(-false);var_export(-0);var_export(-1);var_export(-1.2);var_export(-"");var_export(-"0");var_export(-"1");var_export(-"1.2");var_export(-'');var_export(-'0');var_export(-'1');var_export(-'1.2');var_export(-__LINE__);var_export(-__FUNCTION__);var_export(-0x10);var_export(-010);var_export(-"0x10");var_export(-"010");var_export(~0);var_export(~1);var_export(~1.2);var_export(~"");var_export(~"0");var_export(~"1");var_export(~"1.2");var_export(~'');var_export(~'0');var_export(~'1');var_export(~'1.2');var_export(~__LINE__);var_export(~__FUNCTION__);var_export(~0x10);var_export(~010);var_export(~"0x10");var_export(~"010");var_export((null));var_export((true));var_export((false));var_export((0));var_export((1));var_export((1.2));var_export((""));var_export(("0"));var_export(("1"));var_export(("1.2"));var_export((''));var_export(('0'));var_export(('1'));var_export(('1.2'));var_export((__LINE__));var_export((__FUNCTION__));var_export((0x10));var_export((010));var_export(("0x10"));var_export(("010"));var_export((int)null);var_export((int)true);var_export((int)false);var_export((int)0);var_export((int)1);var_export((int)1.2);var_export((int)"");var_export((int)"0");var_export((int)"1");var_export((int)"1.2");var_export((int)'');var_export((int)'0');var_export((int)'1');var_export((int)'1.2');var_export((int)__LINE__);var_export((int)__FUNCTION__);var_export((int)0x10);var_export((int)010);var_export((int)"0x10");var_export((int)"010");var_export((integer)null);var_export((integer)true);var_export((integer)false);var_export((integer)0);var_export((integer)1);var_export((integer)1.2);var_export((integer)"");var_export((integer)"0");var_export((integer)"1");var_export((integer)"1.2");var_export((integer)'');var_export((integer)'0');var_export((integer)'1');var_export((integer)'1.2');var_export((integer)__LINE__);var_export((integer)__FUNCTION__);var_export((integer)0x10);var_export((integer)010);var_export((integer)"0x10");var_export((integer)"010");var_export((bool)null);var_export((bool)true);var_export((bool)false);var_export((bool)0);var_export((bool)1);var_export((bool)1.2);var_export((bool)"");var_export((bool)"0");var_export((bool)"1");var_export((bool)"1.2");var_export((bool)'');var_export((bool)'0');var_export((bool)'1');var_export((bool)'1.2');var_export((bool)__LINE__);var_export((bool)__FUNCTION__);var_export((bool)0x10);var_export((bool)010);var_export((bool)"0x10");var_export((bool)"010");var_export((boolean)null);var_export((boolean)true);var_export((boolean)false);var_export((boolean)0);var_export((boolean)1);var_export((boolean)1.2);var_export((boolean)"");var_export((boolean)"0");var_export((boolean)"1");var_export((boolean)"1.2");var_export((boolean)'');var_export((boolean)'0');var_export((boolean)'1');var_export((boolean)'1.2');var_export((boolean)__LINE__);var_export((boolean)__FUNCTION__);var_export((boolean)0x10);var_export((boolean)010);var_export((boolean)"0x10");var_export((boolean)"010");var_export((float)null);var_export((float)true);var_export((float)false);var_export((float)0);var_export((float)1);var_export((float)1.2);var_export((float)"");var_export((float)"0");var_export((float)"1");var_export((float)"1.2");var_export((float)'');var_export((float)'0');var_export((float)'1');var_export((float)'1.2');var_export((float)__LINE__);var_export((float)__FUNCTION__);var_export((float)0x10);var_export((float)010);var_export((float)"0x10");var_export((float)"010");var_export((double)null);var_export((double)true);var_export((double)false);var_export((double)0);var_export((double)1);var_export((double)1.2);var_export((double)"");var_export((double)"0");var_export((double)"1");var_export((double)"1.2");var_export((double)'');var_export((double)'0');var_export((double)'1');var_export((double)'1.2');var_export((double)__LINE__);var_export((double)__FUNCTION__);var_export((double)0x10);var_export((double)010);var_export((double)"0x10");var_export((double)"010");var_export((real)null);var_export((real)true);var_export((real)false);var_export((real)0);var_export((real)1);var_export((real)1.2);var_export((real)"");var_export((real)"0");var_export((real)"1");var_export((real)"1.2");var_export((real)'');var_export((real)'0');var_export((real)'1');var_export((real)'1.2');var_export((real)__LINE__);var_export((real)__FUNCTION__);var_export((real)0x10);var_export((real)010);var_export((real)"0x10");var_export((real)"010");var_export((string)null);var_export((string)true);var_export((string)false);var_export((string)0);var_export((string)1);var_export((string)1.2);var_export((string)"");var_export((string)"0");var_export((string)"1");var_export((string)"1.2");var_export((string)'');var_export((string)'0');var_export((string)'1');var_export((string)'1.2');var_export((string)__LINE__);var_export((string)__FUNCTION__);var_export((string)0x10);var_export((string)010);var_export((string)"0x10");var_export((string)"010");var_export(1.7e+319);var_export(!1.7e+319);var_export(+1.7e+319);var_export(-1.7e+319);var_export(~1.7e+319);var_export((1.7e+319));var_export((int)1.7e+319);var_export((integer)1.7e+319);var_export((bool)1.7e+319);var_export((boolean)1.7e+319);var_export((float)1.7e+319);var_export((double)1.7e+319);var_export((real)1.7e+319);var_export((string)1.7e+319);var_export("1.7e+319");var_export(!"1.7e+319");var_export(+"1.7e+319");var_export(-"1.7e+319");var_export(~"1.7e+319");var_export(("1.7e+319"));var_export((int)"1.7e+319");var_export((integer)"1.7e+319");var_export((bool)"1.7e+319");var_export((boolean)"1.7e+319");var_export((float)"1.7e+319");var_export((double)"1.7e+319");var_export((real)"1.7e+319");var_export((string)"1.7e+319");
\ No newline at end of file
+var_export(!null);
+var_export(!true);
+var_export(!false);
+var_export(!0);
+var_export(!1);
+var_export(!1.2);
+var_export(!"");
+var_export(!"0");
+var_export(!"1");
+var_export(!"1.2");
+var_export(!'');
+var_export(!'0');
+var_export(!'1');
+var_export(!'1.2');
+var_export(!__LINE__);
+var_export(!__FUNCTION__);
+var_export(!0x10);
+var_export(!010);
+var_export(!"0x10");
+var_export(!"010");
+var_export(+null);
+var_export(+true);
+var_export(+false);
+var_export(+0);
+var_export(+1);
+var_export(+1.2);
+var_export(+"");
+var_export(+"0");
+var_export(+"1");
+var_export(+"1.2");
+var_export(+'');
+var_export(+'0');
+var_export(+'1');
+var_export(+'1.2');
+var_export(+__LINE__);
+var_export(+__FUNCTION__);
+var_export(+0x10);
+var_export(+010);
+var_export(+"0x10");
+var_export(+"010");
+var_export(-null);
+var_export(-true);
+var_export(-false);
+var_export(-0);
+var_export(-1);
+var_export(-1.2);
+var_export(-"");
+var_export(-"0");
+var_export(-"1");
+var_export(-"1.2");
+var_export(-'');
+var_export(-'0');
+var_export(-'1');
+var_export(-'1.2');
+var_export(-__LINE__);
+var_export(-__FUNCTION__);
+var_export(-0x10);
+var_export(-010);
+var_export(-"0x10");
+var_export(-"010");
+var_export(~0);
+var_export(~1);
+var_export(~1.2);
+var_export(~"");
+var_export(~"0");
+var_export(~"1");
+var_export(~"1.2");
+var_export(~'');
+var_export(~'0');
+var_export(~'1');
+var_export(~'1.2');
+var_export(~__LINE__);
+var_export(~__FUNCTION__);
+var_export(~0x10);
+var_export(~010);
+var_export(~"0x10");
+var_export(~"010");
+var_export((null));
+var_export((true));
+var_export((false));
+var_export((0));
+var_export((1));
+var_export((1.2));
+var_export((""));
+var_export(("0"));
+var_export(("1"));
+var_export(("1.2"));
+var_export((''));
+var_export(('0'));
+var_export(('1'));
+var_export(('1.2'));
+var_export((__LINE__));
+var_export((__FUNCTION__));
+var_export((0x10));
+var_export((010));
+var_export(("0x10"));
+var_export(("010"));
+var_export((int)null);
+var_export((int)true);
+var_export((int)false);
+var_export((int)0);
+var_export((int)1);
+var_export((int)1.2);
+var_export((int)"");
+var_export((int)"0");
+var_export((int)"1");
+var_export((int)"1.2");
+var_export((int)'');
+var_export((int)'0');
+var_export((int)'1');
+var_export((int)'1.2');
+var_export((int)__LINE__);
+var_export((int)__FUNCTION__);
+var_export((int)0x10);
+var_export((int)010);
+var_export((int)"0x10");
+var_export((int)"010");
+var_export((integer)null);
+var_export((integer)true);
+var_export((integer)false);
+var_export((integer)0);
+var_export((integer)1);
+var_export((integer)1.2);
+var_export((integer)"");
+var_export((integer)"0");
+var_export((integer)"1");
+var_export((integer)"1.2");
+var_export((integer)'');
+var_export((integer)'0');
+var_export((integer)'1');
+var_export((integer)'1.2');
+var_export((integer)__LINE__);
+var_export((integer)__FUNCTION__);
+var_export((integer)0x10);
+var_export((integer)010);
+var_export((integer)"0x10");
+var_export((integer)"010");
+var_export((bool)null);
+var_export((bool)true);
+var_export((bool)false);
+var_export((bool)0);
+var_export((bool)1);
+var_export((bool)1.2);
+var_export((bool)"");
+var_export((bool)"0");
+var_export((bool)"1");
+var_export((bool)"1.2");
+var_export((bool)'');
+var_export((bool)'0');
+var_export((bool)'1');
+var_export((bool)'1.2');
+var_export((bool)__LINE__);
+var_export((bool)__FUNCTION__);
+var_export((bool)0x10);
+var_export((bool)010);
+var_export((bool)"0x10");
+var_export((bool)"010");
+var_export((boolean)null);
+var_export((boolean)true);
+var_export((boolean)false);
+var_export((boolean)0);
+var_export((boolean)1);
+var_export((boolean)1.2);
+var_export((boolean)"");
+var_export((boolean)"0");
+var_export((boolean)"1");
+var_export((boolean)"1.2");
+var_export((boolean)'');
+var_export((boolean)'0');
+var_export((boolean)'1');
+var_export((boolean)'1.2');
+var_export((boolean)__LINE__);
+var_export((boolean)__FUNCTION__);
+var_export((boolean)0x10);
+var_export((boolean)010);
+var_export((boolean)"0x10");
+var_export((boolean)"010");
+var_export((float)null);
+var_export((float)true);
+var_export((float)false);
+var_export((float)0);
+var_export((float)1);
+var_export((float)1.2);
+var_export((float)"");
+var_export((float)"0");
+var_export((float)"1");
+var_export((float)"1.2");
+var_export((float)'');
+var_export((float)'0');
+var_export((float)'1');
+var_export((float)'1.2');
+var_export((float)__LINE__);
+var_export((float)__FUNCTION__);
+var_export((float)0x10);
+var_export((float)010);
+var_export((float)"0x10");
+var_export((float)"010");
+var_export((double)null);
+var_export((double)true);
+var_export((double)false);
+var_export((double)0);
+var_export((double)1);
+var_export((double)1.2);
+var_export((double)"");
+var_export((double)"0");
+var_export((double)"1");
+var_export((double)"1.2");
+var_export((double)'');
+var_export((double)'0');
+var_export((double)'1');
+var_export((double)'1.2');
+var_export((double)__LINE__);
+var_export((double)__FUNCTION__);
+var_export((double)0x10);
+var_export((double)010);
+var_export((double)"0x10");
+var_export((double)"010");
+var_export((real)null);
+var_export((real)true);
+var_export((real)false);
+var_export((real)0);
+var_export((real)1);
+var_export((real)1.2);
+var_export((real)"");
+var_export((real)"0");
+var_export((real)"1");
+var_export((real)"1.2");
+var_export((real)'');
+var_export((real)'0');
+var_export((real)'1');
+var_export((real)'1.2');
+var_export((real)__LINE__);
+var_export((real)__FUNCTION__);
+var_export((real)0x10);
+var_export((real)010);
+var_export((real)"0x10");
+var_export((real)"010");
+var_export((string)null);
+var_export((string)true);
+var_export((string)false);
+var_export((string)0);
+var_export((string)1);
+var_export((string)1.2);
+var_export((string)"");
+var_export((string)"0");
+var_export((string)"1");
+var_export((string)"1.2");
+var_export((string)'');
+var_export((string)'0');
+var_export((string)'1');
+var_export((string)'1.2');
+var_export((string)__LINE__);
+var_export((string)__FUNCTION__);
+var_export((string)0x10);
+var_export((string)010);
+var_export((string)"0x10");
+var_export((string)"010");
+var_export(1.7e+319);
+var_export(!1.7e+319);
+var_export(+1.7e+319);
+var_export(-1.7e+319);
+var_export(~1.7e+319);
+var_export((1.7e+319));
+var_export((int)1.7e+319);
+var_export((integer)1.7e+319);
+var_export((bool)1.7e+319);
+var_export((boolean)1.7e+319);
+var_export((float)1.7e+319);
+var_export((double)1.7e+319);
+var_export((real)1.7e+319);
+var_export((string)1.7e+319);
+var_export("1.7e+319");
+var_export(!"1.7e+319");
+var_export(+"1.7e+319");
+var_export(-"1.7e+319");
+var_export(~"1.7e+319");
+var_export(("1.7e+319"));
+var_export((int)"1.7e+319");
+var_export((integer)"1.7e+319");
+var_export((bool)"1.7e+319");
+var_export((boolean)"1.7e+319");
+var_export((float)"1.7e+319");
+var_export((double)"1.7e+319");
+var_export((real)"1.7e+319");
+var_export((string)"1.7e+319");
diff --git a/hphp/test/slow/var_export/1449.php.expect b/hphp/test/slow/var_export/1449.php.expect
index 7cc3bf376..3b153c3d0 100644
--- a/hphp/test/slow/var_export/1449.php.expect
+++ b/hphp/test/slow/var_export/1449.php.expect
@@ -1 +1 @@
-truefalsetruetruefalsefalsetruetruefalsefalsetruetruefalsefalsefalsetruefalsefalsefalsefalse010011.20011.20011.23016816100-100-1-1.200-1-1.200-1-1.2-30-16-8-16-10-1-2-2'''Ï''Î''ÎÑÍ''''Ï''Î''ÎÑÍ'-4''-17-9'χÎÏ''ÏÎÏ'NULLtruefalse011.2'''0''1''1.2''''0''1''1.2'3''168'0x10''010'01001100110011301680100100110011001130168010falsetruefalsefalsetruetruefalsefalsetruetruefalsefalsetruetruetruefalsetruetruetruetruefalsetruefalsefalsetruetruefalsefalsetruetruefalsefalsetruetruetruefalsetruetruetruetrue010011.20011.20011.230168010010011.20011.20011.230168010010011.20011.20011.230168010'''1''''0''1''1.2''''0''1''1.2''''0''1''1.2''3''''16''8''0x10''010'INFfalseINF-INF-1INF00truetrueINFINFINF'INF''1.7e+319'falseINF-INF'ÎÑÈšÔÌÎÆ''1.7e+319'11truetrueINFINFINF'1.7e+319'
\ No newline at end of file
+truefalsetruetruefalsefalsetruetruefalsefalsetruetruefalsefalsefalsetruefalsefalsefalsefalse010011.20011.20011.237016816100-100-1-1.200-1-1.200-1-1.2-570-16-8-16-10-1-2-2'''Ï''Î''ÎÑÍ''''Ï''Î''ÎÑÍ'-75''-17-9'χÎÏ''ÏÎÏ'NULLtruefalse011.2'''0''1''1.2''''0''1''1.2'94''168'0x10''010'010011001100111140168010010011001100111340168010falsetruefalsefalsetruetruefalsefalsetruetruefalsefalsetruetruetruefalsetruetruetruetruefalsetruefalsefalsetruetruefalsefalsetruetruefalsefalsetruetruetruefalsetruetruetruetrue010011.20011.20011.21940168010010011.20011.20011.22140168010010011.20011.20011.22340168010'''1''''0''1''1.2''''0''1''1.2''''0''1''1.2''254''''16''8''0x10''010'INFfalseINF-INF-1INF00truetrueINFINFINF'INF''1.7e+319'falseINF-INF'ÎÑÈšÔÌÎÆ''1.7e+319'11truetrueINFINFINF'1.7e+319'
\ No newline at end of file
diff --git a/hphp/test/slow/var_export/1450.php b/hphp/test/slow/var_export/1450.php
index d04050cb6..4701366b1 100644
--- a/hphp/test/slow/var_export/1450.php
+++ b/hphp/test/slow/var_export/1450.php
@@ -1,3 +1,54 @@
 <?php
 
- var_export(array("\0" => 1));var_export(array("\0" => "\0"));var_export(array("\0" => "\\"));var_export(array("\0" => "\'"));var_export(array("\\" => 1));var_export(array("\\" => "\0"));var_export(array("\\" => "\\"));var_export(array("\\" => "\'"));var_export(array("\'" => 1));var_export(array("\'" => "\0"));var_export(array("\'" => "\\"));var_export(array("\'" => "\'"));var_export(array("\a" => "\a"));var_export(!array("\0" => "\0"));var_export((array("\0" => "\0")));var_export((int)array("\0" => "\0"));var_export((integer)array("\0" => "\0"));var_export((bool)array("\0" => "\0"));var_export((boolean)array("\0" => "\0"));var_export((float)array("\0" => "\0"));var_export((double)array("\0" => "\0"));var_export((real)array("\0" => "\0"));var_export((string)array("\0" => "\0"));$a = "0x10";var_export($a);var_export("\0");$a = array("\0" => 1);var_export($a);$a = array("\0" => "\0");var_export($a);$a = array("\0" => "\\");var_export($a);$a = array("\0" => "\'");var_export($a);$a = array("\\" => 1);var_export($a);$a = array("\\" => "\0");var_export($a);$a = array("\\" => "\\");var_export($a);$a = array("\\" => "\'");var_export($a);$a = array("\'" => 1);var_export($a);$a = array("\'" => "\0");var_export($a);$a = array("\'" => "\\");var_export($a);$a = array("\'" => "\'");var_export($a);$a = array("\a" => "\a");var_export($a);
\ No newline at end of file
+var_export(array("\0" => 1));
+var_export(array("\0" => "\0"));
+var_export(array("\0" => "\\"));
+var_export(array("\0" => "\'"));
+var_export(array("\\" => 1));
+var_export(array("\\" => "\0"));
+var_export(array("\\" => "\\"));
+var_export(array("\\" => "\'"));
+var_export(array("\'" => 1));
+var_export(array("\'" => "\0"));
+var_export(array("\'" => "\\"));
+var_export(array("\'" => "\'"));
+var_export(array("\a" => "\a"));
+var_export(!array("\0" => "\0"));
+var_export((array("\0" => "\0")));
+var_export((int)array("\0" => "\0"));
+var_export((integer)array("\0" => "\0"));
+var_export((bool)array("\0" => "\0"));
+var_export((boolean)array("\0" => "\0"));
+var_export((float)array("\0" => "\0"));
+var_export((double)array("\0" => "\0"));
+var_export((real)array("\0" => "\0"));
+var_export((string)array("\0" => "\0"));
+$a = "0x10";
+var_export($a);
+var_export("\0");
+$a = array("\0" => 1);
+var_export($a);
+$a = array("\0" => "\0");
+var_export($a);
+$a = array("\0" => "\\");
+var_export($a);
+$a = array("\0" => "\'");
+var_export($a);
+$a = array("\\" => 1);
+var_export($a);
+$a = array("\\" => "\0");
+var_export($a);
+$a = array("\\" => "\\");
+var_export($a);
+$a = array("\\" => "\'");
+var_export($a);
+$a = array("\'" => 1);
+var_export($a);
+$a = array("\'" => "\0");
+var_export($a);
+$a = array("\'" => "\\");
+var_export($a);
+$a = array("\'" => "\'");
+var_export($a);
+$a = array("\a" => "\a");
+var_export($a);
diff --git a/hphp/test/slow/variable_argument/11.php b/hphp/test/slow/variable_argument/11.php
index 11b8c5efb..735e94dfa 100644
--- a/hphp/test/slow/variable_argument/11.php
+++ b/hphp/test/slow/variable_argument/11.php
@@ -1,3 +1,11 @@
 <?php
 
- function test() {   $n = func_num_args();   var_dump($n);  $args = func_get_args();  var_dump($args);} test(); test(1); test(1, 2);
\ No newline at end of file
+function test() {
+   $n = func_num_args();
+   var_dump($n);
+  $args = func_get_args();
+  var_dump($args);
+}
+ test();
+ test(1);
+ test(1, 2);
diff --git a/hphp/test/slow/variable_argument/12.php b/hphp/test/slow/variable_argument/12.php
index 84e1b510e..6d967860f 100644
--- a/hphp/test/slow/variable_argument/12.php
+++ b/hphp/test/slow/variable_argument/12.php
@@ -1,3 +1,7 @@
 <?php
 
- function test() {   var_dump(func_get_arg(0));  var_dump(func_get_arg(1));} test(2, 'ok');
\ No newline at end of file
+function test() {
+   var_dump(func_get_arg(0));
+  var_dump(func_get_arg(1));
+}
+ test(2, 'ok');
diff --git a/hphp/test/slow/variable_argument/13.php b/hphp/test/slow/variable_argument/13.php
index 73aad086b..8d7167b95 100644
--- a/hphp/test/slow/variable_argument/13.php
+++ b/hphp/test/slow/variable_argument/13.php
@@ -1,3 +1,11 @@
 <?php
 
- function test($a) {   $n = func_num_args();   var_dump($n);  $args = func_get_args();  var_dump($args);} test(1); test(1, 2); test(1, 2, 3);
\ No newline at end of file
+function test($a) {
+   $n = func_num_args();
+   var_dump($n);
+  $args = func_get_args();
+  var_dump($args);
+}
+ test(1);
+ test(1, 2);
+ test(1, 2, 3);
diff --git a/hphp/test/slow/variable_argument/14.php b/hphp/test/slow/variable_argument/14.php
index 5304e25fa..ed498c93f 100644
--- a/hphp/test/slow/variable_argument/14.php
+++ b/hphp/test/slow/variable_argument/14.php
@@ -1,3 +1,8 @@
 <?php
 
- function test($a) {   var_dump(func_get_arg(0));  var_dump(func_get_arg(1));  var_dump(func_get_arg(2));} test(2, 'ok', array(1));
\ No newline at end of file
+function test($a) {
+   var_dump(func_get_arg(0));
+  var_dump(func_get_arg(1));
+  var_dump(func_get_arg(2));
+}
+ test(2, 'ok', array(1));
diff --git a/hphp/test/slow/variable_argument/15.php b/hphp/test/slow/variable_argument/15.php
index df48584a9..c109a316e 100644
--- a/hphp/test/slow/variable_argument/15.php
+++ b/hphp/test/slow/variable_argument/15.php
@@ -1,3 +1,11 @@
 <?php
 
- function test($a, $b) {   $n = func_num_args();   var_dump($n);  $args = func_get_args();  var_dump($args);} test(1, 2); test(1, 2, 3); test(1, 2, 3, 4);
\ No newline at end of file
+function test($a, $b) {
+   $n = func_num_args();
+   var_dump($n);
+  $args = func_get_args();
+  var_dump($args);
+}
+ test(1, 2);
+ test(1, 2, 3);
+ test(1, 2, 3, 4);
diff --git a/hphp/test/slow/variable_argument/16.php b/hphp/test/slow/variable_argument/16.php
index 5e8bfe4ff..f5b274c4e 100644
--- a/hphp/test/slow/variable_argument/16.php
+++ b/hphp/test/slow/variable_argument/16.php
@@ -1,3 +1,9 @@
 <?php
 
- function test() {   var_dump(func_get_arg(0));  var_dump(func_get_arg(1));  var_dump(func_get_arg(2));  var_dump(func_get_arg(3));} test(2, 'ok', 0, 'test');
\ No newline at end of file
+function test() {
+   var_dump(func_get_arg(0));
+  var_dump(func_get_arg(1));
+  var_dump(func_get_arg(2));
+  var_dump(func_get_arg(3));
+}
+ test(2, 'ok', 0, 'test');
diff --git a/hphp/test/slow/variable_argument/17.php b/hphp/test/slow/variable_argument/17.php
index fd6369c9c..f502f05dc 100644
--- a/hphp/test/slow/variable_argument/17.php
+++ b/hphp/test/slow/variable_argument/17.php
@@ -1,3 +1,11 @@
 <?php
 
- function test($a) {   $n = func_num_args();   var_dump($n);  $args = func_get_args();  var_dump($args);} test('test'); test(1, 2); test(1, 2, 3);
\ No newline at end of file
+function test($a) {
+   $n = func_num_args();
+   var_dump($n);
+  $args = func_get_args();
+  var_dump($args);
+}
+ test('test');
+ test(1, 2);
+ test(1, 2, 3);
diff --git a/hphp/test/slow/variable_argument/18.php b/hphp/test/slow/variable_argument/18.php
index 8bcbc8f10..5ee2fcbf6 100644
--- a/hphp/test/slow/variable_argument/18.php
+++ b/hphp/test/slow/variable_argument/18.php
@@ -1,3 +1,11 @@
 <?php
 
- class A { public function test($a) {  var_dump(func_num_args());  var_dump(func_get_args());}} $obj = new A(); $obj->test('test'); $obj->test(1, 2, 3);
\ No newline at end of file
+class A {
+ public function test($a) {
+  var_dump(func_num_args());
+  var_dump(func_get_args());
+}
+}
+ $obj = new A();
+ $obj->test('test');
+ $obj->test(1, 2, 3);
diff --git a/hphp/test/slow/variable_argument/19.php b/hphp/test/slow/variable_argument/19.php
index 5f026455c..4874caea3 100644
--- a/hphp/test/slow/variable_argument/19.php
+++ b/hphp/test/slow/variable_argument/19.php
@@ -1,3 +1,10 @@
 <?php
 
- class A { public function __construct($a) {  var_dump(func_num_args());  var_dump(func_get_args());}} $obj = new A(1, 2, 3); $obj = new A('test');
\ No newline at end of file
+class A {
+ public function __construct($a) {
+  var_dump(func_num_args());
+  var_dump(func_get_args());
+}
+}
+ $obj = new A(1, 2, 3);
+ $obj = new A('test');
diff --git a/hphp/test/slow/variable_argument/20.php b/hphp/test/slow/variable_argument/20.php
index 98c145592..3b415a704 100644
--- a/hphp/test/slow/variable_argument/20.php
+++ b/hphp/test/slow/variable_argument/20.php
@@ -1,3 +1,9 @@
 <?php
 
- function test($a = 10) {   var_dump($a);  var_dump(func_get_args());} test(); test(1); test(1, 2);
\ No newline at end of file
+function test($a = 10) {
+   var_dump($a);
+  var_dump(func_get_args());
+}
+ test();
+ test(1);
+ test(1, 2);
diff --git a/hphp/test/slow/variable_argument/21.php b/hphp/test/slow/variable_argument/21.php
index 3e3c36e8d..92dc6b38a 100644
--- a/hphp/test/slow/variable_argument/21.php
+++ b/hphp/test/slow/variable_argument/21.php
@@ -1,3 +1,10 @@
 <?php
 
- function test($a, $b = 10) {   var_dump($a);  var_dump($b);  var_dump(func_get_args());} test(1); test(1, 2); test(1, 2, 3);
\ No newline at end of file
+function test($a, $b = 10) {
+   var_dump($a);
+  var_dump($b);
+  var_dump(func_get_args());
+}
+ test(1);
+ test(1, 2);
+ test(1, 2, 3);
diff --git a/hphp/test/slow/variable_argument/22.php b/hphp/test/slow/variable_argument/22.php
index 528ff3f8f..92cadbb0b 100644
--- a/hphp/test/slow/variable_argument/22.php
+++ b/hphp/test/slow/variable_argument/22.php
@@ -1,3 +1,6 @@
 <?php
 
- $ar1 = array(10, 100, 100, 0); $ar2 = array(1, 3, 2, 4);array_multisort($ar1, $ar2); var_dump($ar1, $ar2);
\ No newline at end of file
+$ar1 = array(10, 100, 100, 0);
+ $ar2 = array(1, 3, 2, 4);
+array_multisort($ar1, $ar2);
+ var_dump($ar1, $ar2);
diff --git a/hphp/test/slow/variable_argument/23.php b/hphp/test/slow/variable_argument/23.php
index 3369153d6..7eeff7959 100644
--- a/hphp/test/slow/variable_argument/23.php
+++ b/hphp/test/slow/variable_argument/23.php
@@ -1,3 +1,10 @@
 <?php
 
- class Foo {  public static function Add($x, $y) {}}$x = 0;if (!call_user_func(array('Foo', 'add'), $x, 0)) {  echo 'foo';}
\ No newline at end of file
+class Foo {
+  public static function Add($x, $y) {
+}
+}
+$x = 0;
+if (!call_user_func(array('Foo', 'add'), $x, 0)) {
+  echo 'foo';
+}
diff --git a/hphp/test/slow/variable_argument/24.php b/hphp/test/slow/variable_argument/24.php
index 37b28761c..7becc1623 100644
--- a/hphp/test/slow/variable_argument/24.php
+++ b/hphp/test/slow/variable_argument/24.php
@@ -1,3 +1,102 @@
 <?php
 
- function f1($a, $b) {  $c = func_num_args();  $args = func_get_args();  $args[0] = 5;  $args[1] = 6;  $args[2] = 7;  var_dump($c);  var_dump($args);}function f2($a, &$b) {  $c = func_num_args();  $args = func_get_args();  $args[0] = 5;  $args[1] = 6;  $args[2] = 7;  var_dump($c);  var_dump($args);}function f3(&$a, $b) {  $c = func_num_args();  $args = func_get_args();  $args[0] = 5;  $args[1] = 6;  $args[2] = 7;  var_dump($c);  var_dump($args);}function f4(&$a, &$b) {  $c = func_num_args();  $args = func_get_args();  var_dump($args);  $args[0] = 5;  $args[1] = 6;  $args[2] = 7;  var_dump($c);  var_dump($args);}function f5($a, $b) {  $arg0 = func_get_arg(0);  $arg1 = func_get_arg(1);  $arg2 = func_get_arg(2);  $arg0 = 5;  $arg1 = 6;  $arg2 = 7;  var_dump($arg0, $arg1, $arg2);}function f6($a, &$b) {  $arg0 = func_get_arg(0);  $arg1 = func_get_arg(1);  $arg2 = func_get_arg(2);  $arg0 = 5;  $arg1 = 6;  $arg2 = 7;  var_dump($arg0, $arg1, $arg2);}function f7(&$a, $b) {  $arg0 = func_get_arg(0);  $arg1 = func_get_arg(1);  $arg2 = func_get_arg(2);  $arg0 = 5;  $arg1 = 6;  $arg2 = 7;  var_dump($arg0, $arg1, $arg2);}function f8(&$a, &$b) {  $arg0 = func_get_arg(0);  $arg1 = func_get_arg(1);  $arg2 = func_get_arg(2);  $arg0 = 5;  $arg1 = 6;  $arg2 = 7;  var_dump($arg0, $arg1, $arg2);}function bar() {  $a = 1;  f1($a, $a, $a);  var_dump($a);  $a = 1;  f2($a, $a, $a);  var_dump($a);  $a = 1;  f3($a, $a, $a);  var_dump($a);  $a = 1;  f4($a, $a, $a);  var_dump($a);  $a = 1;  f5($a, $a, $a);  var_dump($a);  $a = 1;  f6($a, $a, $a);  var_dump($a);  $a = 1;  f7($a, $a, $a);  var_dump($a);  $a = 1;  f8($a, $a, $a);  var_dump($a);}bar();
\ No newline at end of file
+function f1($a, $b) {
+  $c = func_num_args();
+  $args = func_get_args();
+  $args[0] = 5;
+  $args[1] = 6;
+  $args[2] = 7;
+  var_dump($c);
+  var_dump($args);
+}
+function f2($a, &$b) {
+  $c = func_num_args();
+  $args = func_get_args();
+  $args[0] = 5;
+  $args[1] = 6;
+  $args[2] = 7;
+  var_dump($c);
+  var_dump($args);
+}
+function f3(&$a, $b) {
+  $c = func_num_args();
+  $args = func_get_args();
+  $args[0] = 5;
+  $args[1] = 6;
+  $args[2] = 7;
+  var_dump($c);
+  var_dump($args);
+}
+function f4(&$a, &$b) {
+  $c = func_num_args();
+  $args = func_get_args();
+  var_dump($args);
+  $args[0] = 5;
+  $args[1] = 6;
+  $args[2] = 7;
+  var_dump($c);
+  var_dump($args);
+}
+function f5($a, $b) {
+  $arg0 = func_get_arg(0);
+  $arg1 = func_get_arg(1);
+  $arg2 = func_get_arg(2);
+  $arg0 = 5;
+  $arg1 = 6;
+  $arg2 = 7;
+  var_dump($arg0, $arg1, $arg2);
+}
+function f6($a, &$b) {
+  $arg0 = func_get_arg(0);
+  $arg1 = func_get_arg(1);
+  $arg2 = func_get_arg(2);
+  $arg0 = 5;
+  $arg1 = 6;
+  $arg2 = 7;
+  var_dump($arg0, $arg1, $arg2);
+}
+function f7(&$a, $b) {
+  $arg0 = func_get_arg(0);
+  $arg1 = func_get_arg(1);
+  $arg2 = func_get_arg(2);
+  $arg0 = 5;
+  $arg1 = 6;
+  $arg2 = 7;
+  var_dump($arg0, $arg1, $arg2);
+}
+function f8(&$a, &$b) {
+  $arg0 = func_get_arg(0);
+  $arg1 = func_get_arg(1);
+  $arg2 = func_get_arg(2);
+  $arg0 = 5;
+  $arg1 = 6;
+  $arg2 = 7;
+  var_dump($arg0, $arg1, $arg2);
+}
+function bar() {
+  $a = 1;
+  f1($a, $a, $a);
+  var_dump($a);
+  $a = 1;
+  f2($a, $a, $a);
+  var_dump($a);
+  $a = 1;
+  f3($a, $a, $a);
+  var_dump($a);
+  $a = 1;
+  f4($a, $a, $a);
+  var_dump($a);
+  $a = 1;
+  f5($a, $a, $a);
+  var_dump($a);
+  $a = 1;
+  f6($a, $a, $a);
+  var_dump($a);
+  $a = 1;
+  f7($a, $a, $a);
+  var_dump($a);
+  $a = 1;
+  f8($a, $a, $a);
+  var_dump($a);
+}
+bar();
diff --git a/hphp/test/slow/variable_argument/25.php b/hphp/test/slow/variable_argument/25.php
index b63001915..336584241 100644
--- a/hphp/test/slow/variable_argument/25.php
+++ b/hphp/test/slow/variable_argument/25.php
@@ -1,3 +1,24 @@
 <?php
 
- class Y { function __destruct() { } };class X extends Y {  function __get($a) {    var_dump(func_get_args());    var_dump(func_get_arg(0));    var_dump(func_num_args());    return 42;  }  function __destruct() {    var_dump(func_get_args());    var_dump(func_get_arg(0));    var_dump(func_num_args());    return 2442;  }}$x = new X;var_dump($x->buz);unset($x);
\ No newline at end of file
+class Y {
+ function __destruct() {
+ }
+ }
+;
+class X extends Y {
+  function __get($a) {
+    var_dump(func_get_args());
+    var_dump(func_get_arg(0));
+    var_dump(func_num_args());
+    return 42;
+  }
+  function __destruct() {
+    var_dump(func_get_args());
+    var_dump(func_get_arg(0));
+    var_dump(func_num_args());
+    return 2442;
+  }
+}
+$x = new X;
+var_dump($x->buz);
+unset($x);
diff --git a/hphp/test/slow/variable_argument/26.php b/hphp/test/slow/variable_argument/26.php
index eb66fbb19..9c583d922 100644
--- a/hphp/test/slow/variable_argument/26.php
+++ b/hphp/test/slow/variable_argument/26.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f() {
   var_dump(func_get_args());
 }
diff --git a/hphp/test/slow/variable_argument/27.php b/hphp/test/slow/variable_argument/27.php
index 3bef5ff2a..b325e5093 100644
--- a/hphp/test/slow/variable_argument/27.php
+++ b/hphp/test/slow/variable_argument/27.php
@@ -1,13 +1,13 @@
 <?php
 
-
 function f() {
   var_dump(func_get_arg(-1));
   var_dump(func_get_arg(0));
   var_dump(func_get_arg(1));
   if (func_get_arg(2)) {
     $x = 0;
-  } else {
+  }
+ else {
     $x = 1;
   }
   var_dump(func_get_arg($x++));
diff --git a/hphp/test/slow/variable_class_name/1870.php b/hphp/test/slow/variable_class_name/1870.php
index e73a6a5de..2ce46ad01 100644
--- a/hphp/test/slow/variable_class_name/1870.php
+++ b/hphp/test/slow/variable_class_name/1870.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class A {
   const C = 123;
   static public $foo = 456;
@@ -10,13 +9,18 @@ class A {
 }
 $cls = 'a';
 
-var_dump($cls::C); // ClassConstant
+var_dump($cls::C);
+ // ClassConstant
 
-var_dump($cls::$foo); // StaticMember
+var_dump($cls::$foo);
+ // StaticMember
 $cls::$foo = 'test';
-var_dump($cls::$foo); // l-value
+var_dump($cls::$foo);
+ // l-value
 
-var_dump($cls::bar()); // SimpleFunctionCall
+var_dump($cls::bar());
+ // SimpleFunctionCall
 
 $func = 'bar';
-var_dump($cls::$func()); // DynamicFunctionCall
+var_dump($cls::$func());
+ // DynamicFunctionCall
diff --git a/hphp/test/slow/variable_class_name/1871.php b/hphp/test/slow/variable_class_name/1871.php
index 77d574a05..dcffa0e0f 100644
--- a/hphp/test/slow/variable_class_name/1871.php
+++ b/hphp/test/slow/variable_class_name/1871.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class B {
   function f4($arguments) {
     var_dump($arguments);
@@ -9,7 +8,8 @@ class B {
 class G extends B {
   function f4($a) {
     $b='B';
-    $b::f4(5); // __call
+    $b::f4(5);
+ // __call
   }
 }
 $g = new G(5);
diff --git a/hphp/test/slow/variable_class_name/1872.php b/hphp/test/slow/variable_class_name/1872.php
index 07dc23ac0..9c1b727a4 100644
--- a/hphp/test/slow/variable_class_name/1872.php
+++ b/hphp/test/slow/variable_class_name/1872.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class B {
   function __call($name, $arguments) {
     echo "Calling B object method '$name' " . implode(', ', $arguments). "
diff --git a/hphp/test/slow/variable_class_name/1873.php b/hphp/test/slow/variable_class_name/1873.php
index 0952388dd..9ece7ed77 100644
--- a/hphp/test/slow/variable_class_name/1873.php
+++ b/hphp/test/slow/variable_class_name/1873.php
@@ -1,13 +1,24 @@
 <?php
 
-
-function func() { return 'B';}
+function func() {
+ return 'B';
+}
 class B {
-  function foo() { var_dump(__CLASS__);}
-  function f4missing() { $this->foo();}
+  function foo() {
+ var_dump(__CLASS__);
+}
+  function f4missing() {
+ $this->foo();
+}
 }
 class G extends B {
-  function foo() { var_dump(__CLASS__);}
-  function f4missing() { $b = func(); $b::f4missing();}
+  function foo() {
+ var_dump(__CLASS__);
 }
-$g = new G; $g->f4missing();
+  function f4missing() {
+ $b = func();
+ $b::f4missing();
+}
+}
+$g = new G;
+ $g->f4missing();
diff --git a/hphp/test/slow/variant/549.php b/hphp/test/slow/variant/549.php
index 76cfe6139..05cbb10ed 100644
--- a/hphp/test/slow/variant/549.php
+++ b/hphp/test/slow/variant/549.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 1; $a = 'test'; print $a;
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ print $a;
diff --git a/hphp/test/slow/variant/550.php b/hphp/test/slow/variant/550.php
index f8122a308..8e7fec697 100644
--- a/hphp/test/slow/variant/550.php
+++ b/hphp/test/slow/variant/550.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 1; $a = 'test'; $a .= 'b'; print $a;
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ $a .= 'b';
+ print $a;
diff --git a/hphp/test/slow/variant/551.php b/hphp/test/slow/variant/551.php
index f69dbaf41..2cfc26847 100644
--- a/hphp/test/slow/variant/551.php
+++ b/hphp/test/slow/variant/551.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = array(); $a[] = 3; $a = 'test'; var_dump($a);
\ No newline at end of file
+$a = array();
+ $a[] = 3;
+ $a = 'test';
+ var_dump($a);
diff --git a/hphp/test/slow/variant/552.php b/hphp/test/slow/variant/552.php
index b35660386..6f41497ab 100644
--- a/hphp/test/slow/variant/552.php
+++ b/hphp/test/slow/variant/552.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = array(); $a['test'] = 3; var_dump($a);
\ No newline at end of file
+$a = array();
+ $a['test'] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/553.php b/hphp/test/slow/variant/553.php
index 856025032..f01037394 100644
--- a/hphp/test/slow/variant/553.php
+++ b/hphp/test/slow/variant/553.php
@@ -1,3 +1,4 @@
 <?php
 
- $a['test'] = 3; var_dump($a);
\ No newline at end of file
+$a['test'] = 3;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/554.php b/hphp/test/slow/variant/554.php
index 537cb7c17..a15fdc1e5 100644
--- a/hphp/test/slow/variant/554.php
+++ b/hphp/test/slow/variant/554.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 1; $a = 'test'; print $a{0};
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ print $a{
+0}
+;
diff --git a/hphp/test/slow/variant/555.php b/hphp/test/slow/variant/555.php
index 66771be3c..e86b19f6a 100644
--- a/hphp/test/slow/variant/555.php
+++ b/hphp/test/slow/variant/555.php
@@ -1,3 +1,6 @@
 <?php
 
- $a=1;$a='t'; $a[0]  = 'AB'; var_dump($a);
\ No newline at end of file
+$a=1;
+$a='t';
+ $a[0]  = 'AB';
+ var_dump($a);
diff --git a/hphp/test/slow/variant/556.php b/hphp/test/slow/variant/556.php
index 12999608a..e079746c1 100644
--- a/hphp/test/slow/variant/556.php
+++ b/hphp/test/slow/variant/556.php
@@ -1,3 +1,6 @@
 <?php
 
- $a=1;$a='';  $a[0]  = 'AB'; var_dump($a);
\ No newline at end of file
+$a=1;
+$a='';
+  $a[0]  = 'AB';
+ var_dump($a);
diff --git a/hphp/test/slow/variant/557.php b/hphp/test/slow/variant/557.php
index 4dbbdcc2c..9f2ead93e 100644
--- a/hphp/test/slow/variant/557.php
+++ b/hphp/test/slow/variant/557.php
@@ -1,3 +1,6 @@
 <?php
 
- $a=1;$a='t'; $a[10] = 'AB'; var_dump($a);
\ No newline at end of file
+$a=1;
+$a='t';
+ $a[10] = 'AB';
+ var_dump($a);
diff --git a/hphp/test/slow/variant/558.php b/hphp/test/slow/variant/558.php
index 1d8890aa9..ed97135bd 100644
--- a/hphp/test/slow/variant/558.php
+++ b/hphp/test/slow/variant/558.php
@@ -1,3 +1,8 @@
 <?php
 
- $a=1;$a='t'; $b = $a; $a[0] = 'AB'; var_dump($a); var_dump($b);
\ No newline at end of file
+$a=1;
+$a='t';
+ $b = $a;
+ $a[0] = 'AB';
+ var_dump($a);
+ var_dump($b);
diff --git a/hphp/test/slow/variant/559.php b/hphp/test/slow/variant/559.php
index 34917899c..4b5d3f051 100644
--- a/hphp/test/slow/variant/559.php
+++ b/hphp/test/slow/variant/559.php
@@ -1,3 +1,8 @@
 <?php
 
- $a=1;$a='t'; $b = $a; $a[10]= 'AB'; var_dump($a); var_dump($b);
\ No newline at end of file
+$a=1;
+$a='t';
+ $b = $a;
+ $a[10]= 'AB';
+ var_dump($a);
+ var_dump($b);
diff --git a/hphp/test/slow/variant/560.php b/hphp/test/slow/variant/560.php
index 96afd7487..75b89ed9f 100644
--- a/hphp/test/slow/variant/560.php
+++ b/hphp/test/slow/variant/560.php
@@ -1,3 +1,8 @@
 <?php
 
- $a=1;$a='t'; $b = $a; $b[0] = 'AB'; var_dump($a); var_dump($b);
\ No newline at end of file
+$a=1;
+$a='t';
+ $b = $a;
+ $b[0] = 'AB';
+ var_dump($a);
+ var_dump($b);
diff --git a/hphp/test/slow/variant/561.php b/hphp/test/slow/variant/561.php
index 3fcf6c093..90ce6fe54 100644
--- a/hphp/test/slow/variant/561.php
+++ b/hphp/test/slow/variant/561.php
@@ -1,3 +1,8 @@
 <?php
 
- $a=1;$a='t'; $b = $a; $b[10]= 'AB'; var_dump($a); var_dump($b);
\ No newline at end of file
+$a=1;
+$a='t';
+ $b = $a;
+ $b[10]= 'AB';
+ var_dump($a);
+ var_dump($b);
diff --git a/hphp/test/slow/variant/562.php b/hphp/test/slow/variant/562.php
index e18b87a36..b7515fd86 100644
--- a/hphp/test/slow/variant/562.php
+++ b/hphp/test/slow/variant/562.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 1; print $a + 2;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ print $a + 2;
diff --git a/hphp/test/slow/variant/563.php b/hphp/test/slow/variant/563.php
index 536c8d16a..f11417074 100644
--- a/hphp/test/slow/variant/563.php
+++ b/hphp/test/slow/variant/563.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 1; print 2 + $a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ print 2 + $a;
diff --git a/hphp/test/slow/variant/564.php b/hphp/test/slow/variant/564.php
index 1355e7964..a1e684681 100644
--- a/hphp/test/slow/variant/564.php
+++ b/hphp/test/slow/variant/564.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 1; $b = 'a'; $b = 2; print $a + $b;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ $b = 'a';
+ $b = 2;
+ print $a + $b;
diff --git a/hphp/test/slow/variant/565.php b/hphp/test/slow/variant/565.php
index 7e71012a7..d6061533c 100644
--- a/hphp/test/slow/variant/565.php
+++ b/hphp/test/slow/variant/565.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 1; $a += 2; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ $a += 2;
+ print $a;
diff --git a/hphp/test/slow/variant/566.php b/hphp/test/slow/variant/566.php
index 15a1ebde6..461823de1 100644
--- a/hphp/test/slow/variant/566.php
+++ b/hphp/test/slow/variant/566.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 1; $a += 'n'; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ $a += 'n';
+ print $a;
diff --git a/hphp/test/slow/variant/567.php b/hphp/test/slow/variant/567.php
index 1775287fe..ac7103bea 100644
--- a/hphp/test/slow/variant/567.php
+++ b/hphp/test/slow/variant/567.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 1; $a += '5'; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ $a += '5';
+ print $a;
diff --git a/hphp/test/slow/variant/568.php b/hphp/test/slow/variant/568.php
index e189093b2..dbd5d6f19 100644
--- a/hphp/test/slow/variant/568.php
+++ b/hphp/test/slow/variant/568.php
@@ -1,3 +1,6 @@
 <?php
 
- $b = 'test'; $b = 1; $a += $b; print $a;
\ No newline at end of file
+$b = 'test';
+ $b = 1;
+ $a += $b;
+ print $a;
diff --git a/hphp/test/slow/variant/569.php b/hphp/test/slow/variant/569.php
index d9ab4c971..be65ef7ec 100644
--- a/hphp/test/slow/variant/569.php
+++ b/hphp/test/slow/variant/569.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 1; print -$a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ print -$a;
diff --git a/hphp/test/slow/variant/570.php b/hphp/test/slow/variant/570.php
index 693e86224..7f48e7da3 100644
--- a/hphp/test/slow/variant/570.php
+++ b/hphp/test/slow/variant/570.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = -$a; print $a;
\ No newline at end of file
+$a = 't';
+ $a = -$a;
+ print $a;
diff --git a/hphp/test/slow/variant/571.php b/hphp/test/slow/variant/571.php
index 9b01c2818..99b96b58f 100644
--- a/hphp/test/slow/variant/571.php
+++ b/hphp/test/slow/variant/571.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 1; print $a - 2;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ print $a - 2;
diff --git a/hphp/test/slow/variant/572.php b/hphp/test/slow/variant/572.php
index 9de644dde..4c16882fe 100644
--- a/hphp/test/slow/variant/572.php
+++ b/hphp/test/slow/variant/572.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 1; print 2 - $a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ print 2 - $a;
diff --git a/hphp/test/slow/variant/573.php b/hphp/test/slow/variant/573.php
index cad96a3cd..0650e4324 100644
--- a/hphp/test/slow/variant/573.php
+++ b/hphp/test/slow/variant/573.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 1; $b = 'a'; $b = 2; print $a - $b;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ $b = 'a';
+ $b = 2;
+ print $a - $b;
diff --git a/hphp/test/slow/variant/574.php b/hphp/test/slow/variant/574.php
index 6cd1db2a4..679a46440 100644
--- a/hphp/test/slow/variant/574.php
+++ b/hphp/test/slow/variant/574.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 1; $a -= 2; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ $a -= 2;
+ print $a;
diff --git a/hphp/test/slow/variant/575.php b/hphp/test/slow/variant/575.php
index 9c69c7ced..2a2d31355 100644
--- a/hphp/test/slow/variant/575.php
+++ b/hphp/test/slow/variant/575.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 1; $a -= 'n'; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ $a -= 'n';
+ print $a;
diff --git a/hphp/test/slow/variant/576.php b/hphp/test/slow/variant/576.php
index f003f7d79..323c1ae82 100644
--- a/hphp/test/slow/variant/576.php
+++ b/hphp/test/slow/variant/576.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 1; $a -= '5'; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 1;
+ $a -= '5';
+ print $a;
diff --git a/hphp/test/slow/variant/577.php b/hphp/test/slow/variant/577.php
index 8f5d80f52..e8eb703ba 100644
--- a/hphp/test/slow/variant/577.php
+++ b/hphp/test/slow/variant/577.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 10; print $a * 2;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ print $a * 2;
diff --git a/hphp/test/slow/variant/578.php b/hphp/test/slow/variant/578.php
index a7afb1778..189b2fb6b 100644
--- a/hphp/test/slow/variant/578.php
+++ b/hphp/test/slow/variant/578.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 10; print 2 * $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ print 2 * $a;
diff --git a/hphp/test/slow/variant/579.php b/hphp/test/slow/variant/579.php
index 2f2124000..7d96afbb9 100644
--- a/hphp/test/slow/variant/579.php
+++ b/hphp/test/slow/variant/579.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 10; $b = 'a'; $b = 2; print $a * $b;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 'a';
+ $b = 2;
+ print $a * $b;
diff --git a/hphp/test/slow/variant/580.php b/hphp/test/slow/variant/580.php
index a8d13832c..029bf34fd 100644
--- a/hphp/test/slow/variant/580.php
+++ b/hphp/test/slow/variant/580.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a *= 2; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a *= 2;
+ print $a;
diff --git a/hphp/test/slow/variant/581.php b/hphp/test/slow/variant/581.php
index 46d048ecf..71e92e248 100644
--- a/hphp/test/slow/variant/581.php
+++ b/hphp/test/slow/variant/581.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a *= 'n'; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a *= 'n';
+ print $a;
diff --git a/hphp/test/slow/variant/582.php b/hphp/test/slow/variant/582.php
index 9870ca511..0a991c917 100644
--- a/hphp/test/slow/variant/582.php
+++ b/hphp/test/slow/variant/582.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a *= '5'; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a *= '5';
+ print $a;
diff --git a/hphp/test/slow/variant/583.php b/hphp/test/slow/variant/583.php
index 581825414..7394b05eb 100644
--- a/hphp/test/slow/variant/583.php
+++ b/hphp/test/slow/variant/583.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 10; print $a / 2;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ print $a / 2;
diff --git a/hphp/test/slow/variant/584.php b/hphp/test/slow/variant/584.php
index a3ec39742..785897627 100644
--- a/hphp/test/slow/variant/584.php
+++ b/hphp/test/slow/variant/584.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 10; print 2 / $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ print 2 / $a;
diff --git a/hphp/test/slow/variant/585.php b/hphp/test/slow/variant/585.php
index 382e206f3..3485e74cd 100644
--- a/hphp/test/slow/variant/585.php
+++ b/hphp/test/slow/variant/585.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 10; $b = 'a'; $b = 2; print $a / $b;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 'a';
+ $b = 2;
+ print $a / $b;
diff --git a/hphp/test/slow/variant/586.php b/hphp/test/slow/variant/586.php
index c54fb8a06..83b97abb9 100644
--- a/hphp/test/slow/variant/586.php
+++ b/hphp/test/slow/variant/586.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a /= 2; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a /= 2;
+ print $a;
diff --git a/hphp/test/slow/variant/587.php b/hphp/test/slow/variant/587.php
index 08f210e7f..8daf8a452 100644
--- a/hphp/test/slow/variant/587.php
+++ b/hphp/test/slow/variant/587.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a /= '5'; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a /= '5';
+ print $a;
diff --git a/hphp/test/slow/variant/588.php b/hphp/test/slow/variant/588.php
index 073afd3cd..9007ee087 100644
--- a/hphp/test/slow/variant/588.php
+++ b/hphp/test/slow/variant/588.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 10; print $a % 2;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ print $a % 2;
diff --git a/hphp/test/slow/variant/589.php b/hphp/test/slow/variant/589.php
index 3d36703af..98e53c7e1 100644
--- a/hphp/test/slow/variant/589.php
+++ b/hphp/test/slow/variant/589.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 10; print 2 % $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ print 2 % $a;
diff --git a/hphp/test/slow/variant/590.php b/hphp/test/slow/variant/590.php
index 36f4b040e..49c7fe28e 100644
--- a/hphp/test/slow/variant/590.php
+++ b/hphp/test/slow/variant/590.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 10; $b = 'a'; $b = 2; print $a % $b;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 'a';
+ $b = 2;
+ print $a % $b;
diff --git a/hphp/test/slow/variant/591.php b/hphp/test/slow/variant/591.php
index e37b92acb..0f62e023a 100644
--- a/hphp/test/slow/variant/591.php
+++ b/hphp/test/slow/variant/591.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a %= 2; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a %= 2;
+ print $a;
diff --git a/hphp/test/slow/variant/592.php b/hphp/test/slow/variant/592.php
index b14c0dafb..5a12439b7 100644
--- a/hphp/test/slow/variant/592.php
+++ b/hphp/test/slow/variant/592.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a %= '5'; print $a;
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a %= '5';
+ print $a;
diff --git a/hphp/test/slow/variant/593.php b/hphp/test/slow/variant/593.php
index b7401ad2d..308716f52 100644
--- a/hphp/test/slow/variant/593.php
+++ b/hphp/test/slow/variant/593.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 't'; $a = 10; var_dump(~$a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ var_dump(~$a);
diff --git a/hphp/test/slow/variant/594.php b/hphp/test/slow/variant/594.php
index 5b620615d..47ffeb1a9 100644
--- a/hphp/test/slow/variant/594.php
+++ b/hphp/test/slow/variant/594.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; var_dump($a & $b);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a & $b);
diff --git a/hphp/test/slow/variant/595.php b/hphp/test/slow/variant/595.php
index a8ec092d6..0848e79d2 100644
--- a/hphp/test/slow/variant/595.php
+++ b/hphp/test/slow/variant/595.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; var_dump($a | $b);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a | $b);
diff --git a/hphp/test/slow/variant/596.php b/hphp/test/slow/variant/596.php
index a3ecc60d2..099341efa 100644
--- a/hphp/test/slow/variant/596.php
+++ b/hphp/test/slow/variant/596.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; var_dump($a ^ $b);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a ^ $b);
diff --git a/hphp/test/slow/variant/597.php b/hphp/test/slow/variant/597.php
index 29f6bb474..ebe2852db 100644
--- a/hphp/test/slow/variant/597.php
+++ b/hphp/test/slow/variant/597.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; var_dump($a << 2);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a << 2);
diff --git a/hphp/test/slow/variant/598.php b/hphp/test/slow/variant/598.php
index dd0617174..a6399ad2c 100644
--- a/hphp/test/slow/variant/598.php
+++ b/hphp/test/slow/variant/598.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; var_dump($a >> 2);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a >> 2);
diff --git a/hphp/test/slow/variant/599.php b/hphp/test/slow/variant/599.php
index a262036cb..ac0d875d4 100644
--- a/hphp/test/slow/variant/599.php
+++ b/hphp/test/slow/variant/599.php
@@ -1,3 +1,6 @@
 <?php
 
- $b = 't'; $a = 10; $b = 9; var_dump($a & $b);
\ No newline at end of file
+$b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a & $b);
diff --git a/hphp/test/slow/variant/600.php b/hphp/test/slow/variant/600.php
index b576bd895..a9ea9094a 100644
--- a/hphp/test/slow/variant/600.php
+++ b/hphp/test/slow/variant/600.php
@@ -1,3 +1,6 @@
 <?php
 
- $b = 't'; $a = 10; $b = 9; var_dump($a | $b);
\ No newline at end of file
+$b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a | $b);
diff --git a/hphp/test/slow/variant/601.php b/hphp/test/slow/variant/601.php
index 2764546de..ec518db81 100644
--- a/hphp/test/slow/variant/601.php
+++ b/hphp/test/slow/variant/601.php
@@ -1,3 +1,6 @@
 <?php
 
- $b = 't'; $a = 10; $b = 9; var_dump($a ^ $b);
\ No newline at end of file
+$b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a ^ $b);
diff --git a/hphp/test/slow/variant/602.php b/hphp/test/slow/variant/602.php
index 57951c05b..b04b0ed9a 100644
--- a/hphp/test/slow/variant/602.php
+++ b/hphp/test/slow/variant/602.php
@@ -1,3 +1,6 @@
 <?php
 
- $b = 't'; $a = 10; $b = 2; var_dump($a << $b);
\ No newline at end of file
+$b = 't';
+ $a = 10;
+ $b = 2;
+ var_dump($a << $b);
diff --git a/hphp/test/slow/variant/603.php b/hphp/test/slow/variant/603.php
index 5b7e6fea0..4bcb0a30e 100644
--- a/hphp/test/slow/variant/603.php
+++ b/hphp/test/slow/variant/603.php
@@ -1,3 +1,6 @@
 <?php
 
- $b = 't'; $a = 10; $b = 2; var_dump($a >> $b);
\ No newline at end of file
+$b = 't';
+ $a = 10;
+ $b = 2;
+ var_dump($a >> $b);
diff --git a/hphp/test/slow/variant/604.php b/hphp/test/slow/variant/604.php
index d3b04bd74..8de8460af 100644
--- a/hphp/test/slow/variant/604.php
+++ b/hphp/test/slow/variant/604.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump($a & $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a & $b);
diff --git a/hphp/test/slow/variant/605.php b/hphp/test/slow/variant/605.php
index 80118cc16..8095ee054 100644
--- a/hphp/test/slow/variant/605.php
+++ b/hphp/test/slow/variant/605.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump($a | $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a | $b);
diff --git a/hphp/test/slow/variant/606.php b/hphp/test/slow/variant/606.php
index 719364b1b..9c527345f 100644
--- a/hphp/test/slow/variant/606.php
+++ b/hphp/test/slow/variant/606.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump($a ^ $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a ^ $b);
diff --git a/hphp/test/slow/variant/607.php b/hphp/test/slow/variant/607.php
index 291ce39ca..5b7475e5e 100644
--- a/hphp/test/slow/variant/607.php
+++ b/hphp/test/slow/variant/607.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 2; var_dump($a << $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 2;
+ var_dump($a << $b);
diff --git a/hphp/test/slow/variant/608.php b/hphp/test/slow/variant/608.php
index eec27d726..8dc68118a 100644
--- a/hphp/test/slow/variant/608.php
+++ b/hphp/test/slow/variant/608.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 2; var_dump($a >> $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 2;
+ var_dump($a >> $b);
diff --git a/hphp/test/slow/variant/609.php b/hphp/test/slow/variant/609.php
index 5b7bca7fc..7338397d1 100644
--- a/hphp/test/slow/variant/609.php
+++ b/hphp/test/slow/variant/609.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; $a &= $b; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ $a &= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/610.php b/hphp/test/slow/variant/610.php
index bc4e133e9..d8cca205b 100644
--- a/hphp/test/slow/variant/610.php
+++ b/hphp/test/slow/variant/610.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; $a |= $b; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ $a |= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/611.php b/hphp/test/slow/variant/611.php
index d80b564a9..95ed420cd 100644
--- a/hphp/test/slow/variant/611.php
+++ b/hphp/test/slow/variant/611.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; $a ^= $b; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ $a ^= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/612.php b/hphp/test/slow/variant/612.php
index f7d00ffd1..a4e03b749 100644
--- a/hphp/test/slow/variant/612.php
+++ b/hphp/test/slow/variant/612.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; $a <<= 2; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ $a <<= 2;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/613.php b/hphp/test/slow/variant/613.php
index 148fde3b0..c3f6b7f47 100644
--- a/hphp/test/slow/variant/613.php
+++ b/hphp/test/slow/variant/613.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $a = 10; $b = 9; $a >>= 2; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $b = 9;
+ $a >>= 2;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/614.php b/hphp/test/slow/variant/614.php
index 522c95a38..0adb4e0b9 100644
--- a/hphp/test/slow/variant/614.php
+++ b/hphp/test/slow/variant/614.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump($a and $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a and $b);
diff --git a/hphp/test/slow/variant/615.php b/hphp/test/slow/variant/615.php
index 4c16869f3..48e06009b 100644
--- a/hphp/test/slow/variant/615.php
+++ b/hphp/test/slow/variant/615.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump($a or $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a or $b);
diff --git a/hphp/test/slow/variant/616.php b/hphp/test/slow/variant/616.php
index 2686f163d..46f830d15 100644
--- a/hphp/test/slow/variant/616.php
+++ b/hphp/test/slow/variant/616.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump($a xor $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a xor $b);
diff --git a/hphp/test/slow/variant/617.php b/hphp/test/slow/variant/617.php
index facbcecfb..7d45d2907 100644
--- a/hphp/test/slow/variant/617.php
+++ b/hphp/test/slow/variant/617.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump(!$a);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump(!$a);
diff --git a/hphp/test/slow/variant/618.php b/hphp/test/slow/variant/618.php
index d0b1d3c6f..6cb56ed39 100644
--- a/hphp/test/slow/variant/618.php
+++ b/hphp/test/slow/variant/618.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump($a && $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a && $b);
diff --git a/hphp/test/slow/variant/619.php b/hphp/test/slow/variant/619.php
index 8a93b5432..a562a7b48 100644
--- a/hphp/test/slow/variant/619.php
+++ b/hphp/test/slow/variant/619.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 't'; $b = 't'; $a = 10; $b = 9; var_dump($a || $b);
\ No newline at end of file
+$a = 't';
+ $b = 't';
+ $a = 10;
+ $b = 9;
+ var_dump($a || $b);
diff --git a/hphp/test/slow/variant/620.php b/hphp/test/slow/variant/620.php
index 06f51ecde..006a29467 100644
--- a/hphp/test/slow/variant/620.php
+++ b/hphp/test/slow/variant/620.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; ++$a; var_dump($a);
\ No newline at end of file
+$a = 10;
+ ++$a;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/621.php b/hphp/test/slow/variant/621.php
index 46a4b9ade..d2b8a86a6 100644
--- a/hphp/test/slow/variant/621.php
+++ b/hphp/test/slow/variant/621.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; $a++; var_dump($a);
\ No newline at end of file
+$a = 10;
+ $a++;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/622.php b/hphp/test/slow/variant/622.php
index 4498f9bbd..27f2c2aea 100644
--- a/hphp/test/slow/variant/622.php
+++ b/hphp/test/slow/variant/622.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; --$a; var_dump($a);
\ No newline at end of file
+$a = 10;
+ --$a;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/623.php b/hphp/test/slow/variant/623.php
index e5ff72bfe..78e5089c4 100644
--- a/hphp/test/slow/variant/623.php
+++ b/hphp/test/slow/variant/623.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 10; $a--; var_dump($a);
\ No newline at end of file
+$a = 10;
+ $a--;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/624.php b/hphp/test/slow/variant/624.php
index 3ee123c25..b679a88cf 100644
--- a/hphp/test/slow/variant/624.php
+++ b/hphp/test/slow/variant/624.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; ++$a; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ ++$a;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/625.php b/hphp/test/slow/variant/625.php
index 60bffae47..8c6e8723a 100644
--- a/hphp/test/slow/variant/625.php
+++ b/hphp/test/slow/variant/625.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a++; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a++;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/626.php b/hphp/test/slow/variant/626.php
index 7f73b3728..f657b4c84 100644
--- a/hphp/test/slow/variant/626.php
+++ b/hphp/test/slow/variant/626.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; --$a; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ --$a;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/627.php b/hphp/test/slow/variant/627.php
index 00f6d28f9..463b667f0 100644
--- a/hphp/test/slow/variant/627.php
+++ b/hphp/test/slow/variant/627.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 't'; $a = 10; $a--; var_dump($a);
\ No newline at end of file
+$a = 't';
+ $a = 10;
+ $a--;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/628.php b/hphp/test/slow/variant/628.php
index e068835ee..00b60db94 100644
--- a/hphp/test/slow/variant/628.php
+++ b/hphp/test/slow/variant/628.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; ++$a; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ ++$a;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/629.php b/hphp/test/slow/variant/629.php
index aff17f685..03fe74ffa 100644
--- a/hphp/test/slow/variant/629.php
+++ b/hphp/test/slow/variant/629.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $a++; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $a++;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/630.php b/hphp/test/slow/variant/630.php
index a4135e559..02b019996 100644
--- a/hphp/test/slow/variant/630.php
+++ b/hphp/test/slow/variant/630.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; --$a; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ --$a;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/631.php b/hphp/test/slow/variant/631.php
index 2a2e3c223..d1e173111 100644
--- a/hphp/test/slow/variant/631.php
+++ b/hphp/test/slow/variant/631.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 'test'; $a--; var_dump($a);
\ No newline at end of file
+$a = 'test';
+ $a--;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/632.php b/hphp/test/slow/variant/632.php
index 95dc596bc..55a1e116e 100644
--- a/hphp/test/slow/variant/632.php
+++ b/hphp/test/slow/variant/632.php
@@ -1,3 +1,5 @@
 <?php
 
- $a = 1; $a = 'test'; var_dump(~$a);
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ var_dump(~$a);
diff --git a/hphp/test/slow/variant/633.php b/hphp/test/slow/variant/633.php
index c5382edf3..a988116df 100644
--- a/hphp/test/slow/variant/633.php
+++ b/hphp/test/slow/variant/633.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 1; $a = 'test'; $b = 'zzz'; var_dump($a & $b);
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ $b = 'zzz';
+ var_dump($a & $b);
diff --git a/hphp/test/slow/variant/634.php b/hphp/test/slow/variant/634.php
index cc52210f2..b248024a4 100644
--- a/hphp/test/slow/variant/634.php
+++ b/hphp/test/slow/variant/634.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 1; $a = 'test'; $b = 'zzz'; var_dump($a | $b);
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ $b = 'zzz';
+ var_dump($a | $b);
diff --git a/hphp/test/slow/variant/635.php b/hphp/test/slow/variant/635.php
index 38d7ee16d..7547eba8f 100644
--- a/hphp/test/slow/variant/635.php
+++ b/hphp/test/slow/variant/635.php
@@ -1,3 +1,6 @@
 <?php
 
- $a = 1; $a = 'test'; $b = 'zzz'; var_dump($a ^ $b);
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ $b = 'zzz';
+ var_dump($a ^ $b);
diff --git a/hphp/test/slow/variant/636.php b/hphp/test/slow/variant/636.php
index 0db797959..eab1d7caf 100644
--- a/hphp/test/slow/variant/636.php
+++ b/hphp/test/slow/variant/636.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 1; $a = 'test'; $b = 'zzz'; $a &= $b; var_dump($a);
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ $b = 'zzz';
+ $a &= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/637.php b/hphp/test/slow/variant/637.php
index de5db2ce3..7d9c6caea 100644
--- a/hphp/test/slow/variant/637.php
+++ b/hphp/test/slow/variant/637.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 1; $a = 'test'; $b = 'zzz'; $a |= $b; var_dump($a);
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ $b = 'zzz';
+ $a |= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/638.php b/hphp/test/slow/variant/638.php
index 2187129fa..223beb4fa 100644
--- a/hphp/test/slow/variant/638.php
+++ b/hphp/test/slow/variant/638.php
@@ -1,3 +1,7 @@
 <?php
 
- $a = 1; $a = 'test'; $b = 'zzz'; $a ^= $b; var_dump($a);
\ No newline at end of file
+$a = 1;
+ $a = 'test';
+ $b = 'zzz';
+ $a ^= $b;
+ var_dump($a);
diff --git a/hphp/test/slow/variant/639.php b/hphp/test/slow/variant/639.php
index 8b2ead20b..b8f853fe5 100644
--- a/hphp/test/slow/variant/639.php
+++ b/hphp/test/slow/variant/639.php
@@ -1,3 +1,15 @@
 <?php
 
- class a { public $var2 = 1; public $var1; }class b extends a { public $var2; }function f() { $obj1 = new b(); var_dump($obj1); $obj1->var1 = 1; }f();
\ No newline at end of file
+class a {
+ public $var2 = 1;
+ public $var1;
+ }
+class b extends a {
+ public $var2;
+ }
+function f() {
+ $obj1 = new b();
+ var_dump($obj1);
+ $obj1->var1 = 1;
+ }
+f();
diff --git a/hphp/test/slow/volatile/1215.php b/hphp/test/slow/volatile/1215.php
index 0692d793a..74aa67735 100644
--- a/hphp/test/slow/volatile/1215.php
+++ b/hphp/test/slow/volatile/1215.php
@@ -1,3 +1,47 @@
 <?php
 
- for ($i = 0; $i < 4; $i++) {  if ($i > 1 && !defined('CON')) {    define(/*|Dynamic|*/'CON', 1);  }  if (defined('CON')) {    var_dump(CON);  } else {    echo "CON does not exists\n";  }}for ($i = 0; $i < 4; $i++) {  if ($i > 1 && !function_exists('foo')) {    function foo() {      echo "foo called\n";    }  }  if (function_exists('foo')) {    foo();  } else {    echo "foo does not exists\n";  }}for ($i = 0; $i < 4; $i++) {  if ($i > 1 && !class_exists('bar')) {    class bar {      function bar() { echo "bar called\n"; }    }  }  if (class_exists('bar')) {    $a = new bar;  } else {    echo "bar does not exists\n";  }}
\ No newline at end of file
+for ($i = 0;
+ $i < 4;
+ $i++) {
+  if ($i > 1 && !defined('CON')) {
+    define(/*|Dynamic|*/'CON', 1);
+  }
+  if (defined('CON')) {
+    var_dump(CON);
+  }
+ else {
+    echo "CON does not exists\n";
+  }
+}
+for ($i = 0;
+ $i < 4;
+ $i++) {
+  if ($i > 1 && !function_exists('foo')) {
+    function foo() {
+      echo "foo called\n";
+    }
+  }
+  if (function_exists('foo')) {
+    foo();
+  }
+ else {
+    echo "foo does not exists\n";
+  }
+}
+for ($i = 0;
+ $i < 4;
+ $i++) {
+  if ($i > 1 && !class_exists('bar')) {
+    class bar {
+      function bar() {
+ echo "bar called\n";
+ }
+    }
+  }
+  if (class_exists('bar')) {
+    $a = new bar;
+  }
+ else {
+    echo "bar does not exists\n";
+  }
+}
diff --git a/hphp/test/slow/volatile/1216.php b/hphp/test/slow/volatile/1216.php
index fd9238199..e141f52ef 100644
--- a/hphp/test/slow/volatile/1216.php
+++ b/hphp/test/slow/volatile/1216.php
@@ -1,3 +1,80 @@
 <?php
 
- function bar() {  for ($i = 0; $i < 4; $i++) {    if ($i > 1 && !function_exists('foo')) {      function foo() {        echo "foo called\n";      }    }    $foo = 'foo';    if (function_exists($foo)) {      foo();    } else {      echo "foo does not exists\n";    }  }  for ($i = 0; $i < 4; $i++) {    if ($i > 1 && !class_exists('goo')) {      class goo {        function goo() {          echo "goo called\n";        }      }    }    $goo = 'goo';    if (class_exists($goo)) {      $a = new goo();    } else {      echo "goo does not exists\n";    }  }}if (function_exists('bar')) bar();$a = 'bar';if (function_exists($a)) bar();$a = 'later';if (function_exists($a)) {  echo "later exists\n";} else {  echo "later does not exists\n";}$a = 'later2';if (class_exists($a)) {  echo "later2 exists\n";} else {  echo "later2 does not exists\n";}$a = 'later3';if (function_exists($a)) {  echo "later3 exists\n";} else {  echo "later3 does not exists\n";}$a = 'later4';if (class_exists($a)) {  echo "later4 exists\n";} else {  echo "later4 does not exists\n";}function later3() {  echo "later3 called\n";}class later4 {}if (function_exists('function_exists')) {  echo "yes\n";}if (class_exists('exception')) {  echo "yes\n";}
\ No newline at end of file
+function bar() {
+  for ($i = 0;
+ $i < 4;
+ $i++) {
+    if ($i > 1 && !function_exists('foo')) {
+      function foo() {
+        echo "foo called\n";
+      }
+    }
+    $foo = 'foo';
+    if (function_exists($foo)) {
+      foo();
+    }
+ else {
+      echo "foo does not exists\n";
+    }
+  }
+  for ($i = 0;
+ $i < 4;
+ $i++) {
+    if ($i > 1 && !class_exists('goo')) {
+      class goo {
+        function goo() {
+          echo "goo called\n";
+        }
+      }
+    }
+    $goo = 'goo';
+    if (class_exists($goo)) {
+      $a = new goo();
+    }
+ else {
+      echo "goo does not exists\n";
+    }
+  }
+}
+if (function_exists('bar')) bar();
+$a = 'bar';
+if (function_exists($a)) bar();
+$a = 'later';
+if (function_exists($a)) {
+  echo "later exists\n";
+}
+ else {
+  echo "later does not exists\n";
+}
+$a = 'later2';
+if (class_exists($a)) {
+  echo "later2 exists\n";
+}
+ else {
+  echo "later2 does not exists\n";
+}
+$a = 'later3';
+if (function_exists($a)) {
+  echo "later3 exists\n";
+}
+ else {
+  echo "later3 does not exists\n";
+}
+$a = 'later4';
+if (class_exists($a)) {
+  echo "later4 exists\n";
+}
+ else {
+  echo "later4 does not exists\n";
+}
+function later3() {
+  echo "later3 called\n";
+}
+class later4 {
+}
+if (function_exists('function_exists')) {
+  echo "yes\n";
+}
+if (class_exists('exception')) {
+  echo "yes\n";
+}
diff --git a/hphp/test/slow/volatile/1217.php b/hphp/test/slow/volatile/1217.php
index cd2187147..b9d4be9ae 100644
--- a/hphp/test/slow/volatile/1217.php
+++ b/hphp/test/slow/volatile/1217.php
@@ -1,3 +1,15 @@
 <?php
 
- function foo() {  if (!defined('Auth_OpenID_NO_MATH_SUPPORT')) {    define('Auth_OpenID_NO_MATH_SUPPORT', true);  }}function bar() {  return defined('Auth_OpenID_NO_MATH_SUPPORT');}if (defined('M_PI')) {  var_dump(bar());  foo();  var_dump(bar());}
\ No newline at end of file
+function foo() {
+  if (!defined('Auth_OpenID_NO_MATH_SUPPORT')) {
+    define('Auth_OpenID_NO_MATH_SUPPORT', true);
+  }
+}
+function bar() {
+  return defined('Auth_OpenID_NO_MATH_SUPPORT');
+}
+if (defined('M_PI')) {
+  var_dump(bar());
+  foo();
+  var_dump(bar());
+}
diff --git a/hphp/test/slow/volatile/1218.php b/hphp/test/slow/volatile/1218.php
index 79bf45a65..255ed541c 100644
--- a/hphp/test/slow/volatile/1218.php
+++ b/hphp/test/slow/volatile/1218.php
@@ -1,3 +1,15 @@
 <?php
 
- function foo() {  if (!interface_exists('MyInterface')) {    interface MyInterface{};    echo 'no';  } else {    echo 'yes';  }}foo();foo();
\ No newline at end of file
+function foo() {
+  if (!interface_exists('MyInterface')) {
+    interface MyInterface{
+}
+;
+    echo 'no';
+  }
+ else {
+    echo 'yes';
+  }
+}
+foo();
+foo();
diff --git a/hphp/test/slow/volatile/1219.php b/hphp/test/slow/volatile/1219.php
index c33e4275c..1f76b9e37 100644
--- a/hphp/test/slow/volatile/1219.php
+++ b/hphp/test/slow/volatile/1219.php
@@ -1,3 +1,20 @@
 <?php
 
- function foo() {  if (function_exists('bar')) {    echo "yes\n";  } else {    echo "no\n";  }  function bar() {    echo "bar\n";  }  if (function_exists('bar')) {    echo "yes\n";  } else {    echo "no\n";  }}foo();
\ No newline at end of file
+function foo() {
+  if (function_exists('bar')) {
+    echo "yes\n";
+  }
+ else {
+    echo "no\n";
+  }
+  function bar() {
+    echo "bar\n";
+  }
+  if (function_exists('bar')) {
+    echo "yes\n";
+  }
+ else {
+    echo "no\n";
+  }
+}
+foo();
diff --git a/hphp/test/slow/volatile/1220.php b/hphp/test/slow/volatile/1220.php
index bccc6bd30..9b9340967 100644
--- a/hphp/test/slow/volatile/1220.php
+++ b/hphp/test/slow/volatile/1220.php
@@ -1,3 +1,19 @@
 <?php
 
- function foo() {  if (class_exists('bar')) {    echo "yes\n";  } else {    echo "no\n";  }  class bar {  }  if (class_exists('bar')) {    echo "yes\n";  } else {    echo "no\n";  }}foo();
\ No newline at end of file
+function foo() {
+  if (class_exists('bar')) {
+    echo "yes\n";
+  }
+ else {
+    echo "no\n";
+  }
+  class bar {
+  }
+  if (class_exists('bar')) {
+    echo "yes\n";
+  }
+ else {
+    echo "no\n";
+  }
+}
+foo();
diff --git a/hphp/test/slow/volatile/1221.php b/hphp/test/slow/volatile/1221.php
index efadcaa79..8d75bb9e8 100644
--- a/hphp/test/slow/volatile/1221.php
+++ b/hphp/test/slow/volatile/1221.php
@@ -1,4 +1,185 @@
 <?php
 
- function z() {  var_dump('__autoload');  var_dump(class_exists('cNew'));  var_dump(class_exists('cNew_r'));  var_dump(class_exists('cNew_d'));  var_dump(class_exists('csm'));  var_dump(class_exists('csm_r'));  var_dump(class_exists('CcOn'));  var_dump(class_exists('CcOn_r'));  var_dump(class_exists('CcOn_d'));  var_dump(class_exists('csmeth'));  var_dump(class_exists('csmeth_r'));  var_dump(class_exists('csmeth_d'));  var_dump(class_exists('cpar'));  var_dump(class_exists('cpar_r'));  var_dump(class_exists('cref'));  var_dump(class_exists('cex'));}function test() {  function t1() {    new cNew();  }  t1();  function t2() {    new cNew_r();  }  t2();  function t4() {    $x = 'cNew_d';    new $x();  }  t4();  function t5() {    var_dump(csm::$mem);  }  t5();  function t6() {    var_dump(csm_r::$mem);  }  t6();  function t7() {    var_dump(CcOn::C);  }  t7();  function t8() {    var_dump(CcOn_r::C);  }  t8();  function t9() {    var_dump(constant('CcOn_d::C'));  }  t9();  function t10() {    csmeth::m();  }  t10();  function t11() {    csmeth_r::m();  }  t11();  function t12() {    call_user_func(array('csmeth_d', 'm'));  }  t12();  function t13() {    class a extends cpar {}    new a;  }  t13();  function t14() {    class b extends cpar_r {}    new b;  }  t14();  function t15() {    new ReflectionClass('cref');  }  t15();  function t16() {    var_dump(class_exists('cex'));  }  t16();  function t17() {    var_dump(class_exists('cex_r'));  }  t17();}test();z();function __autoload($name) {  var_dump('autoload ' . $name);  switch ($name) {    case 'cNew':      class cNew {}      break;    case 'cNew_r':      class cNew_r {}      if (false) {        class cNew_r {}      }      break;    case 'cNew_d':      class cNew_d {}      break;    case 'csm':      class csm {        public static $mem = 1;      }      break;    case 'csm_r':      class csm_r {        public static $mem = 1;      }      if (false) {        class csm_r {}      }      break;    case 'CcOn':      class CcOn {        const C = 2;      }      break;    case 'CcOn_r':      class CcOn_r {        const C = 2;      }      if (false) {        class CcOn_r {}      }      break;    case 'CcOn_d':      class CcOn_d {        const C = 2;      }      break;    case 'csmeth':      class csmeth {        public static function m() { echo '1
-'; }      }      break;    case 'csmeth_r':      class csmeth_r {        public static function m() { echo '1'; }      }      if (false) {        class csmeth_r {}      }      break;    case 'csmeth_d':      class csmeth_d {        public static function m() { echo '1'; }      }      break;    case 'cpar':      class cpar {}      break;    case 'cpar_r':      class cpar_r {}      if (false) {        class cpar_r {}      }      break;    case 'cref':      class cref {}      break;    case 'cex':      class cex {}      break;    case 'cex_r':      class cex_r {}      if (false) {        class cex_r {}      }      break;  }}
\ No newline at end of file
+function z() {
+  var_dump('__autoload');
+  var_dump(class_exists('cNew'));
+  var_dump(class_exists('cNew_r'));
+  var_dump(class_exists('cNew_d'));
+  var_dump(class_exists('csm'));
+  var_dump(class_exists('csm_r'));
+  var_dump(class_exists('CcOn'));
+  var_dump(class_exists('CcOn_r'));
+  var_dump(class_exists('CcOn_d'));
+  var_dump(class_exists('csmeth'));
+  var_dump(class_exists('csmeth_r'));
+  var_dump(class_exists('csmeth_d'));
+  var_dump(class_exists('cpar'));
+  var_dump(class_exists('cpar_r'));
+  var_dump(class_exists('cref'));
+  var_dump(class_exists('cex'));
+}
+function test() {
+  function t1() {
+    new cNew();
+  }
+  t1();
+  function t2() {
+    new cNew_r();
+  }
+  t2();
+  function t4() {
+    $x = 'cNew_d';
+    new $x();
+  }
+  t4();
+  function t5() {
+    var_dump(csm::$mem);
+  }
+  t5();
+  function t6() {
+    var_dump(csm_r::$mem);
+  }
+  t6();
+  function t7() {
+    var_dump(CcOn::C);
+  }
+  t7();
+  function t8() {
+    var_dump(CcOn_r::C);
+  }
+  t8();
+  function t9() {
+    var_dump(constant('CcOn_d::C'));
+  }
+  t9();
+  function t10() {
+    csmeth::m();
+  }
+  t10();
+  function t11() {
+    csmeth_r::m();
+  }
+  t11();
+  function t12() {
+    call_user_func(array('csmeth_d', 'm'));
+  }
+  t12();
+  function t13() {
+    class a extends cpar {
+}
+    new a;
+  }
+  t13();
+  function t14() {
+    class b extends cpar_r {
+}
+    new b;
+  }
+  t14();
+  function t15() {
+    new ReflectionClass('cref');
+  }
+  t15();
+  function t16() {
+    var_dump(class_exists('cex'));
+  }
+  t16();
+  function t17() {
+    var_dump(class_exists('cex_r'));
+  }
+  t17();
+}
+test();
+z();
+function __autoload($name) {
+  var_dump('autoload ' . $name);
+  switch ($name) {
+    case 'cNew':      class cNew {
+}
+      break;
+    case 'cNew_r':      class cNew_r {
+}
+      if (false) {
+        class cNew_r {
+}
+      }
+      break;
+    case 'cNew_d':      class cNew_d {
+}
+      break;
+    case 'csm':      class csm {
+        public static $mem = 1;
+      }
+      break;
+    case 'csm_r':      class csm_r {
+        public static $mem = 1;
+      }
+      if (false) {
+        class csm_r {
+}
+      }
+      break;
+    case 'CcOn':      class CcOn {
+        const C = 2;
+      }
+      break;
+    case 'CcOn_r':      class CcOn_r {
+        const C = 2;
+      }
+      if (false) {
+        class CcOn_r {
+}
+      }
+      break;
+    case 'CcOn_d':      class CcOn_d {
+        const C = 2;
+      }
+      break;
+    case 'csmeth':      class csmeth {
+        public static function m() {
+ echo '1
+';
+ }
+      }
+      break;
+    case 'csmeth_r':      class csmeth_r {
+        public static function m() {
+ echo '1';
+ }
+      }
+      if (false) {
+        class csmeth_r {
+}
+      }
+      break;
+    case 'csmeth_d':      class csmeth_d {
+        public static function m() {
+ echo '1';
+ }
+      }
+      break;
+    case 'cpar':      class cpar {
+}
+      break;
+    case 'cpar_r':      class cpar_r {
+}
+      if (false) {
+        class cpar_r {
+}
+      }
+      break;
+    case 'cref':      class cref {
+}
+      break;
+    case 'cex':      class cex {
+}
+      break;
+    case 'cex_r':      class cex_r {
+}
+      if (false) {
+        class cex_r {
+}
+      }
+      break;
+  }
+}
diff --git a/hphp/test/slow/volatile/1222.php b/hphp/test/slow/volatile/1222.php
index 832fb22ed..4fb877b92 100644
--- a/hphp/test/slow/volatile/1222.php
+++ b/hphp/test/slow/volatile/1222.php
@@ -1,3 +1,11 @@
 <?php
 
- class_exists('c');class c {  const A = 'a';  const B = 'b';  const C = 'c';  const D = 'd';  public static $S = array(    self::A,    self::B,    self::C,    self::D);}var_dump(c::$S);
\ No newline at end of file
+class_exists('c');
+class c {
+  const A = 'a';
+  const B = 'b';
+  const C = 'c';
+  const D = 'd';
+  public static $S = array(    self::A,    self::B,    self::C,    self::D);
+}
+var_dump(c::$S);
diff --git a/hphp/test/slow/volatile/1223.php b/hphp/test/slow/volatile/1223.php
index b44299d87..bb7c91b06 100644
--- a/hphp/test/slow/volatile/1223.php
+++ b/hphp/test/slow/volatile/1223.php
@@ -1,3 +1,16 @@
 <?php
 
- class B {}class A extends B {  static function make() {    $b = new parent();    $a = new self();  }}if (false) { class A {};}A::make();
\ No newline at end of file
+class B {
+}
+class A extends B {
+  static function make() {
+    $b = new parent();
+    $a = new self();
+  }
+}
+if (false) {
+ class A {
+}
+;
+}
+A::make();
diff --git a/hphp/test/slow/volatile/1224.php b/hphp/test/slow/volatile/1224.php
index 7bba26146..ea39e31c1 100644
--- a/hphp/test/slow/volatile/1224.php
+++ b/hphp/test/slow/volatile/1224.php
@@ -1,3 +1,21 @@
 <?php
 
- function foo($a) {  if ($a) {    class A {}  }}foo(true);function bar() {  if (class_exists('A')) {    class C extends A { }    $obj = new C;    var_dump($obj);  } else {    var_dump('no');  }}bar();
\ No newline at end of file
+function foo($a) {
+  if ($a) {
+    class A {
+}
+  }
+}
+foo(true);
+function bar() {
+  if (class_exists('A')) {
+    class C extends A {
+ }
+    $obj = new C;
+    var_dump($obj);
+  }
+ else {
+    var_dump('no');
+  }
+}
+bar();
diff --git a/hphp/test/slow/volatile/1225.php b/hphp/test/slow/volatile/1225.php
index 98050ad67..f162bb818 100644
--- a/hphp/test/slow/volatile/1225.php
+++ b/hphp/test/slow/volatile/1225.php
@@ -1,3 +1,21 @@
 <?php
 
- function foo($a) {  if ($a) {    interface A {}  }}foo(true);function bar() {  if (interface_exists('A')) {    class C implements A { }    $obj = new C;    var_dump($obj);  } else {    var_dump('no');  }}bar();
\ No newline at end of file
+function foo($a) {
+  if ($a) {
+    interface A {
+}
+  }
+}
+foo(true);
+function bar() {
+  if (interface_exists('A')) {
+    class C implements A {
+ }
+    $obj = new C;
+    var_dump($obj);
+  }
+ else {
+    var_dump('no');
+  }
+}
+bar();
diff --git a/hphp/test/slow/volatile/1226.php b/hphp/test/slow/volatile/1226.php
index a179baf77..0cfcf2351 100644
--- a/hphp/test/slow/volatile/1226.php
+++ b/hphp/test/slow/volatile/1226.php
@@ -1,3 +1,24 @@
 <?php
 
- if (class_exists('B')) {  class A extends B {    public function f() {      var_dump('A');    }  }}var_dump(class_exists('C'));class B extends C {  public function f() {    var_dump('B');  }}class C {}if (class_exists('A')) {  $obj = new A;  $obj->f();} else {  var_dump('correct');}
\ No newline at end of file
+if (class_exists('B')) {
+  class A extends B {
+    public function f() {
+      var_dump('A');
+    }
+  }
+}
+var_dump(class_exists('C'));
+class B extends C {
+  public function f() {
+    var_dump('B');
+  }
+}
+class C {
+}
+if (class_exists('A')) {
+  $obj = new A;
+  $obj->f();
+}
+ else {
+  var_dump('correct');
+}
diff --git a/hphp/test/slow/volatile/1227.php b/hphp/test/slow/volatile/1227.php
index 85c1cd7be..00425379d 100644
--- a/hphp/test/slow/volatile/1227.php
+++ b/hphp/test/slow/volatile/1227.php
@@ -1,3 +1,27 @@
 <?php
 
- function wrapper($a) {  if ($a) {    class C {      private static $v;      public static function f() {        return self::$v;      }    }  }}class C2 {  private static $v;  public static function f() {    return self::$v;  }}function foo($a) {  if ($a == 0) return is_callable(array('C', 'f'), null);  return is_callable(array('C2', 'f'), null);}wrapper(false);var_dump(foo(0));var_dump(foo(1));if (class_exists('C')) var_dump('yes'); else var_dump('no');
\ No newline at end of file
+function wrapper($a) {
+  if ($a) {
+    class C {
+      private static $v;
+      public static function f() {
+        return self::$v;
+      }
+    }
+  }
+}
+class C2 {
+  private static $v;
+  public static function f() {
+    return self::$v;
+  }
+}
+function foo($a) {
+  if ($a == 0) return is_callable(array('C', 'f'), null);
+  return is_callable(array('C2', 'f'), null);
+}
+wrapper(false);
+var_dump(foo(0));
+var_dump(foo(1));
+if (class_exists('C')) var_dump('yes');
+ else var_dump('no');
diff --git a/hphp/test/slow/volatile/1228.php b/hphp/test/slow/volatile/1228.php
index f3655b4eb..62751f588 100644
--- a/hphp/test/slow/volatile/1228.php
+++ b/hphp/test/slow/volatile/1228.php
@@ -1,3 +1,13 @@
 <?php
 
- function __autoload($name) {  if ($name == 'CaT') {  class CaT {    function __construct() {}  }  }  var_dump($name);}new CaT(1);class_exists('cat', false);
\ No newline at end of file
+function __autoload($name) {
+  if ($name == 'CaT') {
+  class CaT {
+    function __construct() {
+}
+  }
+  }
+  var_dump($name);
+}
+new CaT(1);
+class_exists('cat', false);
diff --git a/hphp/test/slow/volatile/1229.php b/hphp/test/slow/volatile/1229.php
index 261c8a90d..c63b59e48 100644
--- a/hphp/test/slow/volatile/1229.php
+++ b/hphp/test/slow/volatile/1229.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function autoload_first($name) {
   echo __METHOD__ . "\n";
   throw new Exception('first', 0, new Exception('first_inner'));
@@ -17,20 +16,25 @@ spl_autoload_register('autoload_first');
 spl_autoload_register('autoload_second');
 try {
   var_dump(class_exists('A'));
-} catch(Exception $e) {
+}
+ catch(Exception $e) {
   do {
     echo $e->getMessage() . "\n";
-  } while($e = $e->getPrevious());
+  }
+ while($e = $e->getPrevious());
 }
 try {
   $obj = new A();
-} catch(Exception $e) {
+}
+ catch(Exception $e) {
   do {
     echo $e->getMessage() . "\n";
-  } while($e = $e->getPrevious());
+  }
+ while($e = $e->getPrevious());
 }
 // hphpc won't call the autoloader unless there exists a 
 // definition for the class somewhere
 if (true) {
-  class A {}
+  class A {
+}
 }
diff --git a/hphp/test/slow/volatile/1230.php b/hphp/test/slow/volatile/1230.php
index c2fe7884f..fe8fe3b2b 100644
--- a/hphp/test/slow/volatile/1230.php
+++ b/hphp/test/slow/volatile/1230.php
@@ -1,7 +1,7 @@
 <?php
 
-
-function f($cls) {}
+function f($cls) {
+}
 var_dump(spl_autoload_functions());
 spl_autoload_register('f');
 var_dump(spl_autoload_functions());
diff --git a/hphp/test/slow/volatile/1231.php b/hphp/test/slow/volatile/1231.php
index 569a32f80..b2211fc4d 100644
--- a/hphp/test/slow/volatile/1231.php
+++ b/hphp/test/slow/volatile/1231.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function autoload_first($name) {
   echo __METHOD__ . "\n";
 }
@@ -27,8 +26,12 @@ echo "**************\n";
 // hphpc won't call the autoloader unless there exists a 
 // definition for the class somewhere
 if (true) {
-  class A {}
-  class B {}
-  class C {}
-  class D {}
+  class A {
+}
+  class B {
+}
+  class C {
+}
+  class D {
+}
 }
diff --git a/hphp/test/slow/volatile/1232.php b/hphp/test/slow/volatile/1232.php
index 17c83c5a6..ac0bb4c7b 100644
--- a/hphp/test/slow/volatile/1232.php
+++ b/hphp/test/slow/volatile/1232.php
@@ -1,10 +1,17 @@
 <?php
 
- spl_autoload_register(function($f) { var_dump(1); });
-spl_autoload_register(function($f) { var_dump(2); });
+spl_autoload_register(function($f) {
+ var_dump(1);
+ }
+);
+spl_autoload_register(function($f) {
+ var_dump(2);
+ }
+);
 class_exists('A');
 // hphpc won't call the autoloader unless there exists a
 // definition for the class somewhere
 if (true) {
-  class A {}
+  class A {
+}
 }
diff --git a/hphp/test/slow/volatile/1233.php b/hphp/test/slow/volatile/1233.php
index e9c4b0a4b..601efaff5 100644
--- a/hphp/test/slow/volatile/1233.php
+++ b/hphp/test/slow/volatile/1233.php
@@ -1,3 +1,21 @@
 <?php
 
- var_dump(fb_autoload_map(           array('function' => array(),                 'constant' => array(),                 'failure' => 'failure'),           ''));function failure($kind, $name) {  if ($kind == 'constant' && $name == 'bar') define('bar', 'baz');  var_dump($kind, $name);}var_dump(function_exists('foo'));var_dump(function_exists('bar', false));var_dump(defined('foo'));var_dump(defined('bar', false));var_dump(constant('foo'));var_dump(constant('bar'));if (0) {  function foo() {}  function foo() {}  define('foo', 0);  define('bar', 0);}
\ No newline at end of file
+var_dump(fb_autoload_map(           array('function' => array(),                 'constant' => array(),                 'failure' => 'failure'),           ''));
+function failure($kind, $name) {
+  if ($kind == 'constant' && $name == 'bar') define('bar', 'baz');
+  var_dump($kind, $name);
+}
+var_dump(function_exists('foo'));
+var_dump(function_exists('bar', false));
+var_dump(defined('foo'));
+var_dump(defined('bar', false));
+var_dump(constant('foo'));
+var_dump(constant('bar'));
+if (0) {
+  function foo() {
+}
+  function foo() {
+}
+  define('foo', 0);
+  define('bar', 0);
+}
diff --git a/hphp/test/slow/xml/1667.php b/hphp/test/slow/xml/1667.php
index 6dc6a711d..e22c8277c 100644
--- a/hphp/test/slow/xml/1667.php
+++ b/hphp/test/slow/xml/1667.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class xml {
   var $parser;
   function xml() {
@@ -9,12 +8,18 @@ class xml {
     xml_set_element_handler($this->parser, 'tag_open', 'tag_close');
     xml_set_character_data_handler($this->parser, 'cdata');
   }
-  function parse($data) { xml_parse($this->parser, $data);}
+  function parse($data) {
+ xml_parse($this->parser, $data);
+}
   function tag_open($parser, $tag, $attributes) {
     var_dump($tag, $attributes);
   }
-  function cdata($parser, $cdata) { var_dump($cdata);}
-  function tag_close($parser, $tag){ var_dump($tag);}
+  function cdata($parser, $cdata) {
+ var_dump($cdata);
+}
+  function tag_close($parser, $tag){
+ var_dump($tag);
+}
 }
 
 $xml_parser = new xml();
diff --git a/hphp/test/slow/xml/1668.php b/hphp/test/slow/xml/1668.php
index 01d8bd814..94d256ab1 100644
--- a/hphp/test/slow/xml/1668.php
+++ b/hphp/test/slow/xml/1668.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function parse_callback() {
   var_dump(func_get_args());
 }
diff --git a/hphp/test/slow/yield/2141.php b/hphp/test/slow/yield/2141.php
index 4995bbbd1..7bd63d523 100644
--- a/hphp/test/slow/yield/2141.php
+++ b/hphp/test/slow/yield/2141.php
@@ -1,3 +1,10 @@
 <?php
 
- function fruit() { yield 'apple'; yield 'banana';} foreach (fruit() as $fruit) { var_dump($fruit);} 
\ No newline at end of file
+function fruit() {
+ yield 'apple';
+ yield 'banana';
+}
+ foreach (fruit() as $fruit) {
+ var_dump($fruit);
+}
+
diff --git a/hphp/test/slow/yield/2142.php b/hphp/test/slow/yield/2142.php
index e9e1f999a..5ed2c4978 100644
--- a/hphp/test/slow/yield/2142.php
+++ b/hphp/test/slow/yield/2142.php
@@ -1,3 +1,12 @@
 <?php
 
- class F { function fruit() { yield 'apple'; yield 'banana';} }foreach (F::fruit() as $fruit) { var_dump($fruit);} 
\ No newline at end of file
+class F {
+ function fruit() {
+ yield 'apple';
+ yield 'banana';
+}
+ }
+foreach (F::fruit() as $fruit) {
+ var_dump($fruit);
+}
+
diff --git a/hphp/test/slow/yield/2143.php b/hphp/test/slow/yield/2143.php
index 5b61de139..8b8b0ad87 100644
--- a/hphp/test/slow/yield/2143.php
+++ b/hphp/test/slow/yield/2143.php
@@ -1,3 +1,13 @@
 <?php
 
- class F { function fruit() { yield 'apple'; yield 'banana';} }$f = new F; foreach ($f->fruit() as $fruit) { var_dump($fruit);} 
\ No newline at end of file
+class F {
+ function fruit() {
+ yield 'apple';
+ yield 'banana';
+}
+ }
+$f = new F;
+ foreach ($f->fruit() as $fruit) {
+ var_dump($fruit);
+}
+
diff --git a/hphp/test/slow/yield/2144.php b/hphp/test/slow/yield/2144.php
index a384aed02..e7f23d547 100644
--- a/hphp/test/slow/yield/2144.php
+++ b/hphp/test/slow/yield/2144.php
@@ -1,3 +1,11 @@
 <?php
 
- function fruit() { $a = 123; yield $a; yield ++$a;} foreach (fruit() as $fruit) { var_dump($fruit);} 
\ No newline at end of file
+function fruit() {
+ $a = 123;
+ yield $a;
+ yield ++$a;
+}
+ foreach (fruit() as $fruit) {
+ var_dump($fruit);
+}
+
diff --git a/hphp/test/slow/yield/2145.php b/hphp/test/slow/yield/2145.php
index 650b6aced..02989687c 100644
--- a/hphp/test/slow/yield/2145.php
+++ b/hphp/test/slow/yield/2145.php
@@ -1,3 +1,10 @@
 <?php
 
- function fruit() { echo "sadpanda, no fruit"; yield break; } foreach (fruit() as $fruit) { var_dump($fruit);} 
\ No newline at end of file
+function fruit() {
+ echo "sadpanda, no fruit";
+ yield break;
+ }
+ foreach (fruit() as $fruit) {
+ var_dump($fruit);
+}
+
diff --git a/hphp/test/slow/yield/2146.php b/hphp/test/slow/yield/2146.php
index 6676c4a0d..6e1ef9fc7 100644
--- a/hphp/test/slow/yield/2146.php
+++ b/hphp/test/slow/yield/2146.php
@@ -1,3 +1,12 @@
 <?php
 
- function fruit() { $a = 123; yield $a;yield break;yield ++$a;} foreach (fruit() as $fruit) { var_dump($fruit);} 
\ No newline at end of file
+function fruit() {
+ $a = 123;
+ yield $a;
+yield break;
+yield ++$a;
+}
+ foreach (fruit() as $fruit) {
+ var_dump($fruit);
+}
+
diff --git a/hphp/test/slow/yield/2147.php b/hphp/test/slow/yield/2147.php
index 1cd95666a..c0075175b 100644
--- a/hphp/test/slow/yield/2147.php
+++ b/hphp/test/slow/yield/2147.php
@@ -1,3 +1,11 @@
 <?php
 
- function nums() { for ($i = 0; $i < 3; $i++) yield $i;} foreach (nums() as $num) { var_dump($num);} 
\ No newline at end of file
+function nums() {
+ for ($i = 0;
+ $i < 3;
+ $i++) yield $i;
+}
+ foreach (nums() as $num) {
+ var_dump($num);
+}
+
diff --git a/hphp/test/slow/yield/2148.php b/hphp/test/slow/yield/2148.php
index 29ac0c05c..345b88d5a 100644
--- a/hphp/test/slow/yield/2148.php
+++ b/hphp/test/slow/yield/2148.php
@@ -1,3 +1,10 @@
 <?php
 
- function nums() { $i = 0; while ($i < 3) yield $i++;} foreach (nums() as $num) { var_dump($num);} 
\ No newline at end of file
+function nums() {
+ $i = 0;
+ while ($i < 3) yield $i++;
+}
+ foreach (nums() as $num) {
+ var_dump($num);
+}
+
diff --git a/hphp/test/slow/yield/2149.php b/hphp/test/slow/yield/2149.php
index a731ea708..10d52ccb7 100644
--- a/hphp/test/slow/yield/2149.php
+++ b/hphp/test/slow/yield/2149.php
@@ -1,3 +1,11 @@
 <?php
 
- function nums() { $i = 0; do yield $i++; while ($i < 3);} foreach (nums() as $num) { var_dump($num);} 
\ No newline at end of file
+function nums() {
+ $i = 0;
+ do yield $i++;
+ while ($i < 3);
+}
+ foreach (nums() as $num) {
+ var_dump($num);
+}
+
diff --git a/hphp/test/slow/yield/2150.php b/hphp/test/slow/yield/2150.php
index 1b5347e32..ee3ab6436 100644
--- a/hphp/test/slow/yield/2150.php
+++ b/hphp/test/slow/yield/2150.php
@@ -1,3 +1,20 @@
 <?php
 
- function nums() { $i = 0; foo: switch ($i) { case 0: yield $i; $i = 1; case 999: yield $i; break; $i = -1; case 1: $i = 2; yield $i; yield break;} goto foo;} foreach (nums() as $num) { var_dump($num);} 
\ No newline at end of file
+function nums() {
+ $i = 0;
+ foo: switch ($i) {
+ case 0: yield $i;
+ $i = 1;
+ case 999: yield $i;
+ break;
+ $i = -1;
+ case 1: $i = 2;
+ yield $i;
+ yield break;
+}
+ goto foo;
+}
+ foreach (nums() as $num) {
+ var_dump($num);
+}
+
diff --git a/hphp/test/slow/yield/2151.php b/hphp/test/slow/yield/2151.php
index 43d3ad83f..ee09a4b39 100644
--- a/hphp/test/slow/yield/2151.php
+++ b/hphp/test/slow/yield/2151.php
@@ -1,5 +1,9 @@
 <?php
 
-
-function f() { yield func_num_args(); yield func_get_arg(1); }
-foreach (f(1, 2, 3) as $v) { var_dump($v); }
+function f() {
+ yield func_num_args();
+ yield func_get_arg(1);
+ }
+foreach (f(1, 2, 3) as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/yield/2152.php b/hphp/test/slow/yield/2152.php
index 37f524ac6..955a7f7b3 100644
--- a/hphp/test/slow/yield/2152.php
+++ b/hphp/test/slow/yield/2152.php
@@ -1,14 +1,16 @@
 <?php
 
-
 function f($a1, &$a2) {
   foreach ($a1 as $k1 => $v1) {
     foreach ($a2 as $k2 => &$v2) {
-      $v2 += $v1; yield $v2;
+      $v2 += $v1;
+ yield $v2;
     }
   }
 }
 $a1 = array(1, 2);
 $a2 = array(1, 2);
-foreach (f($a1, $a2) as $v) { var_dump($v); }
+foreach (f($a1, $a2) as $v) {
+ var_dump($v);
+ }
 var_dump($a2[0], $a2[1]);
diff --git a/hphp/test/slow/yield/2153.php b/hphp/test/slow/yield/2153.php
index c33406e80..a52d48af4 100644
--- a/hphp/test/slow/yield/2153.php
+++ b/hphp/test/slow/yield/2153.php
@@ -1,5 +1,10 @@
 <?php
 
-
-$a = function() { yield 1; yield 2; };
-foreach ($a() as $v) { var_dump($v); }
+$a = function() {
+ yield 1;
+ yield 2;
+ }
+;
+foreach ($a() as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/yield/2154.php b/hphp/test/slow/yield/2154.php
index 0e036ff22..69361e515 100644
--- a/hphp/test/slow/yield/2154.php
+++ b/hphp/test/slow/yield/2154.php
@@ -1,9 +1,14 @@
 <?php
 
-
 function f() {
-  $a = function() { yield 1; yield 2; };
+  $a = function() {
+ yield 1;
+ yield 2;
+ }
+;
   return $a;
 }
 $f = f();
-foreach ($f() as $v) { var_dump($v); }
+foreach ($f() as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/yield/2155.php b/hphp/test/slow/yield/2155.php
index 5c25c8435..1cbe8217c 100644
--- a/hphp/test/slow/yield/2155.php
+++ b/hphp/test/slow/yield/2155.php
@@ -1,12 +1,17 @@
 <?php
 
-
 class A {
   function f() {
-    $a = function() { yield 1; yield 2; };
+    $a = function() {
+ yield 1;
+ yield 2;
+ }
+;
     return $a;
   }
 }
 $a = new A;
 $f = $a->f();
-foreach ($f() as $v) { var_dump($v); }
+foreach ($f() as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/yield/2156.php b/hphp/test/slow/yield/2156.php
index e5396e477..6fbe0c8b2 100644
--- a/hphp/test/slow/yield/2156.php
+++ b/hphp/test/slow/yield/2156.php
@@ -1,8 +1,9 @@
 <?php
 
-
 function f() {
-  $a = yield 1; list($a, $b) = yield $a; yield $b;
+  $a = yield 1;
+ list($a, $b) = yield $a;
+ yield $b;
 }
 $c = f();
 $c->next();
diff --git a/hphp/test/slow/yield/2157.php b/hphp/test/slow/yield/2157.php
index 267f1a174..00a78fb4f 100644
--- a/hphp/test/slow/yield/2157.php
+++ b/hphp/test/slow/yield/2157.php
@@ -1,4 +1,20 @@
 <?php
 
-
-class A {  public function foo() {    $this->bar(function() {yield 1; yield 2; yield 3;});  }  public function bar(Closure $c) {    $a = $c();    foreach ($a as $b) {      echo $b."\n";    }  }}$a = new A();$a->foo();
\ No newline at end of file
+class A {
+  public function foo() {
+    $this->bar(function() {
+yield 1;
+ yield 2;
+ yield 3;
+}
+);
+  }
+  public function bar(Closure $c) {
+    $a = $c();
+    foreach ($a as $b) {
+      echo $b."\n";
+    }
+  }
+}
+$a = new A();
+$a->foo();
diff --git a/hphp/test/slow/yield/2158.php b/hphp/test/slow/yield/2158.php
index 5b6e47bdd..39ec0bb8c 100644
--- a/hphp/test/slow/yield/2158.php
+++ b/hphp/test/slow/yield/2158.php
@@ -1,3 +1,13 @@
 <?php
 
- function foo($t) {  $x = function() use ($t) {    var_dump($t);    yield 1;  };  foreach ($x() as $y) {    var_dump($y);  }}foo(42);
\ No newline at end of file
+function foo($t) {
+  $x = function() use ($t) {
+    var_dump($t);
+    yield 1;
+  }
+;
+  foreach ($x() as $y) {
+    var_dump($y);
+  }
+}
+foo(42);
diff --git a/hphp/test/slow/yield/2159.php b/hphp/test/slow/yield/2159.php
index 894d1336b..bcbefd76d 100644
--- a/hphp/test/slow/yield/2159.php
+++ b/hphp/test/slow/yield/2159.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x) {
   switch ($x++ + ++$x) {
   case 1:
@@ -13,5 +12,9 @@ function f($x) {
     yield 4;
   }
 }
-foreach (f(0) as $x) { var_dump($x); }
-foreach (f(1) as $x) { var_dump($x); }
+foreach (f(0) as $x) {
+ var_dump($x);
+ }
+foreach (f(1) as $x) {
+ var_dump($x);
+ }
diff --git a/hphp/test/slow/yield/2160.php b/hphp/test/slow/yield/2160.php
index d379aea11..f215f70b2 100644
--- a/hphp/test/slow/yield/2160.php
+++ b/hphp/test/slow/yield/2160.php
@@ -1,3 +1,14 @@
 <?php
 
- function f($x) { return $x; }function foo($a) {  yield 1;  foreach ((array)f($a) as $x) {    var_dump('i:'.$x);  }}foreach (foo(array(1)) as $x) {  var_dump('o:'.$x);}
\ No newline at end of file
+function f($x) {
+ return $x;
+ }
+function foo($a) {
+  yield 1;
+  foreach ((array)f($a) as $x) {
+    var_dump('i:'.$x);
+  }
+}
+foreach (foo(array(1)) as $x) {
+  var_dump('o:'.$x);
+}
diff --git a/hphp/test/slow/yield/2161.php b/hphp/test/slow/yield/2161.php
index 1d7e68277..b84d54082 100644
--- a/hphp/test/slow/yield/2161.php
+++ b/hphp/test/slow/yield/2161.php
@@ -1,11 +1,13 @@
 <?php
 
-
 $env = 3;
 $f = function ($arg0) use (&$env) {
   yield $arg0;
   yield $arg0 + ($env++);
   yield $arg0 + ($env++) + 1;
-};
-foreach ($f(32) as $x) { var_dump($x); }
+}
+;
+foreach ($f(32) as $x) {
+ var_dump($x);
+ }
 var_dump($env);
diff --git a/hphp/test/slow/yield/2162.php b/hphp/test/slow/yield/2162.php
index 04c42dfc5..b59fa4006 100644
--- a/hphp/test/slow/yield/2162.php
+++ b/hphp/test/slow/yield/2162.php
@@ -1,11 +1,11 @@
 <?php
 
-
 $env = 3;
 $f = function (&$arg0) use ($env) {
   yield $arg0++ + $env;
   yield $arg0++ + $env;
-};
+}
+;
 foreach ($f($env) as $x) {
   var_dump($x);
 }
diff --git a/hphp/test/slow/yield/2163.php b/hphp/test/slow/yield/2163.php
index e0e66ad19..08f7be41c 100644
--- a/hphp/test/slow/yield/2163.php
+++ b/hphp/test/slow/yield/2163.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class X {
   public function doIt() {
     throw new Exception('foobar');
@@ -10,10 +9,13 @@ function f($obj) {
   $res = null;
   try {
     $res = $obj->doIt();
-  } catch (Exception $e) {
+  }
+ catch (Exception $e) {
     $res = $e->getMessage();
   }
   yield $res;
 }
 $x = new X;
-foreach (f($x) as $i) { var_dump($i); }
+foreach (f($x) as $i) {
+ var_dump($i);
+ }
diff --git a/hphp/test/slow/yield/2164.php b/hphp/test/slow/yield/2164.php
index 673f3e302..ad3bcb097 100644
--- a/hphp/test/slow/yield/2164.php
+++ b/hphp/test/slow/yield/2164.php
@@ -1,17 +1,21 @@
 <?php
 
-
 function f($x, $y) {
-  yield $x; 
+  yield $x;
+
   yield $$y;
 }
-foreach (f(10, 'x') as $x) { var_dump($x); }
+foreach (f(10, 'x') as $x) {
+ var_dump($x);
+ }
 function g() {
   extract(func_get_args(), EXTR_PREFIX_ALL, 'foo');
   yield $foo_0;
   yield $foo_1;
 }
-foreach (g('hello', 'world') as $x) { var_dump($x); }
+foreach (g('hello', 'world') as $x) {
+ var_dump($x);
+ }
 function h($x, $y) {
   $z = 16;
   $arr = compact('x', 'y', 'z');
@@ -19,9 +23,13 @@ function h($x, $y) {
   yield $arr['x'];
   yield $arr['y'];
 }
-foreach (h(32, 64) as $x) { var_dump($x); }
+foreach (h(32, 64) as $x) {
+ var_dump($x);
+ }
 function i($x, $y) {
   $arr = compact($x);
   yield $arr[$x];
 }
-foreach (i('y', 32) as $x) { var_dump($x); }
+foreach (i('y', 32) as $x) {
+ var_dump($x);
+ }
diff --git a/hphp/test/slow/yield/2165.php b/hphp/test/slow/yield/2165.php
index c3e3c6e19..d144834ef 100644
--- a/hphp/test/slow/yield/2165.php
+++ b/hphp/test/slow/yield/2165.php
@@ -1,70 +1,127 @@
 <?php
 
-
 // redec class gen
-function get() { return true; }
+function get() {
+ return true;
+ }
 if (get()) {
-  class X { 
-    public function yielder() { yield 'first'; }
+  class X {
+
+    public function yielder() {
+ yield 'first';
+ }
   }
-} else {
-  class X { 
-    public function yielder() { yield 'second'; }
+}
+ else {
+  class X {
+
+    public function yielder() {
+ yield 'second';
+ }
   }
 }
 $x = new X;
-foreach ($x->yielder() as $foo) { var_dump($foo); }
+foreach ($x->yielder() as $foo) {
+ var_dump($foo);
+ }
 
 // derive from redec gen
 class Foo {
-  public function fooMsg() { return 'foo'; }
-  public function fooGen() { yield $this->fooMsg(); }
+  public function fooMsg() {
+ return 'foo';
+ }
+  public function fooGen() {
+ yield $this->fooMsg();
+ }
 }
 if (get()) {
   class Bar extends Foo {
-    public function fooMsg() { return 'bar'; }
-    public function barMsg() { return 'bar'; }
-    public function barGen() { yield $this->barMsg(); }
+    public function fooMsg() {
+ return 'bar';
+ }
+    public function barMsg() {
+ return 'bar';
+ }
+    public function barGen() {
+ yield $this->barMsg();
+ }
   }
-} else {
-  class Bar extends Foo {}
+}
+ else {
+  class Bar extends Foo {
+}
 }
 $f = new Foo;
-foreach ($f->fooGen() as $foo) { var_dump($foo); }
+foreach ($f->fooGen() as $foo) {
+ var_dump($foo);
+ }
 $b = new Bar;
-foreach ($b->fooGen() as $foo) { var_dump($foo); }
-foreach ($b->barGen() as $foo) { var_dump($foo); }
+foreach ($b->fooGen() as $foo) {
+ var_dump($foo);
+ }
+foreach ($b->barGen() as $foo) {
+ var_dump($foo);
+ }
 
 // conditional derive from redec gen
-function get0() { return false; }
+function get0() {
+ return false;
+ }
 function f($x) {
   if ($x) {
     if (get0()) {
       class X1 {
-        public function msg() { return 'first, first'; }
-        public function gen() { yield $this->msg(); }
-      }   
-    } else {
+        public function msg() {
+ return 'first, first';
+ }
+        public function gen() {
+ yield $this->msg();
+ }
+      }
+
+    }
+ else {
       class X1 {
-        public function msg() { return 'first, second'; }
-        public function gen() { yield $this->msg(); }
-      }   
-    }   
-  } else {
+        public function msg() {
+ return 'first, second';
+ }
+        public function gen() {
+ yield $this->msg();
+ }
+      }
+
+    }
+
+  }
+ else {
     if (get()) {
       class Y extends X1 {
-        public function msg() { return 'second, first'; }
-        public function gen() { yield $this->msg(); }
-      }   
-    } else {
+        public function msg() {
+ return 'second, first';
+ }
+        public function gen() {
+ yield $this->msg();
+ }
+      }
+
+    }
+ else {
       class Y extends X1 {
-        public function msg() { return 'second, second'; }
-        public function gen() { yield $this->msg(); }
-      }   
-    }   
+        public function msg() {
+ return 'second, second';
+ }
+        public function gen() {
+ yield $this->msg();
+ }
+      }
+
+    }
+
   }
   $x = $x ? new X1 : new Y;
-  foreach ($x->gen() as $foo) { var_dump($foo); }
+  foreach ($x->gen() as $foo) {
+ var_dump($foo);
+ }
 }
 f(true);
 f(false);
diff --git a/hphp/test/slow/yield/2166.php b/hphp/test/slow/yield/2166.php
index ecec9cb49..7d2d5a226 100644
--- a/hphp/test/slow/yield/2166.php
+++ b/hphp/test/slow/yield/2166.php
@@ -1,16 +1,20 @@
 <?php
 
-
-function get() { return true; }
+function get() {
+ return true;
+ }
 if (get()) {
   function gen($i) {
     yield $i;
     yield $i + 1;
   }
-} else {
+}
+ else {
   function gen($i) {
     yield $i + 1;
     yield $i + 2;
   }
 }
-foreach (gen(3) as $x) { var_dump($x); }
+foreach (gen(3) as $x) {
+ var_dump($x);
+ }
diff --git a/hphp/test/slow/yield/2167.php b/hphp/test/slow/yield/2167.php
index aa15d8704..eeb6d0a9c 100644
--- a/hphp/test/slow/yield/2167.php
+++ b/hphp/test/slow/yield/2167.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class X {
   function foo($t) {
     $$t = 5;
@@ -8,4 +7,6 @@ class X {
   }
 }
 $x = new X;
-foreach ($x->foo('this') as $v) { var_dump($v); }
+foreach ($x->foo('this') as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/yield/2169.php b/hphp/test/slow/yield/2169.php
index 34af3200c..27a6e13c0 100644
--- a/hphp/test/slow/yield/2169.php
+++ b/hphp/test/slow/yield/2169.php
@@ -1,3 +1,9 @@
 <?php
 
- function foo($x = null) {  if ($x) $x = 'foo';  var_dump($x);  yield 1;  }foreach(foo() as $x) {}
\ No newline at end of file
+function foo($x = null) {
+  if ($x) $x = 'foo';
+  var_dump($x);
+  yield 1;
+  }
+foreach(foo() as $x) {
+}
diff --git a/hphp/test/slow/yield/2170.php b/hphp/test/slow/yield/2170.php
index 53dded1a0..a262bae4e 100644
--- a/hphp/test/slow/yield/2170.php
+++ b/hphp/test/slow/yield/2170.php
@@ -1,3 +1,18 @@
 <?php
 
- function bar($x) { return $x ? $x + 1 : false; }function foo($a) {  $x = bar($a);  switch ($x) {    case 'hello': echo 1; break;    case bar(3): echo 2; break;  }  yield $x;}foreach(foo(3) as $x) { var_dump($x); }
\ No newline at end of file
+function bar($x) {
+ return $x ? $x + 1 : false;
+ }
+function foo($a) {
+  $x = bar($a);
+  switch ($x) {
+    case 'hello': echo 1;
+ break;
+    case bar(3): echo 2;
+ break;
+  }
+  yield $x;
+}
+foreach(foo(3) as $x) {
+ var_dump($x);
+ }
diff --git a/hphp/test/slow/yield/2171.php b/hphp/test/slow/yield/2171.php
index 2869c295b..ec5604c72 100644
--- a/hphp/test/slow/yield/2171.php
+++ b/hphp/test/slow/yield/2171.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $x = 32;
 $SOME_VAR = 'foo';
 function f($a0, $a1, $a2, $a3) {
diff --git a/hphp/test/slow/yield/2172.php b/hphp/test/slow/yield/2172.php
index 1e21fb06a..24a0fd991 100644
--- a/hphp/test/slow/yield/2172.php
+++ b/hphp/test/slow/yield/2172.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $x = 0;
 function f() {
   global $x;
@@ -8,7 +7,9 @@ function f() {
   yield $x++;
   yield $y++;
 }
-for ($i = 0; $i < 5; $i++) {
+for ($i = 0;
+ $i < 5;
+ $i++) {
   foreach (f() as $value) {
     var_dump($value);
   }
diff --git a/hphp/test/slow/yield/2173.php b/hphp/test/slow/yield/2173.php
index 65b408f13..b16e88e00 100644
--- a/hphp/test/slow/yield/2173.php
+++ b/hphp/test/slow/yield/2173.php
@@ -1,3 +1,39 @@
 <?php
 
- class A {  public static function sgen() {    $class = get_called_class();    yield $class;  }  public static function sfoo() {    return self::gen();  }  public function gen() {    $class = get_called_class();    yield $class;  }  public function foo() {    return self::gen();  }}class B extends A {}function t($x) { foreach ($x as $v) { var_dump($v); } }t(B::sgen());t(B::sfoo());t(A::sgen());t(A::sfoo());t(B::gen());t(B::foo());t(A::gen());t(A::foo());$b = new B;t($b->gen());t($b->foo());$a = new A;t($a->gen());t($a->foo());
\ No newline at end of file
+class A {
+  public static function sgen() {
+    $class = get_called_class();
+    yield $class;
+  }
+  public static function sfoo() {
+    return self::gen();
+  }
+  public function gen() {
+    $class = get_called_class();
+    yield $class;
+  }
+  public function foo() {
+    return self::gen();
+  }
+}
+class B extends A {
+}
+function t($x) {
+ foreach ($x as $v) {
+ var_dump($v);
+ }
+ }
+t(B::sgen());
+t(B::sfoo());
+t(A::sgen());
+t(A::sfoo());
+t(B::gen());
+t(B::foo());
+t(A::gen());
+t(A::foo());
+$b = new B;
+t($b->gen());
+t($b->foo());
+$a = new A;
+t($a->gen());
+t($a->foo());
diff --git a/hphp/test/slow/yield/2174.php b/hphp/test/slow/yield/2174.php
index e9a0df55b..7d6ecee8d 100644
--- a/hphp/test/slow/yield/2174.php
+++ b/hphp/test/slow/yield/2174.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function f($x) {
   yield $x;
 }
@@ -8,10 +7,15 @@ $c = f(32);
 var_dump($c->getOrigFuncName());
 var_dump($c->getCalledClass());
 class X {
-  function f($x) { yield $x; }
-  static function g($x) { yield get_called_class(); }
+  function f($x) {
+ yield $x;
+ }
+  static function g($x) {
+ yield get_called_class();
+ }
+}
+class Y extends X {
 }
-class Y extends X {}
 $x = new X;
 $c = $x->f(32);
 var_dump($c->getOrigFuncName());
@@ -22,7 +26,10 @@ var_dump($c->getCalledClass());
 $c = Y::g(32);
 var_dump($c->getOrigFuncName());
 var_dump($c->getCalledClass());
-$fcn = function ($x) { yield $x; };
+$fcn = function ($x) {
+ yield $x;
+ }
+;
 $c = $fcn(32);
 var_dump($c->getOrigFuncName());
 var_dump($c->getCalledClass());
diff --git a/hphp/test/slow/yield/2175.php b/hphp/test/slow/yield/2175.php
index 0c72967f3..b6796976d 100644
--- a/hphp/test/slow/yield/2175.php
+++ b/hphp/test/slow/yield/2175.php
@@ -1,3 +1,28 @@
 <?php
 
- function gen() {  yield 1;  yield 2;  try {    $a = yield 3;  } catch (Exception $e) {    var_dump($e->getMessage());    yield 4;  }  yield 5;}foreach (gen() as $x) { var_dump($x); }$g = gen();$g->next();var_dump($g->current());$g->next();var_dump($g->current());$g->next();var_dump($g->current());$g->raise(new Exception('foobar'));var_dump($g->current());$g->next();var_dump($g->current());
\ No newline at end of file
+function gen() {
+  yield 1;
+  yield 2;
+  try {
+    $a = yield 3;
+  }
+ catch (Exception $e) {
+    var_dump($e->getMessage());
+    yield 4;
+  }
+  yield 5;
+}
+foreach (gen() as $x) {
+ var_dump($x);
+ }
+$g = gen();
+$g->next();
+var_dump($g->current());
+$g->next();
+var_dump($g->current());
+$g->next();
+var_dump($g->current());
+$g->raise(new Exception('foobar'));
+var_dump($g->current());
+$g->next();
+var_dump($g->current());
diff --git a/hphp/test/slow/yield/2176.php b/hphp/test/slow/yield/2176.php
index 160d98332..509af4b73 100644
--- a/hphp/test/slow/yield/2176.php
+++ b/hphp/test/slow/yield/2176.php
@@ -1,3 +1,34 @@
 <?php
 
- class YieldedException extends Exception {}class ReflectedException extends Exception {}function throwYieldedException() {  throw new YieldedException();}function gen() {  try {    $a = yield throwYieldedException();    echo 'Gen got '.$a;  } catch (YieldedException $e) {    var_dump('Got yieldedException, re-raising.');    throw $e;  } catch (ReflectedException $e) {    var_dump('Got Reflected Exception');  }}try {  $g = gen();  $g->next();} catch(YieldedException $e) {  try {    $g->raise(new ReflectedException());  } catch (Exception $e) {    var_dump($e->getMessage());  }}
\ No newline at end of file
+class YieldedException extends Exception {
+}
+class ReflectedException extends Exception {
+}
+function throwYieldedException() {
+  throw new YieldedException();
+}
+function gen() {
+  try {
+    $a = yield throwYieldedException();
+    echo 'Gen got '.$a;
+  }
+ catch (YieldedException $e) {
+    var_dump('Got yieldedException, re-raising.');
+    throw $e;
+  }
+ catch (ReflectedException $e) {
+    var_dump('Got Reflected Exception');
+  }
+}
+try {
+  $g = gen();
+  $g->next();
+}
+ catch(YieldedException $e) {
+  try {
+    $g->raise(new ReflectedException());
+  }
+ catch (Exception $e) {
+    var_dump($e->getMessage());
+  }
+}
diff --git a/hphp/test/slow/yield/2177.php b/hphp/test/slow/yield/2177.php
index b1bceaef2..9c7c2101f 100644
--- a/hphp/test/slow/yield/2177.php
+++ b/hphp/test/slow/yield/2177.php
@@ -1,12 +1,12 @@
 <?php
 
-
 function makeClosureCont() {
   return function () {
     static $x = 0;
     yield $x++;
     yield $x++;
-  };
+  }
+;
 }
 function gen() {
   static $x = 0;
@@ -14,8 +14,16 @@ function gen() {
   yield $x++;
 }
 $cc = makeClosureCont();
-foreach ($cc() as $v) { var_dump($v); }
+foreach ($cc() as $v) {
+ var_dump($v);
+ }
 $cc1 = makeClosureCont();
-foreach ($cc1() as $v) { var_dump($v); }
-foreach (gen() as $v) { var_dump($v); }
-foreach (gen() as $v) { var_dump($v); }
+foreach ($cc1() as $v) {
+ var_dump($v);
+ }
+foreach (gen() as $v) {
+ var_dump($v);
+ }
+foreach (gen() as $v) {
+ var_dump($v);
+ }
diff --git a/hphp/test/slow/yield/2178.php b/hphp/test/slow/yield/2178.php
index 62b083378..6f171288b 100644
--- a/hphp/test/slow/yield/2178.php
+++ b/hphp/test/slow/yield/2178.php
@@ -1,3 +1,14 @@
 <?php
 
- class X {  public static function gen() {    static $x;    yield ++$x;    yield 2;    yield ++$x;  }}class Y extends X {}$g = X::gen();foreach ($g as $i) var_dump($i);
\ No newline at end of file
+class X {
+  public static function gen() {
+    static $x;
+    yield ++$x;
+    yield 2;
+    yield ++$x;
+  }
+}
+class Y extends X {
+}
+$g = X::gen();
+foreach ($g as $i) var_dump($i);
diff --git a/hphp/test/slow/yield/2179.php b/hphp/test/slow/yield/2179.php
index c2702d867..ad2794ee7 100644
--- a/hphp/test/slow/yield/2179.php
+++ b/hphp/test/slow/yield/2179.php
@@ -1,3 +1,24 @@
 <?php
 
- trait DY {  private $drc = array();  public function dty($key) {    $this->drc[$key] = true;    yield (true);  }  public function edd($key) {    if (array_key_exists($key, $this->drc)) {      var_dump(true);    }   }}class C { use DY; }class D extends C { }$obj = new D;foreach($obj->dty('foo') as $var) {  var_dump($var);}$obj->edd('foo');
\ No newline at end of file
+trait DY {
+  private $drc = array();
+  public function dty($key) {
+    $this->drc[$key] = true;
+    yield (true);
+  }
+  public function edd($key) {
+    if (array_key_exists($key, $this->drc)) {
+      var_dump(true);
+    }
+   }
+}
+class C {
+ use DY;
+ }
+class D extends C {
+ }
+$obj = new D;
+foreach($obj->dty('foo') as $var) {
+  var_dump($var);
+}
+$obj->edd('foo');
diff --git a/hphp/test/slow/yield/2180.php b/hphp/test/slow/yield/2180.php
index e093bfe90..a3a5cbe3a 100644
--- a/hphp/test/slow/yield/2180.php
+++ b/hphp/test/slow/yield/2180.php
@@ -1,4 +1,28 @@
 <?php
 
-
-trait T {  abstract protected function gpc();  public function gen() {    yield $this->gpc();  }}class C1 {  use T;  protected function gpc() {    return 1;  }}class C2 {  use T;  protected function gpc() {    return 2;  }}$obj1 = new C1();$obj2 = new C2();$c1 = $obj1->gen();$c2 = $obj2->gen();$c1->next();var_dump($c1->current());$c2->next();var_dump($c2->current());
\ No newline at end of file
+trait T {
+  abstract protected function gpc();
+  public function gen() {
+    yield $this->gpc();
+  }
+}
+class C1 {
+  use T;
+  protected function gpc() {
+    return 1;
+  }
+}
+class C2 {
+  use T;
+  protected function gpc() {
+    return 2;
+  }
+}
+$obj1 = new C1();
+$obj2 = new C2();
+$c1 = $obj1->gen();
+$c2 = $obj2->gen();
+$c1->next();
+var_dump($c1->current());
+$c2->next();
+var_dump($c2->current());
diff --git a/hphp/test/slow/yield/2181.php b/hphp/test/slow/yield/2181.php
index 2fb072344..5a74cab47 100644
--- a/hphp/test/slow/yield/2181.php
+++ b/hphp/test/slow/yield/2181.php
@@ -1,3 +1,16 @@
 <?php
 
- function foo($results) {  yield 0;  foreach ($results as &$result) {    $result->foo = 1;  }  var_dump($results);  yield 1;}function bar() {  foreach (foo(array()) as $r) {    var_dump($r);  }}bar();
\ No newline at end of file
+function foo($results) {
+  yield 0;
+  foreach ($results as &$result) {
+    $result->foo = 1;
+  }
+  var_dump($results);
+  yield 1;
+}
+function bar() {
+  foreach (foo(array()) as $r) {
+    var_dump($r);
+  }
+}
+bar();
diff --git a/hphp/test/slow/yield/2182.php b/hphp/test/slow/yield/2182.php
index a56458ad5..3a505efa7 100644
--- a/hphp/test/slow/yield/2182.php
+++ b/hphp/test/slow/yield/2182.php
@@ -1,3 +1,25 @@
 <?php
 
-class X {  private $a = array(1,2,3);  function foo() { yield $this->a; }}if (isset($g)) {  class Y {}} else {  class Y extends X {}}class Z extends Y {}function test() {  $z = new Z;  foreach ($z->foo() as $v) {    var_dump($v);  }}test();
\ No newline at end of file
+class X {
+  private $a = array(1,2,3);
+  function foo() {
+ yield $this->a;
+ }
+}
+if (isset($g)) {
+  class Y {
+}
+}
+ else {
+  class Y extends X {
+}
+}
+class Z extends Y {
+}
+function test() {
+  $z = new Z;
+  foreach ($z->foo() as $v) {
+    var_dump($v);
+  }
+}
+test();
diff --git a/hphp/test/slow/yield/2183.php b/hphp/test/slow/yield/2183.php
index 0e50531a7..55ff0b815 100644
--- a/hphp/test/slow/yield/2183.php
+++ b/hphp/test/slow/yield/2183.php
@@ -1,13 +1,12 @@
 <?php
 
-
-
 class Evil {
   public function __destruct() {
     echo "in __destruct()\n";
     try {
       dumpCurrent();
-    } catch (Exception $e) {
+    }
+ catch (Exception $e) {
       printf("Caught: %s\n", $e->getMessage());
     }
   }
diff --git a/hphp/test/slow/yield/2184.php b/hphp/test/slow/yield/2184.php
index 8d94bdb3c..3ecc42966 100644
--- a/hphp/test/slow/yield/2184.php
+++ b/hphp/test/slow/yield/2184.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class Foo implements Iterator {
   private $data = array(1, 2, 3);
 
@@ -36,4 +35,5 @@ function run_test() {
   }
 }
 
-foreach (run_test() as $_) {}
+foreach (run_test() as $_) {
+}
diff --git a/hphp/test/slow/yield/2185.php b/hphp/test/slow/yield/2185.php
index bdc25277b..bb77e80ef 100644
--- a/hphp/test/slow/yield/2185.php
+++ b/hphp/test/slow/yield/2185.php
@@ -1,6 +1,5 @@
 <?php
 
-
 function gen(int $mode) {
   yield $mode;
   switch ($mode) {
@@ -11,7 +10,9 @@ function gen(int $mode) {
   yield 47;
 }
 
-for ($mode = 0; $mode < 3; ++$mode) {
+for ($mode = 0;
+ $mode < 3;
+ ++$mode) {
   echo "Testing mode $mode:\n";
   $gen = gen($mode);
   try {
@@ -20,7 +21,8 @@ for ($mode = 0; $mode < 3; ++$mode) {
       var_dump($gen->current());
       $gen->next();
     }
-  } catch (Exception $ex) {
+  }
+ catch (Exception $ex) {
     echo "EXCEPTION\n";
   }
   var_dump($gen->valid());
diff --git a/hphp/test/slow/yield/2186.php b/hphp/test/slow/yield/2186.php
index 4191a3da8..882921f2b 100644
--- a/hphp/test/slow/yield/2186.php
+++ b/hphp/test/slow/yield/2186.php
@@ -1,3 +1,17 @@
 <?php
 
- function gen(&$x) {  $x = 1;  yield 1;  $x = 2;  yield 3;  $x = 4;}function test() {  $x = 0;  foreach (gen($x) as $y) {    var_dump($y);  }  var_dump($x);}test();
\ No newline at end of file
+function gen(&$x) {
+  $x = 1;
+  yield 1;
+  $x = 2;
+  yield 3;
+  $x = 4;
+}
+function test() {
+  $x = 0;
+  foreach (gen($x) as $y) {
+    var_dump($y);
+  }
+  var_dump($x);
+}
+test();