fibjs
diff --git a/‎fibjs/include/v8_api.h
Lines changed: 1 addition & 2 deletions b/‎fibjs/include/v8_api.h
Lines changed: 1 addition & 2 deletions
diff --git a/‎fibjs/src/base/v8_api.cpp
Lines changed: 3 additions & 13 deletions b/‎fibjs/src/base/v8_api.cpp
Lines changed: 3 additions & 13 deletions
diff --git a/‎fibjs/src/global/Buffer.cpp
Lines changed: 2 additions & 1 deletion b/‎fibjs/src/global/Buffer.cpp
Lines changed: 2 additions & 1 deletion
@@ -30,8 +30,7 @@ void WriteLcovData(v8::Isolate* isolate, FILE* file);
 bool isFrozen(v8::Local<v8::Object> object);
 void setAsyncFunctoin(v8::Local<v8::Function> func);
 
-void* fetch_store_data(std::shared_ptr<v8::BackingStore>& backing_store);
-std::unique_ptr<v8::BackingStore> NewBackingStore(size_t byte_length, void* deleter_data);
+std::unique_ptr<v8::BackingStore> NewBackingStore(size_t byte_length);
 
 void* get_instance_pointer(v8::Local<v8::Object> o, uint16_t buffer_type);
 
 
@@ -89,22 +89,14 @@ static void s_store_deleter(void* data, size_t length, void* deleter_data)
 {
 }
 
-void* fetch_store_data(std::shared_ptr<v8::BackingStore>& backing_store)
-{
-    auto store = reinterpret_cast<const i::BackingStore*>(backing_store.get());
-    if (s_store_deleter == store->type_specific_data_.deleter.callback)
-        return store->type_specific_data_.deleter.data;
-    return NULL;
-}
-
-std::unique_ptr<v8::BackingStore> NewBackingStore(size_t byte_length, void* deleter_data)
+std::unique_ptr<v8::BackingStore> NewBackingStore(size_t byte_length)
 {
     CHECK_LE(byte_length, i::JSArrayBuffer::kMaxByteLength);
 
     uint8_t* data = new uint8_t[byte_length + sizeof(i::BackingStore)];
     auto result = new ((i::BackingStore*)data) i::BackingStore(data + sizeof(i::BackingStore), byte_length, byte_length, byte_length,
         i::SharedFlag::kNotShared, i::ResizableFlag::kNotResizable, false, true, false, true, false);
-    result->type_specific_data_.deleter = { s_store_deleter, deleter_data };
+    result->type_specific_data_.deleter = { s_store_deleter, NULL };
 
     return std::unique_ptr<v8::BackingStore>((v8::BackingStore*)result);
 }
@@ -134,9 +126,7 @@ void* get_instance_pointer(Local<Object> o, uint16_t buffer_type)
         if (instance_type != buffer_type)
             return NULL;
 
-        v8::Local<v8::ArrayBufferView> arr = o.As<v8::ArrayBufferView>();
-        std::shared_ptr<v8::BackingStore> store = arr->Buffer()->GetBackingStore();
-        return fetch_store_data(store);
+        return o->GetAlignedPointerFromInternalField(0);
     }
 
     return NULL;
 
@@ -223,7 +223,7 @@ result_t Buffer_base::concat(v8::Local<v8::Array> buflist, int32_t cutLength, ob
 
 void Buffer::init(const void* data, size_t length)
 {
-    m_store = NewBackingStore(length, this);
+    m_store = NewBackingStore(length);
     if (data)
         memcpy(Buffer::data(), data, Buffer::length());
 
@@ -262,6 +262,7 @@ v8::Local<v8::Object> Buffer::wrap(Isolate* isolate, v8::Local<v8::Object> This)
         }
 
         ui->SetPrototype(context, proto).IsJust();
+        ui->SetAlignedPointerInInternalField(0, this);
 
         return object_base::wrap(isolate, ui);
     }
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ result_t Buffer_base::concat(v8::Local<v8::Array> buflist, int32_t cutLength, ob`
`223`	`223`
`224`	`224`	`void Buffer::init(const void* data, size_t length)`
`225`	`225`	`{`
`226`		`- m_store = NewBackingStore(length, this);`
	`226`	`+ m_store = NewBackingStore(length);`
`227`	`227`	`if (data)`
`228`	`228`	`memcpy(Buffer::data(), data, Buffer::length());`
`229`	`229`
`@@ -262,6 +262,7 @@ v8::Local<v8::Object> Buffer::wrap(Isolate* isolate, v8::Local<v8::Object> This)`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`ui->SetPrototype(context, proto).IsJust();`
	`265`	`+ ui->SetAlignedPointerInInternalField(0, this);`
`265`	`266`
`266`	`267`	`return object_base::wrap(isolate, ui);`
`267`	`268`	`}`