Revert of [WASM] Implements catch for the wasm low level exception mechanism.

src/wasm/ast-decoder.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/signature.h"
 
 #include "src/bit-vector.h"
 #include "src/flags.h"
 #include "src/handles.h"
 #include "src/zone/zone-containers.h"
@@ skipping 52 matching lines @@
   }
 };
 
 // An entry on the value stack.
 struct Value {
   const byte* pc;
   TFNode* node;
   LocalType type;
 };
 
-struct TryInfo : public ZoneObject {
-  SsaEnv* catch_env;
-  TFNode* exception;
-
-  explicit TryInfo(SsaEnv* c) : catch_env(c), exception(nullptr) {}
-};
+struct Control;
 
 struct MergeValues {
   uint32_t arity;
   union {
     Value* array;
     Value first;
   } vals;  // Either multiple values or a single value.
 
   Value& first() {
     DCHECK_GT(arity, 0u);
     return arity == 1 ? vals.first : vals.array[0];
   }
 };
 
+// IncomingBranch is used by exception handling code for managing finally's.
+struct IncomingBranch {
+  int32_t token_value;
+  Control* target;
+  MergeValues merge;
+};
+
 static Value* NO_VALUE = nullptr;
 
 enum ControlKind { kControlIf, kControlBlock, kControlLoop, kControlTry };
 
 // An entry on the control stack (i.e. if, block, loop).
 struct Control {
   const byte* pc;
   ControlKind kind;
   int stack_depth;    // stack height at the beginning of the construct.
   SsaEnv* end_env;    // end environment for the construct.
   SsaEnv* false_env;  // false environment (only for if).
-  TryInfo* try_info;  // Information used for compiling try statements.
-  int32_t previous_catch;  // The previous Control (on the stack) with a catch.
+  SsaEnv* catch_env;  // catch environment (only for try).
 
   // Values merged into the end of this control construct.
   MergeValues merge;
 
   inline bool is_if() const { return kind == kControlIf; }
   inline bool is_block() const { return kind == kControlBlock; }
   inline bool is_loop() const { return kind == kControlLoop; }
   inline bool is_try() const { return kind == kControlTry; }
 
   // Named constructors.
-  static Control Block(const byte* pc, int stack_depth, SsaEnv* end_env,
-                       int32_t previous_catch) {
+  static Control Block(const byte* pc, int stack_depth, SsaEnv* end_env) {
     return {pc,      kControlBlock, stack_depth,    end_env,
-            nullptr, nullptr,       previous_catch, {0, {NO_VALUE}}};
+            nullptr, nullptr,       {0, {NO_VALUE}}};
   }
 
   static Control If(const byte* pc, int stack_depth, SsaEnv* end_env,
-                    SsaEnv* false_env, int32_t previous_catch) {
+                    SsaEnv* false_env) {
     return {pc,        kControlIf, stack_depth,    end_env,
-            false_env, nullptr,    previous_catch, {0, {NO_VALUE}}};
+            false_env, nullptr,    {0, {NO_VALUE}}};
   }
 
-  static Control Loop(const byte* pc, int stack_depth, SsaEnv* end_env,
-                      int32_t previous_catch) {
+  static Control Loop(const byte* pc, int stack_depth, SsaEnv* end_env) {
     return {pc,      kControlLoop, stack_depth,    end_env,
-            nullptr, nullptr,      previous_catch, {0, {NO_VALUE}}};
+            nullptr, nullptr,      {0, {NO_VALUE}}};
   }
 
   static Control Try(const byte* pc, int stack_depth, SsaEnv* end_env,
-                     Zone* zone, SsaEnv* catch_env, int32_t previous_catch) {
-    DCHECK_NOT_NULL(catch_env);
-    TryInfo* try_info = new (zone) TryInfo(catch_env);
+                     SsaEnv* catch_env) {
     return {pc,      kControlTry, stack_depth,    end_env,
-            nullptr, try_info,    previous_catch, {0, {NO_VALUE}}};
+            nullptr, catch_env,   {0, {NO_VALUE}}};
   }
 };
 
 // Macros that build nodes only if there is a graph and the current SSA
 // environment is reachable from start. This avoids problems with malformed
 // TF graphs when decoding inputs that have unreachable code.
