Bug 1439004 - Fix build breakage when ENABLE_WASM_SATURATING_TRUNC_OPS is not defined. r=luke
authorDan Gohman <sunfish@mozilla.com>
Tue, 20 Feb 2018 12:05:00 -0500
changeset 404539 cdf244d72f44500bb0dd5de524b0449dd3d1b2f3
parent 404538 4cdb6db37198e0033184d5b2b0674174a0bc012e
child 404540 42248666ddf6dcd211d330c5724a7018f918c805
push id100031
push userryanvm@gmail.com
push dateTue, 20 Feb 2018 20:58:42 +0000
treeherdermozilla-inbound@cdf244d72f44 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs1439004
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1439004 - Fix build breakage when ENABLE_WASM_SATURATING_TRUNC_OPS is not defined. r=luke
js/src/wasm/WasmAST.h
js/src/wasm/WasmBinaryToText.cpp
--- a/js/src/wasm/WasmAST.h
+++ b/js/src/wasm/WasmAST.h
@@ -1137,34 +1137,32 @@ class AstConversionOperator final : publ
       : AstExpr(Kind, ExprType::Limit),
         op_(op), operand_(operand)
     {}
 
     Op op() const { return op_; }
     AstExpr* operand() const { return operand_; }
 };
 
-#ifdef ENABLE_WASM_SATURATING_TRUNC_OPS
 // Like AstConversionOperator, but for opcodes encoded with the Numeric prefix.
 class AstExtraConversionOperator final : public AstExpr
 {
     NumericOp op_;
     AstExpr* operand_;
 
   public:
     static const AstExprKind Kind = AstExprKind::ExtraConversionOperator;
     explicit AstExtraConversionOperator(NumericOp op, AstExpr* operand)
       : AstExpr(Kind, ExprType::Limit),
         op_(op), operand_(operand)
     {}
 
     NumericOp op() const { return op_; }
     AstExpr* operand() const { return operand_; }
 };
-#endif
 
 // This is an artificial AST node which can fill operand slots in an AST
 // constructed from parsing or decoding stack-machine code that doesn't have
 // an inherent AST structure.
 class AstPop final : public AstExpr
 {
   public:
     static const AstExprKind Kind = AstExprKind::Pop;
--- a/js/src/wasm/WasmBinaryToText.cpp
+++ b/js/src/wasm/WasmBinaryToText.cpp
@@ -1349,22 +1349,20 @@ RenderExpr(WasmRenderContext& c, AstExpr
       case AstExprKind::ComparisonOperator:
         if (!RenderComparisonOperator(c, expr.as<AstComparisonOperator>()))
             return false;
         break;
       case AstExprKind::ConversionOperator:
         if (!RenderConversionOperator(c, expr.as<AstConversionOperator>()))
             return false;
         break;
-#ifdef ENABLE_WASM_SATURATING_TRUNC_OPS
       case AstExprKind::ExtraConversionOperator:
         if (!RenderExtraConversionOperator(c, expr.as<AstExtraConversionOperator>()))
             return false;
         break;
-#endif
       case AstExprKind::Load:
         if (!RenderLoad(c, expr.as<AstLoad>()))
             return false;
         break;
       case AstExprKind::Store:
         if (!RenderStore(c, expr.as<AstStore>()))
             return false;
         break;