AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm] iwyu part 2

Browse Source 
BUG=v8:7490

Change-Id: I2a597eda708b2ea34c9e32e39556159b48591b61
Reviewed-on: https://chromium-review.googlesource.com/1039196
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Commit-Queue: Marja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52911}
This commit is contained in:
Marja Hölttä 2018-05-02 12:42:31 +02:00 committed by Commit Bot
parent 3a094aec0b
commit c56cabb5ea
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wasm/wasm-interpreter.cc
View File

@ -2778,7 +2778,7 @@ WasmValue InterpretedFrame::GetLocalValue(int index) const {
WasmValue InterpretedFrame::GetStackValue(int index) const {
return ToImpl(this)->GetStackValue(index);
}
void InterpretedFrame::Deleter::operator()(InterpretedFrame* ptr) {
void InterpretedFrameDeleter::operator()(InterpretedFrame* ptr) {
delete ToImpl(ptr);
}

14
src/wasm/wasm-interpreter.h
View File

@ -70,12 +70,6 @@ class InterpretedFrame {
WasmValue GetLocalValue(int index) const;
WasmValue GetStackValue(int index) const;
// Deleter struct to delete the underlying InterpretedFrameImpl without
// violating language specifications.
struct Deleter {
void operator()(InterpretedFrame* ptr);
};
private:
friend class WasmInterpreter;
// Don't instante InterpretedFrames; they will be allocated as
@ -84,6 +78,12 @@ class InterpretedFrame {
DISALLOW_COPY_AND_ASSIGN(InterpretedFrame);
};
// Deleter struct to delete the underlying InterpretedFrameImpl without
// violating language specifications.
struct InterpretedFrameDeleter {
void operator()(InterpretedFrame* ptr);
};
// An interpreter capable of executing WebAssembly.
class V8_EXPORT_PRIVATE WasmInterpreter {
public:
@ -105,7 +105,7 @@ class V8_EXPORT_PRIVATE WasmInterpreter {
AfterCall = 1 << 1
};
using FramePtr = std::unique_ptr<InterpretedFrame, InterpretedFrame::Deleter>;
using FramePtr = std::unique_ptr<InterpretedFrame, InterpretedFrameDeleter>;
// Representation of a thread in the interpreter.
class V8_EXPORT_PRIVATE Thread {

7
src/wasm/wasm-objects.h
View File

@ -12,7 +12,6 @@
#include "src/machine-type.h"
#include "src/objects.h"
#include "src/objects/script.h"
#include "src/wasm/wasm-interpreter.h"
// Has to be the last include (doesn't have include guards)
#include "src/objects/object-macros.h"
@ -21,12 +20,14 @@ namespace v8 {
namespace internal {
namespace wasm {
class InterpretedFrame;
struct InterpretedFrameDeleter;
class NativeModule;
struct ModuleEnv;
class WasmCode;
struct WasmModule;
class SignatureMap;
class WireBytesRef;
class WasmInterpreter;
using ValueType = MachineRepresentation;
using FunctionSig = Signature<ValueType>;
} // namespace wasm
@ -640,8 +641,8 @@ class WasmDebugInfo : public Struct {
std::vector<std::pair<uint32_t, int>> GetInterpretedStack(
Address frame_pointer);
wasm::WasmInterpreter::FramePtr GetInterpretedFrame(Address frame_pointer,
int frame_index);
std::unique_ptr<wasm::InterpretedFrame, wasm::InterpretedFrameDeleter>
GetInterpretedFrame(Address frame_pointer, int frame_index);
// Unwind the interpreted stack belonging to the passed interpreter entry
// frame.