From 89e34e12e6d55d8e0931c89ee41558b686cb1c5f Mon Sep 17 00:00:00 2001
From: jdelong <jdelong@fb.com>
Date: Wed, 17 Apr 2013 11:33:20 -0700
Subject: [PATCH] Disable memelim

It's causing issues with the vector translator.
---
 hphp/runtime/vm/translator/hopt/memelim.cpp    |  5 ++++-
 hphp/test/quick/hopt_cgetelemc_test.php        | 15 +++++++++++++++
 hphp/test/quick/hopt_cgetelemc_test.php.expect |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 hphp/test/quick/hopt_cgetelemc_test.php
 create mode 100644 hphp/test/quick/hopt_cgetelemc_test.php.expect

diff --git a/hphp/runtime/vm/translator/hopt/memelim.cpp b/hphp/runtime/vm/translator/hopt/memelim.cpp
index 46bd9f494..96bef3c35 100644
--- a/hphp/runtime/vm/translator/hopt/memelim.cpp
+++ b/hphp/runtime/vm/translator/hopt/memelim.cpp
@@ -818,7 +818,10 @@ void MemMap::sinkStores(StoreList& stores) {
 }
 
 void optimizeMemoryAccesses(Trace* trace, IRFactory* factory) {
-  MemMap(factory).optimizeMemoryAccesses(trace);
+  if (false) { // TODO(#2302684): memelim can break vector
+               // translations right now
+    MemMap(factory).optimizeMemoryAccesses(trace);
+  }
 }
 
 } } }
diff --git a/hphp/test/quick/hopt_cgetelemc_test.php b/hphp/test/quick/hopt_cgetelemc_test.php
new file mode 100644
index 000000000..64fb9db45
--- /dev/null
+++ b/hphp/test/quick/hopt_cgetelemc_test.php
@@ -0,0 +1,15 @@
+<?php
+
+function val() { return 0; }
+function foo($k) {
+  $array = array(0, 1);
+  $idx =& val();
+  for ($ik = 0; $ik < 10; ++$ik) {
+  }
+
+  $idx++;
+  echo $array[$idx];
+  echo "\n";
+}
+
+foo(12);
diff --git a/hphp/test/quick/hopt_cgetelemc_test.php.expect b/hphp/test/quick/hopt_cgetelemc_test.php.expect
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/hphp/test/quick/hopt_cgetelemc_test.php.expect
@@ -0,0 +1 @@
+1