-#define BUILD(func, ...) \
-  (build() ? CheckForException(builder_->func(__VA_ARGS__)) : nullptr)
-#define BUILD0(func) (build() ? CheckForException(builder_->func()) : nullptr)
+#define BUILD(func, ...) (build() ? builder_->func(__VA_ARGS__) : nullptr)
+#define BUILD0(func) (build() ? builder_->func() : nullptr)
 
 // Generic Wasm bytecode decoder with utilities for decoding operands,
 // lengths, etc.
 class WasmDecoder : public Decoder {
  public:
   WasmDecoder(ModuleEnv* module, FunctionSig* sig, const byte* start,
               const byte* end)
       : Decoder(start, end),
         module_(module),
         sig_(sig),
@@ skipping 141 matching lines @@
       case kExprF32Const:
         return 5;
       case kExprF64Const:
         return 9;
       default:
         return 1;
     }
   }
 };
 
-static const int32_t kNullCatch = -1;
-
 // The full WASM decoder for bytecode. Both verifies bytecode and generates
 // a TurboFan IR graph.
 class WasmFullDecoder : public WasmDecoder {
  public:
   WasmFullDecoder(Zone* zone, TFBuilder* builder, const FunctionBody& body)
       : WasmDecoder(body.module, body.sig, body.start, body.end),
         zone_(zone),
         builder_(builder),
         base_(body.base),
         local_type_vec_(zone),
         stack_(zone),
         control_(zone),
-        last_end_found_(false),
-        current_catch_(kNullCatch) {
+        last_end_found_(false) {
     local_types_ = &local_type_vec_;
   }
 
   bool Decode() {
     base::ElapsedTimer decode_timer;
     if (FLAG_trace_wasm_decode_time) {
       decode_timer.Start();
     }
     stack_.clear();
     control_.clear();
@@ skipping 105 matching lines @@
   TFBuilder* builder_;
   const byte* base_;
 
   SsaEnv* ssa_env_;
 
   ZoneVector<LocalType> local_type_vec_;  // types of local variables.
   ZoneVector<Value> stack_;               // stack of values.
   ZoneVector<Control> control_;           // stack of blocks, loops, and ifs.
   bool last_end_found_;
 
-  int32_t current_catch_;
-
-  TryInfo* current_try_info() { return control_[current_catch_].try_info; }
-
   inline bool build() { return builder_ && ssa_env_->go(); }
 
   void InitSsaEnv() {
     TFNode* start = nullptr;
     SsaEnv* ssa_env = reinterpret_cast<SsaEnv*>(zone_->New(sizeof(SsaEnv)));
     size_t size = sizeof(TFNode*) * EnvironmentCount();
     ssa_env->state = SsaEnv::kReached;
     ssa_env->locals =
         size > 0 ? reinterpret_cast<TFNode**>(zone_->New(size)) : nullptr;
 
@@ skipping 156 matching lines @@
             CHECK_PROTOTYPE_OPCODE(wasm_eh_prototype);
             Value value = Pop(0, kAstI32);
             BUILD(Throw, value.node);
             break;
           }
           case kExprTry: {
             CHECK_PROTOTYPE_OPCODE(wasm_eh_prototype);
             BlockTypeOperand operand(this, pc_);
             SsaEnv* outer_env = ssa_env_;
             SsaEnv* try_env = Steal(outer_env);
-            SsaEnv* catch_env = UnreachableEnv();
+            SsaEnv* catch_env = Split(try_env);
             PushTry(outer_env, catch_env);
             SetEnv("try_catch:start", try_env);
             SetBlockType(&control_.back(), operand);
             len = 1 + operand.length;
             break;
           }
           case kExprCatch: {
             CHECK_PROTOTYPE_OPCODE(wasm_eh_prototype);
             LocalIndexOperand operand(this, pc_);
             len = 1 + operand.length;
 
             if (control_.empty()) {
               error("catch does not match any try");
               break;
             }
 
             Control* c = &control_.back();
             if (!c->is_try()) {
               error("catch does not match any try");
               break;
             }
 
-            if (c->try_info->catch_env == nullptr) {
-              error(pc_, "catch already present for try with catch");
+            if (c->catch_env == nullptr) {
+              error("catch already present for try with catch");
               break;
             }
 
-            if (ssa_env_->go()) {
-              MergeValuesInto(c);
-            }
-            stack_.resize(c->stack_depth);
+            Goto(ssa_env_, c->end_env);
 
-            DCHECK_NOT_NULL(c->try_info);
-            SsaEnv* catch_env = c->try_info->catch_env;
-            c->try_info->catch_env = nullptr;
+            SsaEnv* catch_env = c->catch_env;
+            c->catch_env = nullptr;
             SetEnv("catch:begin", catch_env);
-            current_catch_ = c->previous_catch;
 
             if (Validate(pc_, operand)) {
+              // TODO(jpp): figure out how thrown value is propagated. It is
+              // unlikely to be a value on the stack.
               if (ssa_env_->locals) {
-                TFNode* exception_as_i32 =
-                    BUILD(Catch, c->try_info->exception, position());
-                ssa_env_->locals[operand.index] = exception_as_i32;
+                ssa_env_->locals[operand.index] = nullptr;
               }
             }
 
+            PopUpTo(c->stack_depth);
             break;
           }
           case kExprLoop: {
             BlockTypeOperand operand(this, pc_);
             SsaEnv* finish_try_env = Steal(ssa_env_);
             // The continue environment is the inner environment.
             PrepareForLoop(pc_, finish_try_env);
             SetEnv("loop:start", Split(finish_try_env));
             ssa_env_->SetNotMerged();
             PushLoop(finish_try_env);
@@ skipping 67 matching lines @@
                 }
                 name = "if:merge";
               } else {
                 // End the false branch of a two-armed if.
                 name = "if_else:merge";
               }
             } else if (c->is_try()) {
               name = "try:end";
 
               // validate that catch was seen.
-              if (c->try_info->catch_env != nullptr) {
-                error(pc_, "missing catch in try");
+              if (c->catch_env != nullptr) {
+                error("missing catch in try");
                 break;
               }
             }
             FallThruTo(c);
             SetEnv(name, c->end_env);
 
             // Push the end values onto the stack.
             stack_.resize(c->stack_depth);
             if (c->merge.arity == 1) {
               stack_.push_back(c->merge.vals.first);
@@ skipping 288 matching lines @@
               error("grow_memory is not supported for asmjs modules");
             }
             break;
           case kExprMemorySize:
             Push(kAstI32, BUILD(CurrentMemoryPages));
             break;
           case kExprCallFunction: {
             CallFunctionOperand operand(this, pc_);
             if (Validate(pc_, operand)) {
               TFNode** buffer = PopArgs(operand.sig);
-              TFNode** rets = nullptr;
-              BUILD(CallDirect, operand.index, buffer, &rets, position());
+              TFNode** rets =
+                  BUILD(CallDirect, operand.index, buffer, position());
               PushReturns(operand.sig, rets);
             }
             len = 1 + operand.length;
             break;
           }
           case kExprCallIndirect: {
             CallIndirectOperand operand(this, pc_);
             if (Validate(pc_, operand)) {
               Value index = Pop(0, kAstI32);
               TFNode** buffer = PopArgs(operand.sig);
               if (buffer) buffer[0] = index.node;
-              TFNode** rets = nullptr;
-              BUILD(CallIndirect, operand.index, buffer, &rets, position());
+              TFNode** rets =
+                  BUILD(CallIndirect, operand.index, buffer, position());
               PushReturns(operand.sig, rets);
             }
             len = 1 + operand.length;
             break;
           }
           case kSimdPrefix: {
             CHECK_PROTOTYPE_OPCODE(wasm_simd_prototype);
             len++;
             byte simd_index = *(pc_ + 1);
             opcode = static_cast<WasmOpcode>(opcode << 8 | simd_index);
@@ skipping 92 matching lines @@
       return nullptr;
     }
   }
 
   LocalType GetReturnType(FunctionSig* sig) {
     return sig->return_count() == 0 ? kAstStmt : sig->GetReturn();
   }
 
   void PushBlock(SsaEnv* end_env) {
     const int stack_depth = static_cast<int>(stack_.size());
-    control_.emplace_back(
-        Control::Block(pc_, stack_depth, end_env, current_catch_));
+    control_.emplace_back(Control::Block(pc_, stack_depth, end_env));
   }
 
   void PushLoop(SsaEnv* end_env) {
     const int stack_depth = static_cast<int>(stack_.size());
-    control_.emplace_back(
-        Control::Loop(pc_, stack_depth, end_env, current_catch_));
+    control_.emplace_back(Control::Loop(pc_, stack_depth, end_env));
   }
 
   void PushIf(SsaEnv* end_env, SsaEnv* false_env) {
     const int stack_depth = static_cast<int>(stack_.size());
-    control_.emplace_back(
-        Control::If(pc_, stack_depth, end_env, false_env, current_catch_));
+    control_.emplace_back(Control::If(pc_, stack_depth, end_env, false_env));
   }
 
   void PushTry(SsaEnv* end_env, SsaEnv* catch_env) {
     const int stack_depth = static_cast<int>(stack_.size());
-    control_.emplace_back(Control::Try(pc_, stack_depth, end_env, zone_,
-                                       catch_env, current_catch_));
-    current_catch_ = static_cast<int32_t>(control_.size() - 1);
+    control_.emplace_back(Control::Try(pc_, stack_depth, end_env, catch_env));
   }
 
   void PopControl() { control_.pop_back(); }
 
   int DecodeLoadMem(LocalType type, MachineType mem_type) {
     MemoryAccessOperand operand(this, pc_,
                                 ElementSizeLog2Of(mem_type.representation()));
 
     Value index = Pop(0, kAstI32);
     TFNode* node = BUILD(LoadMem, type, mem_type, index.node, operand.offset,
@@ skipping 239 matching lines @@
       PrintF("\n");
     }
 #endif
     ssa_env_ = env;
     if (builder_) {
       builder_->set_control_ptr(&env->control);
       builder_->set_effect_ptr(&env->effect);
     }
   }
 
-  TFNode* CheckForException(TFNode* node) {
-    if (node == nullptr) {
-      return nullptr;
-    }
-
-    const bool inside_try_scope = current_catch_ != kNullCatch;
-
-    if (!inside_try_scope) {
-      return node;
-    }
-
-    TFNode* if_success = nullptr;
-    TFNode* if_exception = nullptr;
-    if (!builder_->ThrowsException(node, &if_success, &if_exception)) {
-      return node;
-    }
-
-    SsaEnv* success_env = Steal(ssa_env_);
-    success_env->control = if_success;
-
-    SsaEnv* exception_env = Split(success_env);
-    exception_env->control = if_exception;
-    TryInfo* try_info = current_try_info();
-    Goto(exception_env, try_info->catch_env);
-    TFNode* exception = try_info->exception;
-    if (exception == nullptr) {
-      DCHECK_EQ(SsaEnv::kReached, try_info->catch_env->state);
-      try_info->exception = if_exception;
-    } else {
-      DCHECK_EQ(SsaEnv::kMerged, try_info->catch_env->state);
-      try_info->exception =
-          CreateOrMergeIntoPhi(kAstI32, try_info->catch_env->control,
-                               try_info->exception, if_exception);
-    }
-
-    SetEnv("if_success", success_env);
-    return node;
-  }
-
   void Goto(SsaEnv* from, SsaEnv* to) {
     DCHECK_NOT_NULL(to);
     if (!from->go()) return;
     switch (to->state) {
       case SsaEnv::kUnreachable: {  // Overwrite destination.
         to->state = SsaEnv::kReached;
         to->locals = from->locals;
         to->control = from->control;
         to->effect = from->effect;
         break;
@@ skipping 402 matching lines @@
 BitVector* AnalyzeLoopAssignmentForTesting(Zone* zone, size_t num_locals,
                                            const byte* start, const byte* end) {
   FunctionBody body = {nullptr, nullptr, nullptr, start, end};
   WasmFullDecoder decoder(zone, nullptr, body);
   return decoder.AnalyzeLoopAssignmentForTesting(start, num_locals);
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8