test,build: fix merge test failures

nodejs · Jan 9, 2018 · 4a3b72f · 4a3b72f
1 parent c1ba6d6
commit 4a3b72f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/deps/chakrashim/src/v8module.cc b/deps/chakrashim/src/v8module.cc
@@ -46,7 +46,7 @@ namespace v8 {
 
   Maybe<bool> Module::InstantiateModule(Local<Context> context,
     ResolveCallback callback) {
-      return Just(false);  
+      return Just(false);
   }
 
   MaybeLocal<Value> Module::Evaluate(Local<Context> context) {

diff --git a/deps/chakrashim/src/v8typedarray.cc b/deps/chakrashim/src/v8typedarray.cc
@@ -28,36 +28,36 @@ using jsrt::ContextShim;
 using jsrt::CachedPropertyIdRef;
 
 Local<ArrayBuffer> ArrayBufferView::Buffer() {
-  JsValueRef result;
-  if (JsGetTypedArrayInfo(this,
-                          nullptr, &result, nullptr, nullptr) != JsNoError) {
+  JsValueRef result = JS_INVALID_REFERENCE;
+  if (JsGetTypedArrayInfo(this, nullptr, &result, nullptr, nullptr) != JsNoError
+      && JsGetDataViewInfo(this, &result, nullptr, nullptr) != JsNoError) {
     return Local<ArrayBuffer>();
   }
   return static_cast<ArrayBuffer*>(result);
 }
 
 size_t ArrayBufferView::ByteOffset() {
   unsigned int result;
-  if (JsGetTypedArrayInfo(this,
-                          nullptr, nullptr, &result, nullptr) != JsNoError) {
+  if (JsGetTypedArrayInfo(this, nullptr, nullptr, &result, nullptr) != JsNoError
+      && JsGetDataViewInfo(this, nullptr, &result, nullptr) != JsNoError) {
     return 0;
   }
   return result;
 }
 
 size_t ArrayBufferView::ByteLength() {
   unsigned int result;
-  if (JsGetTypedArrayInfo(this,
-                          nullptr, nullptr, nullptr, &result) != JsNoError) {
+  if (JsGetTypedArrayInfo(this, nullptr, nullptr, nullptr, &result) != JsNoError
+      && JsGetDataViewInfo(this, nullptr, nullptr, &result) != JsNoError) {
     return 0;
   }
   return result;
 }
 
 bool ArrayBufferView::HasBuffer() const {
   JsValueRef result;
-  if (JsGetTypedArrayInfo((JsValueRef)this,
-                          nullptr, &result, nullptr, nullptr) != JsNoError) {
+  if (JsGetTypedArrayInfo((JsValueRef)this, nullptr, &result, nullptr, nullptr) != JsNoError
+      && JsGetDataViewInfo((JsValueRef)this, &result, nullptr, nullptr) != JsNoError) {
     return false;
   }
   return result != nullptr;