[wasm] Fix location for error in asm.js ToNumber conversion

src/frames.h

 // Copyright 2012 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.
 
 #ifndef V8_FRAMES_H_
 #define V8_FRAMES_H_
 
 #include "src/allocation.h"
 #include "src/handles.h"
 #include "src/safepoint-table.h"
@@ skipping 544 matching lines @@
   enum PrintMode { OVERVIEW, DETAILS };
   virtual void Print(StringStream* accumulator,
                      PrintMode mode,
                      int index) const { }
 
   Isolate* isolate() const { return isolate_; }
 
   void operator=(const StackFrame& original) = delete;
 
  protected:
+  const StackFrameIteratorBase* iterator_;

[Michael Starzinger, 2016/12/08 11:38:05]

nit: AFAICT this is only made protected due to a DCHECK. Can the DCHECK be
written differently (or dropped) so that we don't have to expose this field?

[Clemens Hammacher, 2016/12/08 12:15:37]

Sure, I just dropped the DCHECK.

+
   inline explicit StackFrame(StackFrameIteratorBase* iterator);
   virtual ~StackFrame() { }
 
   // Compute the stack pointer for the calling frame.
   virtual Address GetCallerStackPointer() const = 0;
 
   // Printing support.
   static void PrintIndex(StringStream* accumulator,
                          PrintMode mode,
                          int index);
 
   // Compute the stack frame type for the given state.
   static Type ComputeType(const StackFrameIteratorBase* iterator, State* state);
 
 #ifdef DEBUG
   bool can_access_heap_objects() const;
 #endif
 
  private:
-  const StackFrameIteratorBase* iterator_;
   Isolate* isolate_;
   State state_;
 
   static ReturnAddressLocationResolver return_address_location_resolver_;
 
   // Fill in the state of the calling frame.
   virtual void ComputeCallerState(State* state) const = 0;
 
   // Get the type and the state of the calling frame.
   virtual Type GetCallerState(State* state) const;
@@ skipping 509 matching lines @@
   int LookupExceptionHandlerInTable(int* data);
 
   // Determine the code for the frame.
   Code* unchecked_code() const override;
 
   // Accessors.
   Object* wasm_instance() const;
   uint32_t function_index() const;
   Script* script() const override;
   int position() const override;
+  bool at_to_number_conversion() const;
 
   static WasmFrame* cast(StackFrame* frame) {
     DCHECK(frame->is_wasm());
     return static_cast<WasmFrame*>(frame);
   }
 
  protected:
   inline explicit WasmFrame(StackFrameIteratorBase* iterator);
 
   Address GetCallerStackPointer() const override;
 
  private:
   friend class StackFrameIteratorBase;
 };
 
 class WasmToJsFrame : public StubFrame {
  public:
   Type type() const override { return WASM_TO_JS; }
 
  protected:
   inline explicit WasmToJsFrame(StackFrameIteratorBase* iterator);
 
  private:
+  void ComputeCallerState(State* state) const override;
+
   friend class StackFrameIteratorBase;
 };
 
 class JsToWasmFrame : public StubFrame {
  public:
   Type type() const override { return JS_TO_WASM; }
 
  protected:
   inline explicit JsToWasmFrame(StackFrameIteratorBase* iterator);
 
@@ skipping 218 matching lines @@
 
 
 // Reads all frames on the current stack and copies them into the current
 // zone memory.
 Vector<StackFrame*> CreateStackMap(Isolate* isolate, Zone* zone);
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_FRAMES_H_