Bug 1368855 - Baldr: remove dead TlsData::globalData field (r=lth)
authorLuke Wagner <luke@mozilla.com>
Tue, 30 May 2017 16:38:07 -0700
changeset 409582 4e9f60d1655fa304de744629f28f64f7c182691e
parent 409581 735a87a03948ba9462017b37f64fed601444c7cd
child 409583 29fa3eb2f2fbe77d91922b1f8fb3b14226cde1b6
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslth
bugs1368855
milestone55.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 1368855 - Baldr: remove dead TlsData::globalData field (r=lth)
js/src/wasm/WasmInstance.cpp
js/src/wasm/WasmTypes.h
--- a/js/src/wasm/WasmInstance.cpp
+++ b/js/src/wasm/WasmInstance.cpp
@@ -342,17 +342,16 @@ Instance::Instance(JSContext* cx,
         MOZ_ASSERT(funcImports.length() == metadata(t).funcImports.length());
 #endif
     MOZ_ASSERT(tables_.length() == metadata().tables.length());
 
     tlsData()->memoryBase = memory ? memory->buffer().dataPointerEither().unwrap() : nullptr;
 #ifndef WASM_HUGE_MEMORY
     tlsData()->boundsCheckLimit = memory ? memory->buffer().wasmBoundsCheckLimit() : 0;
 #endif
-    tlsData()->globalData = globals_->globalData();
     tlsData()->instance = this;
     tlsData()->addressOfContext = (JSContext**)object->zone()->group()->addressOfOwnerContext();
 
     Tier callerTier = Tier::TBD;
     Tier calleeTier = Tier::TBD;
 
     for (size_t i = 0; i < metadata(callerTier).funcImports.length(); i++) {
         HandleFunction f = funcImports[i];
--- a/js/src/wasm/WasmTypes.h
+++ b/js/src/wasm/WasmTypes.h
@@ -1290,19 +1290,16 @@ struct TlsData
     // Pointer to the base of the default memory (or null if there is none).
     uint8_t* memoryBase;
 
 #ifndef WASM_HUGE_MEMORY
     // Bounds check limit of memory, in bytes (or zero if there is no memory).
     uint32_t boundsCheckLimit;
 #endif
 
-    // Pointer to the global data for this Instance.
-    uint8_t* globalData;
-
     // Pointer to the Instance that contains this TLS data.
     Instance* instance;
 
     // Shortcut to instance->zone->group->addressOfOwnerContext
     JSContext** addressOfContext;
 
     // The globalArea must be the last field.  Globals for the module start here
     // and are inline in this structure.  16-byte alignment is required for SIMD