commit 681f90fe6f4930c11d87a63d1c47cbb95a57f61b
author John Porto <jpp@chromium.org> Tue Apr 05 06:20:50 2016 -0700
committer John Porto <jpp@chromium.org> Tue Apr 05 06:20:50 2016 -0700
tree 544f043706bf289dfb85b2c92837ec87e664f8f1
parent 16f8061ca23653172ea4c1a43659bb0501b5b474

Subzero. Fixes Browser build.

BUG=
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1856323004 .

Makefile

diff --git a/Makefile b/Makefile
index 41da464..f311a5f 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@
 ifeq ($(PNACL_BROWSER_TRANSLATOR),1)
   CPP.Defines += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \
     -DALLOW_TIMERS=0 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_MINIMAL_BUILD=1 \
-    -DPNACL_BROWSER_TRANSLATOR=1
+    -DALLOW_WASM=0 -DPNACL_BROWSER_TRANSLATOR=1
 else
   CPP.Defines += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
     -DALLOW_TIMERS=1 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_MINIMAL_BUILD=0 \
-    -DPNACL_BROWSER_TRANSLATOR=0
+    -DALLOW_WASM=0 -DPNACL_BROWSER_TRANSLATOR=0
 endif

src/IceCompiler.cpp

diff --git a/src/IceCompiler.cpp b/src/IceCompiler.cpp
index 6a853d0..13545c7 100644
--- a/src/IceCompiler.cpp
+++ b/src/IceCompiler.cpp
@@ -92,11 +92,15 @@
     Translator.reset(PTranslator.release());
   } else if (WasmBuildOnRead) {
     if (BuildDefs::wasm()) {
+#if !ALLOW_WASM
+      assert(false && "wasm not allowed");
+#else
       std::unique_ptr<WasmTranslator> WTranslator(new WasmTranslator(&Ctx));
 
       WTranslator->translate(IRFilename, std::move(InputStream));
 
       Translator.reset(WTranslator.release());
+#endif // !ALLOW_WASM
     } else {
       Ctx.getStrError() << "WASM support not enabled\n";
       Ctx.getErrorStatus()->assign(EC_Args);

src/WasmTranslator.cpp

diff --git a/src/WasmTranslator.cpp b/src/WasmTranslator.cpp
index 4773526..b42ad77 100644
--- a/src/WasmTranslator.cpp
+++ b/src/WasmTranslator.cpp
@@ -15,6 +15,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
+#if ALLOW_WASM
+
 #include "llvm/Support/StreamingMemoryObject.h"
 
 #include "WasmTranslator.h"
@@ -813,3 +815,5 @@
 
   return;
 }
+
+#endif // ALLOW_WASM

src/WasmTranslator.h

diff --git a/src/WasmTranslator.h b/src/WasmTranslator.h
index 724d7b9..4a23bc1 100644
--- a/src/WasmTranslator.h
+++ b/src/WasmTranslator.h
@@ -15,6 +15,8 @@
 #ifndef SUBZERO_SRC_WASMTRANSLATOR_H
 #define SUBZERO_SRC_WASMTRANSLATOR_H
 
+#if ALLOW_WASM
+
 #include "IceGlobalContext.h"
 #include "IceTranslator.h"
 
@@ -66,4 +68,7 @@
   SizeT BufferSize;
 };
 }
+
+#endif // ALLOW_WASM
+
 #endif // SUBZERO_SRC_WASMTRANSLATOR_H