Collapse runtime/vm/translator's contents into runtime/vm/jit

Facebook: ~bsimmers/bin/move-vm-files.sh

hphp/hhvm/process_init.cpp

@@ -23,10 +23,10 @@
 #include "hphp/runtime/vm/funcdict.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/ext_hhvm/ext_hhvm.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
-#include "hphp/runtime/vm/translator/fixup.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/fixup.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/eval/runtime/file_repository.h"
 #include "hphp/system/lib/systemlib.h"
 #include "hphp/util/logger.h"

hphp/runtime/base/array/hphp_array_sort.cpp

@@ -20,7 +20,7 @@
 #include "hphp/runtime/base/array/sort_helpers.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/execution_context.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/base/builtin_functions.cpp

@@ -35,8 +35,8 @@
 #include "hphp/util/util.h"
 #include "hphp/util/process.h"
 #include "hphp/runtime/vm/repo.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/event_hook.h"
 #include "hphp/system/lib/systemlib.h"

hphp/runtime/base/execution_context.cpp

@@ -39,8 +39,8 @@
 #include "hphp/runtime/eval/debugger/debugger.h"
 #include "hphp/runtime/eval/runtime/file_repository.h"
 #include "hphp/runtime/ext/ext_string.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/debugger_hook.h"
 #include "hphp/runtime/vm/event_hook.h"
 

hphp/runtime/base/file/user_file.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/base/file/user_file.h"
 #include "hphp/runtime/ext/ext_function.h"
 #include "hphp/runtime/vm/instance.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 namespace HPHP {
 

hphp/runtime/base/hardware_counter.cpp

@@ -33,7 +33,7 @@
 #include "hphp/runtime/base/string_data.h"
 #include "hphp/runtime/base/zend/zend_url.h"
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/base/intercept.cpp

@@ -19,7 +19,7 @@
 #include "hphp/runtime/base/array/array_iterator.h"
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/event_hook.h"
 
@@ -27,7 +27,7 @@
 #include "hphp/util/lock.h"
 
 #include "hphp/runtime/eval/runtime/file_repository.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/util/trace.h"
 
 using namespace HPHP::Trace;

hphp/runtime/base/program_functions.cpp

@@ -64,7 +64,7 @@
 
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/vm/repo.h"
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/compiler/builtin_symbols.h"
 
 using namespace boost::program_options;

hphp/runtime/base/server/admin_request_handler.cpp

@@ -34,8 +34,8 @@
 #include "hphp/runtime/ext/mysql_stats.h"
 #include "hphp/runtime/base/shared/shared_store_stats.h"
 #include "hphp/runtime/vm/repo.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/util/alloc.h"
 #include "hphp/util/timer.h"
 #include "hphp/util/repo_schema.h"

hphp/runtime/base/stat_cache.cpp

@@ -24,7 +24,7 @@
 #include "hphp/util/trace.h"
 #include "hphp/util/logger.h"
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/vm/translator/hooks.h"
+#include "hphp/runtime/vm/jit/hooks.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/base/stats.cpp

@@ -14,8 +14,8 @@
    +----------------------------------------------------------------------+
 */
 #include "hphp/util/base.h"
