Removing dep on xenia/types.h from alloy.

src/alloy/backend/x64/x64_emitter.h

@@ -16,12 +16,18 @@
 
 #include <third_party/xbyak/xbyak/xbyak.h>
 
-XEDECLARECLASS2(alloy, hir, HIRBuilder);
+namespace alloy {
-XEDECLARECLASS2(alloy, hir, Instr);
+namespace hir {
-XEDECLARECLASS2(alloy, runtime, DebugInfo);
+class HIRBuilder;
-XEDECLARECLASS2(alloy, runtime, FunctionInfo);
+class Instr;
-XEDECLARECLASS2(alloy, runtime, Runtime);
+}  // namespace hir
-XEDECLARECLASS2(alloy, runtime, SymbolInfo);
+namespace runtime {
+class DebugInfo;
+class FunctionInfo;
+class Runtime;
+class SymbolInfo;
+}  // namespace runtime
+}  // namespace alloy
 
 namespace alloy {
 namespace backend {

src/alloy/backend/x64/x64_sequences.h

@@ -12,7 +12,11 @@
 
 #include <alloy/core.h>
 
-XEDECLARECLASS2(alloy, hir, Instr);
+namespace alloy {
+namespace hir {
+class Instr;
+}  // namespace hir
+}  // namespace alloy
 
 namespace alloy {
 namespace backend {

src/alloy/hir/block.h

@@ -13,7 +13,9 @@
 #include <alloy/arena.h>
 #include <alloy/core.h>
 
-XEDECLARECLASS1(llvm, BitVector);
+namespace llvm {
+class BitVector;
+}  // namespace llvm
 
 namespace alloy {
 namespace hir {

src/alloy/runtime/instrument.h

@@ -12,7 +12,9 @@
 
 #include <alloy/core.h>
 
-XEDECLARECLASS1(alloy, Memory);
+namespace alloy {
+class Memory;
+}  // namespace alloy
 
 namespace alloy {
 namespace runtime {

src/xenia/profiling.h

@@ -13,9 +13,10 @@
 #include <memory>
 
 #include <poly/string.h>
-#include <xenia/types.h>
 
+#if XE_LIKE_WIN32
 #define XE_OPTION_PROFILING 1
+#endif  // XE_LIKE_WIN32
 
 #if XE_OPTION_PROFILING
 // Pollutes the global namespace. Yuck.

tools/alloy-sandbox/alloy-sandbox.cc

@@ -75,8 +75,10 @@ class ThreadState : public alloy::runtime::ThreadState {
 // TODO(benvanik): simple memory? move more into core?
 
 int main(std::vector<std::wstring>& args) {
+#if XE_OPTION_PROFILING
   xe::Profiler::Initialize();
   xe::Profiler::ThreadEnter("main");
+#endif  // XE_OPTION_PROFILING
 
   size_t memory_size = 16 * 1024 * 1024;
   auto memory = std::make_unique<SimpleMemory>(memory_size);
@@ -116,8 +118,10 @@ int main(std::vector<std::wstring>& args) {
   runtime.reset();
   memory.reset();
 
+#if XE_OPTION_PROFILING
   xe::Profiler::Dump();
   xe::Profiler::ThreadExit();
+#endif  // XE_OPTION_PROFILING
 
   return 0;
 }