Replace _ with - in file names under runtime/vm/jit/

Makes things more consistent, at least within this directory.

hphp/hhvm/process_init.cpp

@@ -24,7 +24,7 @@
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/ext_hhvm/ext_hhvm.h"
 #include "hphp/runtime/vm/jit/translator.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/fixup.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/file_repository.h"

hphp/runtime/base/file_repository.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/stat_cache.h"
 #include "hphp/runtime/base/server/source_root_info.h"
 
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/pendq.h"

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/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/event_hook.h"
 

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/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.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/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/util/lock.h"
 #include "hphp/util/alloc.h"
 

hphp/runtime/vm/bytecode.cpp

@@ -50,7 +50,7 @@
 #include "hphp/runtime/vm/php_debug.h"
 #include "hphp/runtime/vm/debugger_hook.h"
 #include "hphp/runtime/vm/runtime.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/type_constraint.h"
 #include "hphp/runtime/vm/unwind.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"

hphp/runtime/vm/class.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/base/array/hphp_array.h"
 #include "hphp/util/util.h"
 #include "hphp/util/debug.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/treadmill.h"
 #include "hphp/runtime/vm/name_value_table.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/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 
 namespace HPHP {
 

hphp/runtime/vm/func.cpp

@@ -26,7 +26,7 @@
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/vm/repo.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/base/file_repository.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/blob_helper.h"

hphp/runtime/vm/funcdict.cpp

@@ -23,7 +23,7 @@
 #include "hphp/runtime/base/runtime_error.h"
 #include "hphp/runtime/ext_hhvm/ext_hhvm.h"
 #include "hphp/runtime/vm/jit/translator.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/unit.h"
 
 #include "hphp/system/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/jit/physreg.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 
 namespace HPHP { namespace Transl {
 

hphp/runtime/vm/jit/block.h

@@ -20,7 +20,7 @@
 #include "hphp/runtime/base/memory/smart_containers.h"
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/edge.h"
-#include "hphp/runtime/vm/jit/irinstruction.h"
+#include "hphp/runtime/vm/jit/ir-instruction.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/check.cpp

@@ -19,9 +19,9 @@
 #include <unordered_set>
 
 #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"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 
 namespace HPHP {  namespace JIT {
 

hphp/runtime/vm/jit/code-gen.cpp

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/codegen.h"
+#include "hphp/runtime/vm/jit/code-gen.h"
 
 #include <cstring>
 #include <unwind.h>
@@ -36,7 +36,7 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.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"
@@ -44,8 +44,8 @@
 #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/linear-scan.h"
+#include "hphp/runtime/vm/jit/native-calls.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/layout.h"
 

hphp/runtime/vm/jit/code-gen.h

@@ -19,11 +19,11 @@
 
 #include <vector>
 #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/ir-factory.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 
 namespace HPHP {
 namespace JIT {

hphp/runtime/vm/jit/cse.h

@@ -23,7 +23,7 @@
 
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/cfg.h"
-#include "hphp/runtime/vm/jit/ssatmp.h"
+#include "hphp/runtime/vm/jit/ssa-tmp.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/dce.cpp

@@ -19,9 +19,9 @@
 #include "hphp/util/trace.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/ir-factory.h"
 #include "hphp/runtime/vm/jit/simplifier.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 #include "hphp/runtime/vm/jit/mutation.h"
 
 namespace HPHP {

hphp/runtime/vm/jit/hhbc-translator.cpp

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

hphp/runtime/vm/jit/hhbc-translator.h

@@ -25,7 +25,7 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/member_operations.h"
 #include "hphp/runtime/vm/jit/runtime-type.h"
-#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
 #include "hphp/runtime/vm/srckey.h"
 
 using HPHP::Transl::NormalizedInstruction;

hphp/runtime/vm/jit/ir-factory.cpp

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 
 #include "hphp/runtime/vm/jit/block.h"
 

hphp/runtime/vm/jit/ir-instruction.h

@@ -19,7 +19,7 @@
 
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/edge.h"
-#include "hphp/runtime/vm/jit/extradata.h"
+#include "hphp/runtime/vm/jit/extra-data.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/ir-translator.cpp

@@ -26,16 +26,16 @@
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.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/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/linear-scan.h"
+#include "hphp/runtime/vm/jit/code-gen.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/check.h"
 

hphp/runtime/vm/jit/ir.cpp

@@ -31,9 +31,9 @@
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.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/ir-instruction.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/simplifier.h"
 #include "hphp/runtime/vm/jit/trace.h"

hphp/runtime/vm/jit/ir.h

@@ -40,7 +40,7 @@
 #include "hphp/util/asm-x64.h"
 #include "hphp/util/trace.h"
 #include "hphp/runtime/ext/ext_continuation.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
 #include "hphp/runtime/vm/jit/types.h"
 #include "hphp/runtime/vm/jit/runtime-type.h"

hphp/runtime/vm/jit/jump-opts.cpp

@@ -20,7 +20,7 @@
 
 #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/ir-factory.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/layout.cpp

@@ -20,7 +20,7 @@
 
 #include "hphp/util/trace.h"
 #include "hphp/runtime/vm/jit/cfg.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/linear-scan.cpp

@@ -14,18 +14,18 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
 
 #include "hphp/runtime/base/memory/smart_containers.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/nativecalls.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/native-calls.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/trace-builder.h"
+#include "hphp/runtime/vm/jit/code-gen.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/phys-reg.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
 #include <boost/noncopyable.hpp>
 

hphp/runtime/vm/jit/linear-scan.h

@@ -17,8 +17,8 @@
 #ifndef incl_HPHP_VM_LINEAR_SCAN_H_
 #define incl_HPHP_VM_LINEAR_SCAN_H_
 
-#include "hphp/runtime/vm/jit/state_vector.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
 
 namespace HPHP {  namespace JIT {

hphp/runtime/vm/jit/mutation.cpp

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 #include "hphp/runtime/vm/jit/mutation.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/native-calls.cpp

@@ -14,11 +14,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/nativecalls.h"
+#include "hphp/runtime/vm/jit/native-calls.h"
 
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-runtime.h"
 #include "hphp/runtime/vm/jit/ir.h"
 

hphp/runtime/vm/jit/native-calls.h

@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "hphp/runtime/vm/jit/types.h"
-#include "hphp/runtime/vm/jit/codegen.h"
+#include "hphp/runtime/vm/jit/code-gen.h"
 
 namespace HPHP {  namespace JIT { namespace NativeCalls {
 

hphp/runtime/vm/jit/opt.cpp

@@ -14,9 +14,9 @@
    +----------------------------------------------------------------------+
 */
 #include "hphp/runtime/vm/jit/opt.h"
-#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/check.h"
 

hphp/runtime/vm/jit/phys-reg.cpp

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

hphp/runtime/vm/jit/phys-reg.h

@@ -293,4 +293,3 @@ struct PhysRegSaver : public PhysRegSaverParity {
 }}
 
 #endif
-

hphp/runtime/vm/jit/prediction-opts.cpp

@@ -19,8 +19,8 @@
 #include "folly/Optional.h"
 #include "folly/Lazy.h"
 
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/ir-factory.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"

hphp/runtime/vm/jit/print.cpp

@@ -17,8 +17,8 @@
 
 #include "hphp/runtime/base/memory/smart_containers.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/vm/jit/linear-scan.h"
+#include "hphp/runtime/vm/jit/code-gen.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/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
 
 namespace HPHP {
 namespace JIT {

hphp/runtime/vm/jit/region-method.cpp

@@ -15,7 +15,7 @@
 */
 #include "hphp/util/arena.h"
 #include "hphp/runtime/base/memory/smart_containers.h"
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 #include "hphp/runtime/vm/verifier/cfg.h"
 
 namespace HPHP { namespace JIT {
@@ -109,4 +109,3 @@ RegionDescPtr regionMethod(const RegionContext& context) {
 //////////////////////////////////////////////////////////////////////
 
 }}
-

hphp/runtime/vm/jit/region-onebc.cpp

@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 #include "hphp/runtime/base/memory/smart_containers.h"
 
 namespace HPHP { namespace JIT {

hphp/runtime/vm/jit/region-selection.cpp

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 
 #include <algorithm>
 #include <boost/range/adaptors.hpp>

hphp/runtime/vm/jit/simplifier.cpp

@@ -21,7 +21,7 @@
 
 #include "hphp/runtime/base/memory/smart_containers.h"
 #include "hphp/runtime/base/type_conversions.h"
-#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
 #include "hphp/runtime/vm/hhbc.h"
 #include "hphp/runtime/vm/runtime.h"
 

hphp/runtime/vm/jit/state-vector.h

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

hphp/runtime/vm/jit/target-cache.cpp

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/types.h"
@@ -92,7 +92,7 @@ undefinedError(const char* msg, const char* name) {
   raise_error(msg, name);
 }
 
-// Targetcache memory. See the comment in targetcache.h
+// Targetcache memory. See the comment in target-cache.h
 __thread void* tl_targetCaches = nullptr;
 __thread HphpArray* s_constants = nullptr;
 

hphp/runtime/vm/jit/trace-builder.cpp

@@ -14,13 +14,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
 
 #include "folly/ScopeGuard.h"
 
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/trace-builder.h

@@ -23,10 +23,10 @@
 #include "folly/Optional.h"
 
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 #include "hphp/runtime/vm/jit/cse.h"
 #include "hphp/runtime/vm/jit/simplifier.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 
 namespace HPHP {  namespace JIT {
 

hphp/runtime/vm/jit/translator-runtime.h

@@ -18,7 +18,7 @@
 
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 
 namespace HPHP { namespace Transl {
 

hphp/runtime/vm/jit/translator-x64-helpers.cpp

@@ -15,7 +15,7 @@
 */
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/base/file_repository.h"
 #include "hphp/runtime/vm/event_hook.h"
 #include "hphp/runtime/base/builtin_functions.h"

hphp/runtime/vm/jit/translator-x64.cpp

@@ -77,7 +77,7 @@
 #include "hphp/runtime/ext/ext_continuation.h"
 #include "hphp/runtime/ext/ext_function.h"
 #include "hphp/runtime/vm/debug/debug.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/srcdb.h"
 #include "hphp/runtime/vm/jit/x64-util.h"
@@ -89,8 +89,8 @@
 #include "hphp/runtime/vm/type_profile.h"
 #include "hphp/runtime/vm/member_operations.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
-#include "hphp/runtime/vm/jit/hhbctranslator.h"
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 
 #include "hphp/runtime/vm/jit/translator-x64-internal.h"
 

hphp/runtime/vm/jit/translator.cpp

@@ -40,10 +40,10 @@
 #include "hphp/runtime/vm/hhbc.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/jit/annotation.h"
-#include "hphp/runtime/vm/jit/hhbctranslator.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/region_selection.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/jit/type.h"

hphp/runtime/vm/jit/translator.h

@@ -33,13 +33,13 @@
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/jit/fixup.h"
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 #include "hphp/runtime/vm/jit/runtime-type.h"
 #include "hphp/runtime/vm/jit/srcdb.h"
 #include "hphp/runtime/vm/jit/trans-data.h"
 #include "hphp/runtime/vm/jit/translator-instrs.h"
 #include "hphp/runtime/vm/jit/type.h"
-#include "hphp/runtime/vm/jit/writelease.h"
+#include "hphp/runtime/vm/jit/write-lease.h"
 #include "hphp/runtime/vm/debugger_hook.h"
 #include "hphp/runtime/vm/srckey.h"
 #include "hphp/runtime/base/md5.h"

hphp/runtime/vm/jit/type.cpp

@@ -20,8 +20,8 @@
 
 #include "hphp/util/trace.h"
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/irinstruction.h"
-#include "hphp/runtime/vm/jit/ssatmp.h"
+#include "hphp/runtime/vm/jit/ir-instruction.h"
+#include "hphp/runtime/vm/jit/ssa-tmp.h"
 #include "hphp/runtime/vm/jit/translator.h"
 
 using namespace HPHP::Transl;

hphp/runtime/vm/jit/unwind-x64.cpp

@@ -24,7 +24,7 @@
 
 #include "hphp/runtime/vm/jit/abi-x64.h"
 #include "hphp/runtime/vm/jit/runtime-type.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/stats.h"
 #include "hphp/runtime/vm/runtime.h"

hphp/runtime/vm/jit/vector-translator.cpp

@@ -16,14 +16,14 @@
 
 #include "hphp/runtime/base/strings.h"
 #include "hphp/runtime/vm/member_operations.h"
-#include "hphp/runtime/vm/jit/hhbctranslator.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/irinstruction.h"
+#include "hphp/runtime/vm/jit/ir-instruction.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 
 // These files do ugly things with macros so include them last
 #include "hphp/util/assert_throw.h"
-#include "hphp/runtime/vm/jit/vectortranslator-internal.h"
+#include "hphp/runtime/vm/jit/vector-translator-internal.h"
 
 namespace HPHP { namespace JIT {
 

hphp/runtime/vm/jit/write-lease.cpp

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/jit/writelease.h"
+#include "hphp/runtime/vm/jit/write-lease.h"
 #include "hphp/util/timer.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/jit/translator.h"

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

@@ -20,7 +20,7 @@
 #ifndef USE_GCC_FAST_TLS
 #include <pthread.h>
 #include "hphp/runtime/vm/jit/abi-x64.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 #endif
 #include "hphp/runtime/vm/jit/translator-inline.h"
 

hphp/runtime/vm/unit.cpp

@@ -33,7 +33,7 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/repo.h"
 #include "hphp/runtime/vm/blob_helper.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/verifier/check.h"