-#include "hphp/runtime/vm/translator/x64-util.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/x64-util.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/stats.h"
 
 namespace HPHP {

hphp/runtime/base/string_data.cpp

@@ -28,7 +28,7 @@
 #include "hphp/runtime/base/runtime_error.h"
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
 #include "tbb/concurrent_hash_map.h"
 
 namespace HPHP {

hphp/runtime/base/thread_info.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/base/hphp_system.h"
 #include "hphp/runtime/base/code_coverage.h"
 #include "hphp/runtime/base/memory/smart_allocator.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
 #include "hphp/util/lock.h"
 #include "hphp/util/alloc.h"
 

hphp/runtime/base/type_variant.cpp

@@ -25,7 +25,7 @@
 #include "hphp/runtime/base/zend/zend_string.h"
 #include "hphp/runtime/base/array/array_iterator.h"
 #include "hphp/util/parser/hphp.tab.hpp"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/vm/instance.h"
 #include "hphp/system/lib/systemlib.h"

hphp/runtime/eval/debugger/break_point.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/class_info.h"
 #include "hphp/runtime/base/stat_cache.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 namespace HPHP { namespace Eval {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/eval/debugger/debugger.cpp

@@ -19,8 +19,8 @@
 #include "hphp/runtime/eval/debugger/debugger_client.h"
 #include "hphp/runtime/eval/debugger/cmd/cmd_interrupt.h"
 #include "hphp/runtime/base/hphp_system.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/util/text_color.h"
 #include "hphp/util/util.h"
 #include "hphp/util/logger.h"

hphp/runtime/eval/runtime/file_repository.cpp

@@ -22,8 +22,8 @@
 #include "hphp/runtime/base/stat_cache.h"
 #include "hphp/runtime/base/server/source_root_info.h"
 
-#include "hphp/runtime/vm/translator/targetcache.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/pendq.h"
 #include "hphp/runtime/vm/repo.h"

hphp/runtime/ext/ext_array.cpp

@@ -24,8 +24,8 @@
 #include "hphp/runtime/base/zend/zend_collator.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/base/sort_flags.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/base/array/hphp_array.h"
 #include "hphp/util/logger.h"
 

hphp/runtime/ext/ext_class.cpp

@@ -17,8 +17,8 @@
 
 #include "hphp/runtime/ext/ext_class.h"
 #include "hphp/runtime/base/class_info.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/util/util.h"
 
 namespace HPHP {

hphp/runtime/ext/ext_closure.cpp

@@ -17,7 +17,7 @@
 
 #include "hphp/runtime/ext/ext_closure.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_collections.cpp

@@ -21,7 +21,7 @@
 #include "hphp/runtime/ext/ext_array.h"
 #include "hphp/runtime/ext/ext_math.h"
 #include "hphp/runtime/ext/ext_intl.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/system/lib/systemlib.h"
 
 namespace HPHP {

hphp/runtime/ext/ext_continuation.cpp

@@ -23,8 +23,8 @@
 #include "hphp/runtime/ext/ext_variable.h"
 #include "hphp/runtime/ext/ext_function.h"
 
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/func.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"

hphp/runtime/ext/ext_curl.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/util/curl_tls_workarounds.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/server/server_stats.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 #define CURLOPT_RETURNTRANSFER 19913
 #define CURLOPT_BINARYTRANSFER 19914

hphp/runtime/ext/ext_debugger.cpp

@@ -20,7 +20,7 @@
 #include "hphp/runtime/eval/debugger/cmd/cmd_user.h"
 #include "hphp/runtime/eval/debugger/cmd/cmd_interrupt.h"
 #include "hphp/runtime/vm/debugger_hook.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "tbb/concurrent_hash_map.h"
 #include "hphp/util/logger.h"
 #include "hphp/system/lib/systemlib.h"

hphp/runtime/ext/ext_domdocument.cpp

@@ -21,7 +21,7 @@
 #include "hphp/runtime/base/runtime_error.h"
 #include "hphp/runtime/ext/ext_function.h"
 #include "hphp/runtime/ext/ext_simplexml.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 #include "hphp/system/lib/systemlib.h"
 

hphp/runtime/ext/ext_function.cpp

@@ -23,8 +23,8 @@
 #include "hphp/runtime/base/util/libevent_http_client.h"
 #include "hphp/runtime/base/server/http_protocol.h"
 #include "hphp/runtime/vm/runtime.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/util/exception.h"
 #include "hphp/util/util.h"
 

hphp/runtime/ext/ext_icu_ucnv.cpp

@@ -16,7 +16,7 @@
 */
 
 #include "hphp/runtime/ext/ext_icu_ucnv.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/ext/ext_misc.cpp

@@ -28,8 +28,8 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/util/parser/scanner.h"
 #include "hphp/runtime/base/class_info.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 namespace HPHP {
 

hphp/runtime/ext/ext_reflection.cpp

@@ -21,7 +21,7 @@
 #include "hphp/runtime/base/class_info.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/string_util.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 #include "hphp/system/lib/systemlib.h"
 

hphp/runtime/ext/ext_xml.cpp

@@ -18,8 +18,8 @@
 #include "hphp/runtime/ext/ext_xml.h"
 #include "hphp/runtime/base/zend/zend_functions.h"
 #include "hphp/runtime/base/zend/zend_string.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include <expat.h>
 
 namespace HPHP {

hphp/runtime/vm/bytecode.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/compiler/builtin_symbols.h"
 #include "hphp/runtime/vm/event_hook.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/member_operations.h"
 #include "hphp/runtime/base/code_coverage.h"
 #include "hphp/runtime/eval/runtime/file_repository.h"
@@ -36,9 +36,9 @@
 #include "hphp/runtime/vm/php_debug.h"
 #include "hphp/runtime/vm/debugger_hook.h"
 #include "hphp/runtime/vm/runtime.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
 #include "hphp/runtime/vm/type_constraint.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/ext/ext_string.h"
 #include "hphp/runtime/ext/ext_error.h"
 #include "hphp/runtime/ext/ext_closure.h"

hphp/runtime/vm/class.cpp

@@ -23,8 +23,8 @@
 #include "hphp/runtime/vm/core_types.h"
 #include "hphp/runtime/vm/hhbc.h"
 #include "hphp/runtime/vm/repo.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/blob_helper.h"
 #include "hphp/runtime/vm/treadmill.h"
 #include "hphp/runtime/vm/name_value_table.h"

hphp/runtime/vm/debug/debug.cpp

@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 
 using namespace HPHP::Transl;
 

hphp/runtime/vm/debug/debug.h

@@ -17,7 +17,7 @@
 #define TRANSLATOR_DEBUG_H_
 
 #include "hphp/runtime/base/types.h"
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/hhbc.h"
 #include "hphp/runtime/vm/debug/dwarf.h"
 

hphp/runtime/vm/debug/dwarf.cpp

@@ -21,8 +21,8 @@
 
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/base/execution_context.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 
 using namespace HPHP::Transl;
 

hphp/runtime/vm/debug/dwarf.h

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "hphp/runtime/base/types.h"
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/translator.h"
 #include <libdwarf.h>
 #include <dwarf.h>
 #include <vector>

hphp/runtime/vm/debug/elfwriter.cpp

@@ -27,7 +27,7 @@
 #include "hphp/util/asm-x64.h"
 
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 
 using namespace HPHP::Transl;
 

hphp/runtime/vm/debugger_hook.cpp

@@ -15,7 +15,7 @@
 */
 
 #include "hphp/runtime/vm/debugger_hook.h"
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/eval/debugger/break_point.h"
 #include "hphp/runtime/eval/debugger/debugger.h"
 #include "hphp/runtime/eval/debugger/debugger_proxy.h"

hphp/runtime/vm/event_hook.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/vm/event_hook.h"
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/vm/func.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/ext/ext_function.h"

hphp/runtime/vm/event_hook.h

@@ -18,7 +18,7 @@
 
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/vm/bytecode.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
 
 namespace HPHP {
 

hphp/runtime/vm/func.cpp

@@ -26,9 +26,9 @@
 #include "hphp/runtime/vm/core_types.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/vm/repo.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
 #include "hphp/runtime/eval/runtime/file_repository.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/blob_helper.h"
 #include "hphp/runtime/vm/func_inline.h"
 #include "hphp/system/lib/systemlib.h"

hphp/runtime/vm/funcdict.cpp

@@ -21,8 +21,8 @@
 
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/ext_hhvm/ext_hhvm.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
 #include "hphp/runtime/vm/unit.h"
 
 #include "hphp/system/lib/systemlib.h"

hphp/runtime/vm/instance.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/vm/hhbc.h"
 #include "hphp/runtime/vm/class.h"
 #include "hphp/runtime/vm/object_allocator_sizes.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/ext/ext_collections.h"
 #include "hphp/system/lib/systemlib.h"
 

hphp/runtime/vm/jit/abi-x64.h

@@ -27,7 +27,7 @@
 #define incl_HPHP_VM_RUNTIME_TRANSLATOR_ABI_X64_H_
 
 #include "hphp/util/asm-x64.h"
-#include "hphp/runtime/vm/translator/physreg.h"
+#include "hphp/runtime/vm/jit/physreg.h"
 
 namespace HPHP { namespace Transl {
 

hphp/runtime/vm/jit/annotation.cpp

@@ -14,9 +14,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/annotation.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/annotation.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/util/base.h"
 
 namespace HPHP {

hphp/runtime/vm/jit/annotation.h

@@ -16,7 +16,7 @@
 #ifndef ANNOTATION_H_
 #define ANNOTATION_H_
 
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/translator.h"
 
 namespace HPHP {
 namespace Transl {

hphp/runtime/vm/jit/block.h

@@ -18,9 +18,9 @@
 #define incl_HPHP_VM_BLOCK_H_
 
 #include "hphp/runtime/base/memory/memory_manager.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/edge.h"
-#include "hphp/runtime/vm/translator/hopt/irinstruction.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/edge.h"
+#include "hphp/runtime/vm/jit/irinstruction.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/cfg.h

@@ -20,8 +20,8 @@
 #include <boost/dynamic_bitset.hpp>
 
 #include "hphp/runtime/base/memory/memory_manager.h"
-#include "hphp/runtime/vm/translator/hopt/block.h"
-#include "hphp/runtime/vm/translator/hopt/trace.h"
+#include "hphp/runtime/vm/jit/block.h"
+#include "hphp/runtime/vm/jit/trace.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/check.cpp

@@ -13,15 +13,15 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/hopt/check.h"
+#include "hphp/runtime/vm/jit/check.h"
 
 #include <boost/next_prior.hpp>
 #include <unordered_set>
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
-#include "hphp/runtime/vm/translator/hopt/linearscan.h"
-#include "hphp/runtime/vm/translator/physreg.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/physreg.h"
 
 namespace HPHP {  namespace JIT {
 

hphp/runtime/vm/jit/codegen.cpp

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/hopt/codegen.h"
+#include "hphp/runtime/vm/jit/codegen.h"
 
 #include <cstring>
 #include <unwind.h>
@@ -36,18 +36,18 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
-#include "hphp/runtime/vm/translator/translator-x64-internal.h"
-#include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/types.h"
-#include "hphp/runtime/vm/translator/x64-util.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/linearscan.h"
-#include "hphp/runtime/vm/translator/hopt/nativecalls.h"
-#include "hphp/runtime/vm/translator/hopt/print.h"
-#include "hphp/runtime/vm/translator/hopt/layout.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64-internal.h"
+#include "hphp/runtime/vm/jit/translator.h"
+#include "hphp/runtime/vm/jit/types.h"
+#include "hphp/runtime/vm/jit/x64-util.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/nativecalls.h"
+#include "hphp/runtime/vm/jit/print.h"
+#include "hphp/runtime/vm/jit/layout.h"
 
 using HPHP::Transl::TCA;
 using namespace HPHP::Transl::TargetCache;

hphp/runtime/vm/jit/codegen.h

@@ -18,12 +18,12 @@
 #define incl_HPHP_VM_CG_H_
 
 #include <vector>
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
-#include "hphp/runtime/vm/translator/hopt/linearscan.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
-#include "hphp/runtime/vm/translator/hopt/state_vector.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
+#include "hphp/runtime/vm/jit/state_vector.h"
 
 namespace HPHP {
 namespace JIT {

hphp/runtime/vm/jit/collector.cpp

@@ -29,8 +29,8 @@
 #include "hphp/runtime/eval/runtime/file_repository.h"
 #include "hphp/system/lib/systemlib.h"
 #include "hphp/runtime/vm/treadmill.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 
 namespace HPHP {
 namespace Transl {

hphp/runtime/vm/jit/cse.h

@@ -21,9 +21,9 @@
 
 #include "folly/Hash.h"
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/cfg.h"
-#include "hphp/runtime/vm/translator/hopt/ssatmp.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/cfg.h"
+#include "hphp/runtime/vm/jit/ssatmp.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/dce.cpp

@@ -17,12 +17,12 @@
 #include <boost/range/adaptors.hpp>
 
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/opt.h"
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
-#include "hphp/runtime/vm/translator/hopt/simplifier.h"
-#include "hphp/runtime/vm/translator/hopt/state_vector.h"
-#include "hphp/runtime/vm/translator/hopt/mutation.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/opt.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/simplifier.h"
+#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/mutation.h"
 
 namespace HPHP {
 namespace JIT {

hphp/runtime/vm/jit/extradata.h

@@ -17,7 +17,7 @@
 #ifndef incl_HPHP_VM_EXTRADATA_H_
 #define incl_HPHP_VM_EXTRADATA_H_
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
+#include "hphp/runtime/vm/jit/ir.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/fixup.h

@@ -18,10 +18,10 @@
 #define incl_HPHP_FIXUP_H_
 
 #include "hphp/util/util.h"
-#include "hphp/runtime/vm/translator/types.h"
+#include "hphp/runtime/vm/jit/types.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/vm/tread_hash_map.h"
-#include "hphp/runtime/vm/translator/types.h"
+#include "hphp/runtime/vm/jit/types.h"
 #include "hphp/util/atomic.h"
 
 namespace HPHP {

hphp/runtime/vm/jit/hhbctranslator.cpp

@@ -13,18 +13,18 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/hopt/hhbctranslator.h"
+#include "hphp/runtime/vm/jit/hhbctranslator.h"
 
 #include "hphp/util/trace.h"
 #include "hphp/runtime/ext/ext_closure.h"
 #include "hphp/runtime/ext/ext_continuation.h"
-#include "hphp/runtime/vm/translator/translator-runtime.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-runtime.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/stats.h"
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/runtime.h"
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
-#include "hphp/runtime/vm/translator/hopt/codegen.h" // ArrayIdx helpers
+#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/codegen.h" // ArrayIdx helpers
 
 // Include last to localize effects to this file
 #include "hphp/util/assert_throw.h"

hphp/runtime/vm/jit/hhbctranslator.h

@@ -24,8 +24,8 @@
 #include "hphp/util/assertions.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/member_operations.h"
-#include "hphp/runtime/vm/translator/runtime-type.h"
-#include "hphp/runtime/vm/translator/hopt/tracebuilder.h"
+#include "hphp/runtime/vm/jit/runtime-type.h"
+#include "hphp/runtime/vm/jit/tracebuilder.h"
 
 using HPHP::Transl::SrcKey;
 using HPHP::Transl::NormalizedInstruction;

hphp/runtime/vm/jit/immstack.cpp

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/immstack.h"
+#include "hphp/runtime/vm/jit/immstack.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/runtime/vm/jit/ir.cpp

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
+#include "hphp/runtime/vm/jit/ir.h"
 
 #include <algorithm>
 #include <cstring>
@@ -30,13 +30,13 @@
 #include "hphp/runtime/base/string_data.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"
-#include "hphp/runtime/vm/translator/hopt/cse.h"
-#include "hphp/runtime/vm/translator/hopt/irinstruction.h"
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
-#include "hphp/runtime/vm/translator/hopt/linearscan.h"
-#include "hphp/runtime/vm/translator/hopt/print.h"
-#include "hphp/runtime/vm/translator/hopt/simplifier.h"
-#include "hphp/runtime/vm/translator/hopt/trace.h"
+#include "hphp/runtime/vm/jit/cse.h"
+#include "hphp/runtime/vm/jit/irinstruction.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/print.h"
+#include "hphp/runtime/vm/jit/simplifier.h"
+#include "hphp/runtime/vm/jit/trace.h"
 
 // Include last to localize effects to this file
 #include "hphp/util/assert_throw.h"

hphp/runtime/vm/jit/ir.h

@@ -39,12 +39,12 @@
 #include "hphp/util/asm-x64.h"
 #include "hphp/util/trace.h"
 #include "hphp/runtime/ext/ext_continuation.h"
-#include "hphp/runtime/vm/translator/physreg.h"
-#include "hphp/runtime/vm/translator/abi-x64.h"
-#include "hphp/runtime/vm/translator/types.h"
-#include "hphp/runtime/vm/translator/runtime-type.h"
-#include "hphp/runtime/vm/translator/translator-runtime.h"
-#include "hphp/runtime/vm/translator/hopt/type.h"
+#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/abi-x64.h"
+#include "hphp/runtime/vm/jit/types.h"
+#include "hphp/runtime/vm/jit/runtime-type.h"
+#include "hphp/runtime/vm/jit/translator-runtime.h"
+#include "hphp/runtime/vm/jit/type.h"
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/vm/func.h"
 #include "hphp/runtime/vm/class.h"

hphp/runtime/vm/jit/irfactory.cpp

@@ -14,9 +14,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
 
-#include "hphp/runtime/vm/translator/hopt/block.h"
+#include "hphp/runtime/vm/jit/block.h"
 
 namespace HPHP {  namespace JIT {
 

hphp/runtime/vm/jit/irfactory.h

@@ -22,8 +22,8 @@
 
 #include "folly/ScopeGuard.h"
 #include "hphp/util/arena.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/cse.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/cse.h"
 #include "hphp/runtime/base/memory/memory_manager.h"
 
 namespace HPHP {  namespace JIT {

hphp/runtime/vm/jit/irinstruction.h

@@ -17,9 +17,9 @@
 #ifndef incl_HPHP_VM_IRINSTRUCTION_H_
 #define incl_HPHP_VM_IRINSTRUCTION_H_
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/edge.h"
-#include "hphp/runtime/vm/translator/hopt/extradata.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/edge.h"
+#include "hphp/runtime/vm/jit/extradata.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/irtranslator.cpp

@@ -26,18 +26,18 @@
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/stats.h"
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/opt.h"
-#include "hphp/runtime/vm/translator/hopt/linearscan.h"
-#include "hphp/runtime/vm/translator/hopt/codegen.h"
-#include "hphp/runtime/vm/translator/hopt/hhbctranslator.h"
-#include "hphp/runtime/vm/translator/hopt/print.h"
-#include "hphp/runtime/vm/translator/hopt/check.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/opt.h"
+#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/codegen.h"
+#include "hphp/runtime/vm/jit/hhbctranslator.h"
+#include "hphp/runtime/vm/jit/print.h"
+#include "hphp/runtime/vm/jit/check.h"
 
 // Include last to localize effects to this file
 #include "hphp/util/assert_throw.h"

hphp/runtime/vm/jit/jumpopts.cpp

@@ -18,9 +18,9 @@
 
 #include <boost/next_prior.hpp>
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/opt.h"
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/opt.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/layout.cpp

@@ -13,11 +13,11 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/hopt/layout.h"
+#include "hphp/runtime/vm/jit/layout.h"
 
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/translator/hopt/cfg.h"
-#include "hphp/runtime/vm/translator/hopt/state_vector.h"
+#include "hphp/runtime/vm/jit/cfg.h"
+#include "hphp/runtime/vm/jit/state_vector.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/layout.h

@@ -17,8 +17,8 @@
 #define incl_HPHP_JIT_LAYOUT_H_
 
 #include "hphp/runtime/base/memory/memory_manager.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/block.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/block.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/linearscan.cpp

@@ -14,18 +14,18 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/hopt/linearscan.h"
+#include "hphp/runtime/vm/jit/linearscan.h"
 
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
-#include "hphp/runtime/vm/translator/hopt/nativecalls.h"
-#include "hphp/runtime/vm/translator/hopt/print.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/tracebuilder.h"
-#include "hphp/runtime/vm/translator/hopt/codegen.h"
-#include "hphp/runtime/vm/translator/hopt/state_vector.h"
-#include "hphp/runtime/vm/translator/hopt/check.h"
-#include "hphp/runtime/vm/translator/physreg.h"
-#include "hphp/runtime/vm/translator/abi-x64.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/nativecalls.h"
+#include "hphp/runtime/vm/jit/print.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/codegen.h"
+#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/check.h"
+#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/abi-x64.h"
 #include <boost/noncopyable.hpp>
 
 namespace HPHP {

hphp/runtime/vm/jit/linearscan.h

@@ -17,9 +17,9 @@
 #ifndef incl_HPHP_VM_LINEAR_SCAN_H_
 #define incl_HPHP_VM_LINEAR_SCAN_H_
 
-#include "hphp/runtime/vm/translator/hopt/state_vector.h"
-#include "hphp/runtime/vm/translator/physreg.h"
-#include "hphp/runtime/vm/translator/abi-x64.h"
+#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/abi-x64.h"
 
 namespace HPHP {  namespace JIT {
 

hphp/runtime/vm/jit/mutation.cpp

@@ -13,8 +13,8 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/hopt/mutation.h"
-#include "hphp/runtime/vm/translator/hopt/state_vector.h"
+#include "hphp/runtime/vm/jit/mutation.h"
+#include "hphp/runtime/vm/jit/state_vector.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/mutation.h

@@ -17,8 +17,8 @@
 #ifndef incl_HPHP_JIT_MUTATION_H_
 #define incl_HPHP_JIT_MUTATION_H_
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/cfg.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/cfg.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/nativecalls.cpp

@@ -14,13 +14,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/hopt/nativecalls.h"
+#include "hphp/runtime/vm/jit/nativecalls.h"
 
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
-#include "hphp/runtime/vm/translator/translator-runtime.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/translator-runtime.h"
+#include "hphp/runtime/vm/jit/ir.h"
 
 namespace HPHP {  namespace JIT { namespace NativeCalls {
 

hphp/runtime/vm/jit/nativecalls.h

@@ -20,8 +20,8 @@
 #include <initializer_list>
 #include <vector>
 
-#include "hphp/runtime/vm/translator/types.h"
-#include "hphp/runtime/vm/translator/hopt/codegen.h"
+#include "hphp/runtime/vm/jit/types.h"
+#include "hphp/runtime/vm/jit/codegen.h"
 
 namespace HPHP {  namespace JIT { namespace NativeCalls {
 

hphp/runtime/vm/jit/opt.cpp

@@ -13,12 +13,12 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/hopt/opt.h"
-#include "hphp/runtime/vm/translator/hopt/tracebuilder.h"
+#include "hphp/runtime/vm/jit/opt.h"
+#include "hphp/runtime/vm/jit/tracebuilder.h"
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
-#include "hphp/runtime/vm/translator/hopt/print.h"
-#include "hphp/runtime/vm/translator/hopt/check.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/print.h"
+#include "hphp/runtime/vm/jit/check.h"
 
 namespace HPHP {
 namespace JIT {

hphp/runtime/vm/jit/physreg.cpp

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/physreg.h"
+#include "hphp/runtime/vm/jit/physreg.h"
 
 namespace HPHP { namespace Transl {
 

hphp/runtime/vm/jit/predictionopts.cpp

@@ -19,11 +19,11 @@
 #include "folly/Optional.h"
 #include "folly/Lazy.h"
 
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
-#include "hphp/runtime/vm/translator/hopt/state_vector.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/cfg.h"
-#include "hphp/runtime/vm/translator/hopt/mutation.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/cfg.h"
+#include "hphp/runtime/vm/jit/mutation.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/print.cpp

@@ -14,11 +14,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/hopt/print.h"
+#include "hphp/runtime/vm/jit/print.h"
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
-#include "hphp/runtime/vm/translator/hopt/linearscan.h"
-#include "hphp/runtime/vm/translator/hopt/codegen.h"
+#include "hphp/runtime/vm/jit/ir.h"
+#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/codegen.h"
 #include "hphp/runtime/base/stats.h"
 #include "hphp/util/disasm.h"
 #include "hphp/util/text_color.h"

hphp/runtime/vm/jit/print.h

@@ -19,7 +19,7 @@
 
 #include <iosfwd>
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/translator/hopt/linearscan.h"
+#include "hphp/runtime/vm/jit/linearscan.h"
 
 namespace HPHP {
 namespace JIT {

hphp/runtime/vm/jit/runtime-type.cpp

@@ -13,14 +13,14 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/runtime-type.h"
+#include "hphp/runtime/vm/jit/runtime-type.h"
 
 #include <assert.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/base/types.h"
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/translator.h"
 
 namespace HPHP {
 namespace Transl {

hphp/runtime/vm/jit/simplifier.cpp

@@ -14,13 +14,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/translator/hopt/simplifier.h"
+#include "hphp/runtime/vm/jit/simplifier.h"
 
 #include <sstream>
 #include <type_traits>
 
 #include "hphp/runtime/base/type_conversions.h"
-#include "hphp/runtime/vm/translator/hopt/tracebuilder.h"
+#include "hphp/runtime/vm/jit/tracebuilder.h"
 #include "hphp/runtime/vm/runtime.h"
 
 namespace HPHP {

hphp/runtime/vm/jit/simplifier.h

@@ -17,8 +17,8 @@
 #ifndef incl_HPHP_HHVM_HHIR_SIMPLIFIER_H_
 #define incl_HPHP_HHVM_HHIR_SIMPLIFIER_H_
 
-#include "hphp/runtime/vm/translator/hopt/cse.h"
-#include "hphp/runtime/vm/translator/hopt/ir.h"
+#include "hphp/runtime/vm/jit/cse.h"
+#include "hphp/runtime/vm/jit/ir.h"
 
 namespace HPHP {  namespace JIT {
 

hphp/runtime/vm/jit/srcdb.cpp

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/srcdb.h"
+#include "hphp/runtime/vm/jit/srcdb.h"
 
 #include <stdint.h>
 #include <stdarg.h>
@@ -21,7 +21,7 @@
 
 #include "hphp/util/base.h"
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/translator/translator-x64.h"
+#include "hphp/runtime/vm/jit/translator-x64.h"
 
 namespace HPHP {
 namespace Transl {

hphp/runtime/vm/jit/srcdb.h

@@ -21,7 +21,7 @@
 #include "hphp/util/asm-x64.h"
 #include "hphp/util/trace.h"
 #include "hphp/util/mutex.h"
-#include "hphp/runtime/vm/translator/translator.h"
+#include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/tread_hash_map.h"
 
 namespace HPHP {

hphp/runtime/vm/jit/ssatmp.h

@@ -17,7 +17,7 @@
 #ifndef incl_HPHP_VM_SSATMP_H_
 #define incl_HPHP_VM_SSATMP_H_
 
-#include "hphp/runtime/vm/translator/hopt/ir.h"
+#include "hphp/runtime/vm/jit/ir.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/state_vector.h

@@ -20,7 +20,7 @@
 #include <type_traits>
 
 #include "hphp/runtime/base/memory/memory_manager.h"
-#include "hphp/runtime/vm/translator/hopt/irfactory.h"
+#include "hphp/runtime/vm/jit/irfactory.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/targetcache.cpp

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/targetcache.h"
+#include "hphp/runtime/vm/jit/targetcache.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/types.h"
@@ -21,8 +21,8 @@
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/class.h"
 #include "hphp/runtime/vm/runtime.h"
-#include "hphp/runtime/vm/translator/annotation.h"
-#include "hphp/runtime/vm/translator/translator-inline.h"
+#include "hphp/runtime/vm/jit/annotation.h"
+#include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/base/stats.h"
 #include "hphp/util/trace.h"
 #include "hphp/util/base.h"

hphp/runtime/vm/jit/targetcache.h

@@ -18,8 +18,8 @@
 
 #include "hphp/runtime/vm/func.h"
 #include "hphp/util/util.h"
-#include "hphp/runtime/vm/translator/types.h"
-#include "hphp/runtime/vm/translator/unwind-x64.h"
+#include "hphp/runtime/vm/jit/types.h"
+#include "hphp/runtime/vm/jit/unwind-x64.h"
 #include "hphp/util/asm-x64.h"
 #include <boost/static_assert.hpp>
 

hphp/runtime/vm/jit/test/fixup_map.cpp

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/translator/fixup.h"
+#include "hphp/runtime/vm/jit/fixup.h"
 
 #include "gtest/gtest.h"
 #include "hphp/hhvm/process_init.h"