Merge remote-tracking branch 'upstream/master'

Author: vihanb

.travis.yml

@@ -1,5 +1,6 @@
 language: node_js
 node_js:
+  - node
   - "11"
   - "10"
   - "8"

src/ir/data-layout.cc

@@ -47,7 +47,7 @@ NAN_METHOD(DataLayoutWrapper::New) {
         return Nan::ThrowTypeError("DataLayout functionTemplate needs to be called with single string argument");
     }
 
-    llvm::DataLayout layout { ToString(info[0]->ToString()) };
+    llvm::DataLayout layout { ToString(info[0]) };
     DataLayoutWrapper* wrapper = new DataLayoutWrapper { layout };
     wrapper->Wrap(info.This());
     info.GetReturnValue().Set(info.This());

src/ir/module.cc

@@ -47,7 +47,7 @@ NAN_METHOD(ModuleWrapper::New) {
         return Nan::ThrowTypeError("The Module functionTemplate needs to be called with: (moduleId: string, context: LLVMContext)");
     }
 
-    auto moduleId = ToString(info[0]->ToString());
+    auto moduleId = ToString(info[0]);
     auto* llvmContextWrapper = LLVMContextWrapper::FromValue(info[1]);
 
     auto* moduleWrapper = new ModuleWrapper { llvm::StringRef { moduleId.c_str(), moduleId.length() },
@@ -98,12 +98,12 @@ NAN_METHOD(ModuleWrapper::getOrInsertFunction) {
     #if LLVM_VERSION_MAJOR < 9
         Nan::Set(functionCallee, Nan::New("callee").ToLocalChecked(), ConstantWrapper::of(module->getOrInsertFunction(name, fnType)));
         Nan::Set(functionCallee, Nan::New("functionType").ToLocalChecked(), FunctionTypeWrapper::of(fnType));
-    #else 
+    #else
         auto llvmCallee = module->getOrInsertFunction(name, fnType);
         Nan::Set(functionCallee, Nan::New("callee").ToLocalChecked(), ValueWrapper::of(llvmCallee.getCallee()));
         Nan::Set(functionCallee, Nan::New("functionType").ToLocalChecked(), FunctionTypeWrapper::of(llvmCallee.getFunctionType()));
     #endif
-    
+
     Nan::EscapableHandleScope scope {};
     info.GetReturnValue().Set(scope.Escape(functionCallee));
 }

src/support/target-registry.cc

@@ -24,8 +24,10 @@ NAN_METHOD(TargetRegistryWrapper::lookupTarget) {
 NAN_MODULE_INIT(TargetRegistryWrapper::Init) {
     v8::Local<v8::ObjectTemplate> tpl = Nan::New<v8::ObjectTemplate>();
     Nan::SetMethod(tpl, "lookupTarget", TargetRegistryWrapper::lookupTarget);
-    
-    Nan::Set(target, Nan::New("TargetRegistry").ToLocalChecked(), tpl->NewInstance());
+
+    auto targetRegistry = Nan::NewInstance(tpl).ToLocalChecked();
+
+    Nan::Set(target, Nan::New("TargetRegistry").ToLocalChecked(), targetRegistry);
 }
 
 //--------------------------------------------------------------

src/support/target-registry.h

@@ -8,13 +8,12 @@
 
 class TargetRegistryWrapper: public Nan::ObjectWrap, public FromValueMixin<TargetRegistryWrapper> {
     public:
-
     static NAN_MODULE_INIT(Init);
 
     private:
-        static NAN_METHOD(lookupTarget);
+    static NAN_METHOD(lookupTarget);
 
-        TargetRegistryWrapper() = delete;
+    TargetRegistryWrapper() = delete;
 };
 
 class TargetWrapper: public Nan::ObjectWrap, public FromValueMixin<TargetWrapper> {
@@ -35,4 +34,4 @@ class TargetWrapper: public Nan::ObjectWrap, public FromValueMixin<TargetWrapper
     static Nan::Persistent<v8::ObjectTemplate> target_template;
 };
 
-#endif
+#endif