Commit 7633479c authored by Michael Starzinger's avatar Michael Starzinger Committed by Commit Bot

[wasm] Remove obsolete {RelocInfo::WASM_GLOBAL_HANDLE}.

R=titzer@chromium.org

Change-Id: I238835a63403e3688f271fc04f4a80c4b3c767c0
Reviewed-on: https://chromium-review.googlesource.com/1074656Reviewed-by: 's avatarBen Titzer <titzer@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53381}
parent cb44d296
...@@ -214,12 +214,6 @@ bool RelocInfo::OffHeapTargetIsCodedSpecially() { ...@@ -214,12 +214,6 @@ bool RelocInfo::OffHeapTargetIsCodedSpecially() {
#endif #endif
} }
void RelocInfo::set_global_handle(Address address,
ICacheFlushMode icache_flush_mode) {
DCHECK_EQ(rmode_, WASM_GLOBAL_HANDLE);
set_embedded_address(address, icache_flush_mode);
}
Address RelocInfo::wasm_call_address() const { Address RelocInfo::wasm_call_address() const {
DCHECK_EQ(rmode_, WASM_CALL); DCHECK_EQ(rmode_, WASM_CALL);
return Assembler::target_address_at(pc_, constant_pool_); return Assembler::target_address_at(pc_, constant_pool_);
...@@ -232,11 +226,6 @@ void RelocInfo::set_wasm_call_address(Address address, ...@@ -232,11 +226,6 @@ void RelocInfo::set_wasm_call_address(Address address,
icache_flush_mode); icache_flush_mode);
} }
Address RelocInfo::global_handle() const {
DCHECK_EQ(rmode_, WASM_GLOBAL_HANDLE);
return embedded_address();
}
void RelocInfo::set_target_address(Address target, void RelocInfo::set_target_address(Address target,
WriteBarrierMode write_barrier_mode, WriteBarrierMode write_barrier_mode,
ICacheFlushMode icache_flush_mode) { ICacheFlushMode icache_flush_mode) {
...@@ -548,8 +537,6 @@ const char* RelocInfo::RelocModeName(RelocInfo::Mode rmode) { ...@@ -548,8 +537,6 @@ const char* RelocInfo::RelocModeName(RelocInfo::Mode rmode) {
return "constant pool"; return "constant pool";
case VENEER_POOL: case VENEER_POOL:
return "veneer pool"; return "veneer pool";
case WASM_GLOBAL_HANDLE:
return "global handle";
case WASM_CALL: case WASM_CALL:
return "internal wasm call"; return "internal wasm call";
case WASM_CODE_TABLE_ENTRY: case WASM_CODE_TABLE_ENTRY:
...@@ -652,7 +639,6 @@ void RelocInfo::Verify(Isolate* isolate) { ...@@ -652,7 +639,6 @@ void RelocInfo::Verify(Isolate* isolate) {
case DEOPT_ID: case DEOPT_ID:
case CONST_POOL: case CONST_POOL:
case VENEER_POOL: case VENEER_POOL:
case WASM_GLOBAL_HANDLE:
case WASM_CALL: case WASM_CALL:
case JS_TO_WASM_CALL: case JS_TO_WASM_CALL:
case WASM_CODE_TABLE_ENTRY: case WASM_CODE_TABLE_ENTRY:
......
...@@ -367,7 +367,6 @@ class RelocInfo { ...@@ -367,7 +367,6 @@ class RelocInfo {
// Please note the order is important (see IsCodeTarget, IsGCRelocMode). // Please note the order is important (see IsCodeTarget, IsGCRelocMode).
CODE_TARGET, CODE_TARGET,
EMBEDDED_OBJECT, EMBEDDED_OBJECT,
WASM_GLOBAL_HANDLE,
WASM_CALL, WASM_CALL,
JS_TO_WASM_CALL, JS_TO_WASM_CALL,
...@@ -470,8 +469,7 @@ class RelocInfo { ...@@ -470,8 +469,7 @@ class RelocInfo {
return IsWasmPtrReference(mode); return IsWasmPtrReference(mode);
} }
static inline bool IsWasmPtrReference(Mode mode) { static inline bool IsWasmPtrReference(Mode mode) {
return mode == WASM_GLOBAL_HANDLE || mode == WASM_CALL || return mode == WASM_CALL || mode == JS_TO_WASM_CALL;
mode == JS_TO_WASM_CALL;
} }
static constexpr int ModeMask(Mode mode) { return 1 << mode; } static constexpr int ModeMask(Mode mode) { return 1 << mode; }
...@@ -505,7 +503,6 @@ class RelocInfo { ...@@ -505,7 +503,6 @@ class RelocInfo {
// constant pool, otherwise the pointer is embedded in the instruction stream. // constant pool, otherwise the pointer is embedded in the instruction stream.
bool IsInConstantPool(); bool IsInConstantPool();
Address global_handle() const;
Address js_to_wasm_address() const; Address js_to_wasm_address() const;
Address wasm_call_address() const; Address wasm_call_address() const;
...@@ -514,8 +511,6 @@ class RelocInfo { ...@@ -514,8 +511,6 @@ class RelocInfo {
WriteBarrierMode write_barrier_mode = UPDATE_WRITE_BARRIER, WriteBarrierMode write_barrier_mode = UPDATE_WRITE_BARRIER,
ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED); ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED);
void set_global_handle(Address address, ICacheFlushMode icache_flush_mode =
FLUSH_ICACHE_IF_NEEDED);
void set_wasm_call_address( void set_wasm_call_address(
Address, ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED); Address, ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED);
void set_js_to_wasm_address( void set_js_to_wasm_address(
......
...@@ -14266,7 +14266,6 @@ bool Code::IsProcessIndependent(Isolate* isolate) { ...@@ -14266,7 +14266,6 @@ bool Code::IsProcessIndependent(Isolate* isolate) {
mode_mask == mode_mask ==
(RelocInfo::ModeMask(RelocInfo::CODE_TARGET) | (RelocInfo::ModeMask(RelocInfo::CODE_TARGET) |
RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT) | RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT) |
RelocInfo::ModeMask(RelocInfo::WASM_GLOBAL_HANDLE) |
RelocInfo::ModeMask(RelocInfo::WASM_CALL) | RelocInfo::ModeMask(RelocInfo::WASM_CALL) |
RelocInfo::ModeMask(RelocInfo::JS_TO_WASM_CALL) | RelocInfo::ModeMask(RelocInfo::JS_TO_WASM_CALL) |
RelocInfo::ModeMask(RelocInfo::RUNTIME_ENTRY) | RelocInfo::ModeMask(RelocInfo::RUNTIME_ENTRY) |
......
...@@ -267,7 +267,6 @@ void WasmCode::Validate() const { ...@@ -267,7 +267,6 @@ void WasmCode::Validate() const {
case RelocInfo::CODE_TARGET: case RelocInfo::CODE_TARGET:
// TODO(mstarzinger): Validate that we go through a trampoline. // TODO(mstarzinger): Validate that we go through a trampoline.
case RelocInfo::WASM_CODE_TABLE_ENTRY: case RelocInfo::WASM_CODE_TABLE_ENTRY:
case RelocInfo::WASM_GLOBAL_HANDLE:
case RelocInfo::WASM_CALL: case RelocInfo::WASM_CALL:
case RelocInfo::JS_TO_WASM_CALL: case RelocInfo::JS_TO_WASM_CALL:
case RelocInfo::EXTERNAL_REFERENCE: case RelocInfo::EXTERNAL_REFERENCE:
......
...@@ -61,7 +61,6 @@ UNINITIALIZED_TEST(VerifyBuiltinsIsolateIndependence) { ...@@ -61,7 +61,6 @@ UNINITIALIZED_TEST(VerifyBuiltinsIsolateIndependence) {
mode_mask == mode_mask ==
(RelocInfo::ModeMask(RelocInfo::CODE_TARGET) | (RelocInfo::ModeMask(RelocInfo::CODE_TARGET) |
RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT) | RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT) |
RelocInfo::ModeMask(RelocInfo::WASM_GLOBAL_HANDLE) |
RelocInfo::ModeMask(RelocInfo::WASM_CALL) | RelocInfo::ModeMask(RelocInfo::WASM_CALL) |
RelocInfo::ModeMask(RelocInfo::JS_TO_WASM_CALL) | RelocInfo::ModeMask(RelocInfo::JS_TO_WASM_CALL) |
RelocInfo::ModeMask(RelocInfo::RUNTIME_ENTRY) | RelocInfo::ModeMask(RelocInfo::RUNTIME_ENTRY) |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment